Skip to content

Commit 196fc09

Browse files
mydeamydea
authored
fix(otel): Do not add otel.kind: INTERNAL attribute (#12841)
Only add this if this is some other value, e.g. `CLIENT` or `SERVER`. It is useless to have the internal value there and potentially confusing (why is this there? what does internal even mean?)
1 parent 94ad1a3 commit 196fc09

File tree

25 files changed

+5
-92
lines changed

25 files changed

+5
-92
lines changed

‎dev-packages/e2e-tests/test-applications/aws-serverless-esm/tests/basic.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ test('AWS Serverless SDK sends events in ESM mode', async ({ request }) => {
3131
'sentry.source': 'component',
3232
'sentry.origin': 'auto.function.serverless',
3333
'sentry.op': 'function.aws.lambda',
34-
'otel.kind': 'INTERNAL',
3534
},
3635
op: 'function.aws.lambda',
3736
origin: 'auto.function.serverless',

‎dev-packages/e2e-tests/test-applications/create-next-app/tests/server-transactions.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ test('Sends server-side transactions to Sentry', async ({ baseURL }) => {
4040
spans: [
4141
{
4242
data: {
43-
'otel.kind': 'INTERNAL',
4443
'sentry.origin': 'manual',
4544
},
4645
description: 'test-span',

‎dev-packages/e2e-tests/test-applications/nestjs/tests/span-decorator.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ test('Transaction includes span and correct value for decorated async function',
2424
data: {
2525
'sentry.origin': 'manual',
2626
'sentry.op': 'wait and return a string',
27-
'otel.kind': 'INTERNAL',
2827
},
2928
description: 'wait',
3029
parent_span_id: expect.any(String),
@@ -60,7 +59,6 @@ test('Transaction includes span and correct value for decorated sync function',
6059
data: {
6160
'sentry.origin': 'manual',
6261
'sentry.op': 'return a string',
63-
'otel.kind': 'INTERNAL',
6462
},
6563
description: 'getString',
6664
parent_span_id: expect.any(String),

‎dev-packages/e2e-tests/test-applications/nestjs/tests/transactions.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
5454
'express.name': '/test-transaction',
5555
'express.type': 'request_handler',
5656
'http.route': '/test-transaction',
57-
'otel.kind': 'INTERNAL',
5857
'sentry.origin': 'auto.http.otel.express',
5958
'sentry.op': 'request_handler.express',
6059
},
@@ -70,7 +69,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
7069
},
7170
{
7271
data: {
73-
'otel.kind': 'INTERNAL',
7472
'sentry.origin': 'manual',
7573
},
7674
description: 'test-span',
@@ -84,7 +82,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
8482
},
8583
{
8684
data: {
87-
'otel.kind': 'INTERNAL',
8885
'sentry.origin': 'manual',
8986
},
9087
description: 'child-span',
@@ -106,7 +103,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
106103
'nestjs.version': expect.any(String),
107104
'nestjs.type': 'handler',
108105
'nestjs.callback': 'testTransaction',
109-
'otel.kind': 'INTERNAL',
110106
},
111107
description: 'testTransaction',
112108
parent_span_id: expect.any(String),

‎dev-packages/e2e-tests/test-applications/node-connect/tests/transactions.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
5353
{
5454
data: {
5555
'sentry.origin': 'manual',
56-
'otel.kind': 'INTERNAL',
5756
},
5857
description: 'test-span',
5958
parent_span_id: expect.any(String),
@@ -71,7 +70,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
7170
'http.route': '/test-transaction',
7271
'connect.type': 'request_handler',
7372
'connect.name': '/test-transaction',
74-
'otel.kind': 'INTERNAL',
7573
},
7674
op: 'request_handler.connect',
7775
description: '/test-transaction',

‎dev-packages/e2e-tests/test-applications/node-express-cjs-preload/tests/server.test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ test('Should record a transaction for route with parameters', async ({ request }
6666
'express.name': 'query',
6767
'express.type': 'middleware',
6868
'http.route': '/',
69-
'otel.kind': 'INTERNAL',
7069
'sentry.origin': 'auto.http.otel.express',
7170
'sentry.op': 'middleware.express',
7271
},
@@ -86,7 +85,6 @@ test('Should record a transaction for route with parameters', async ({ request }
8685
'express.name': 'expressInit',
8786
'express.type': 'middleware',
8887
'http.route': '/',
89-
'otel.kind': 'INTERNAL',
9088
'sentry.origin': 'auto.http.otel.express',
9189
'sentry.op': 'middleware.express',
9290
},
@@ -106,7 +104,6 @@ test('Should record a transaction for route with parameters', async ({ request }
106104
'express.name': '/test-transaction/:param',
107105
'express.type': 'request_handler',
108106
'http.route': '/test-transaction/:param',
109-
'otel.kind': 'INTERNAL',
110107
'sentry.origin': 'auto.http.otel.express',
111108
'sentry.op': 'request_handler.express',
112109
},

‎dev-packages/e2e-tests/test-applications/node-express-esm-loader/tests/server.test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ test('Should record a transaction for route with parameters', async ({ request }
6666
'express.name': 'query',
6767
'express.type': 'middleware',
6868
'http.route': '/',
69-
'otel.kind': 'INTERNAL',
7069
'sentry.origin': 'auto.http.otel.express',
7170
'sentry.op': 'middleware.express',
7271
},
@@ -86,7 +85,6 @@ test('Should record a transaction for route with parameters', async ({ request }
8685
'express.name': 'expressInit',
8786
'express.type': 'middleware',
8887
'http.route': '/',
89-
'otel.kind': 'INTERNAL',
9088
'sentry.origin': 'auto.http.otel.express',
9189
'sentry.op': 'middleware.express',
9290
},
@@ -106,7 +104,6 @@ test('Should record a transaction for route with parameters', async ({ request }
106104
'express.name': '/test-transaction/:param',
107105
'express.type': 'request_handler',
108106
'http.route': '/test-transaction/:param',
109-
'otel.kind': 'INTERNAL',
110107
'sentry.origin': 'auto.http.otel.express',
111108
'sentry.op': 'request_handler.express',
112109
},

‎dev-packages/e2e-tests/test-applications/node-express-esm-preload/tests/server.test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ test('Should record a transaction for route with parameters', async ({ request }
6666
'express.name': 'query',
6767
'express.type': 'middleware',
6868
'http.route': '/',
69-
'otel.kind': 'INTERNAL',
7069
'sentry.origin': 'auto.http.otel.express',
7170
'sentry.op': 'middleware.express',
7271
},
@@ -86,7 +85,6 @@ test('Should record a transaction for route with parameters', async ({ request }
8685
'express.name': 'expressInit',
8786
'express.type': 'middleware',
8887
'http.route': '/',
89-
'otel.kind': 'INTERNAL',
9088
'sentry.origin': 'auto.http.otel.express',
9189
'sentry.op': 'middleware.express',
9290
},
@@ -106,7 +104,6 @@ test('Should record a transaction for route with parameters', async ({ request }
106104
'express.name': '/test-transaction/:param',
107105
'express.type': 'request_handler',
108106
'http.route': '/test-transaction/:param',
109-
'otel.kind': 'INTERNAL',
110107
'sentry.origin': 'auto.http.otel.express',
111108
'sentry.op': 'request_handler.express',
112109
},

‎dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
6565
'http.route': '/',
6666
'express.name': 'query',
6767
'express.type': 'middleware',
68-
'otel.kind': 'INTERNAL',
6968
},
7069
description: 'query',
7170
op: 'middleware.express',
@@ -85,7 +84,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
8584
'http.route': '/',
8685
'express.name': 'expressInit',
8786
'express.type': 'middleware',
88-
'otel.kind': 'INTERNAL',
8987
},
9088
description: 'expressInit',
9189
op: 'middleware.express',
@@ -105,7 +103,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
105103
'http.route': '/test-transaction',
106104
'express.name': '/test-transaction',
107105
'express.type': 'request_handler',
108-
'otel.kind': 'INTERNAL',
109106
},
110107
description: '/test-transaction',
111108
op: 'request_handler.express',
@@ -146,7 +143,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
146143
'http.route': '/',
147144
'express.name': 'query',
148145
'express.type': 'middleware',
149-
'otel.kind': 'INTERNAL',
150146
},
151147
description: 'query',
152148
op: 'middleware.express',
@@ -166,7 +162,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
166162
'http.route': '/',
167163
'express.name': 'expressInit',
168164
'express.type': 'middleware',
169-
'otel.kind': 'INTERNAL',
170165
},
171166
description: 'expressInit',
172167
op: 'middleware.express',
@@ -186,7 +181,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
186181
'http.route': '/test-exception/:id',
187182
'express.name': '/test-exception/:id',
188183
'express.type': 'request_handler',
189-
'otel.kind': 'INTERNAL',
190184
},
191185
description: '/test-exception/:id',
192186
op: 'request_handler.express',

‎dev-packages/e2e-tests/test-applications/node-fastify/tests/transactions.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
6363
'plugin.name': 'fastify -> sentry-fastify-error-handler',
6464
'fastify.type': 'middleware',
6565
'hook.name': 'onRequest',
66-
'otel.kind': 'INTERNAL',
6766
'sentry.origin': 'auto.http.otel.fastify',
6867
'sentry.op': 'middleware.fastify',
6968
},
@@ -83,7 +82,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
8382
'plugin.name': 'fastify -> sentry-fastify-error-handler',
8483
'fastify.type': 'request_handler',
8584
'http.route': '/test-transaction',
86-
'otel.kind': 'INTERNAL',
8785
'sentry.op': 'request_handler.fastify',
8886
'sentry.origin': 'auto.http.otel.fastify',
8987
},
@@ -100,7 +98,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
10098

10199
expect(spans).toContainEqual({
102100
data: {
103-
'otel.kind': 'INTERNAL',
104101
'sentry.origin': 'manual',
105102
},
106103
description: 'test-span',
@@ -115,7 +112,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
115112

116113
expect(spans).toContainEqual({
117114
data: {
118-
'otel.kind': 'INTERNAL',
119115
'sentry.origin': 'manual',
120116
},
121117
description: 'child-span',

‎dev-packages/e2e-tests/test-applications/node-hapi/tests/transactions.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ test('Sends successful transaction', async ({ baseURL }) => {
6363
'hapi.type': 'router',
6464
'http.method': 'GET',
6565
'http.route': '/test-success',
66-
'otel.kind': 'INTERNAL',
6766
'sentry.op': 'router.hapi',
6867
'sentry.origin': 'auto.http.otel.hapi',
6968
},
@@ -81,7 +80,6 @@ test('Sends successful transaction', async ({ baseURL }) => {
8180
// this comes from "onPreResponse"
8281
data: {
8382
'hapi.type': 'server.ext',
84-
'otel.kind': 'INTERNAL',
8583
'sentry.op': 'server.ext.hapi',
8684
'sentry.origin': 'auto.http.otel.hapi',
8785
'server.ext.type': 'onPreResponse',

‎dev-packages/e2e-tests/test-applications/node-koa/tests/transactions.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
5353
data: {
5454
'koa.name': '',
5555
'koa.type': 'middleware',
56-
'otel.kind': 'INTERNAL',
5756
'sentry.origin': 'auto.http.otel.koa',
5857
'sentry.op': 'middleware.koa',
5958
},
@@ -72,7 +71,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
7271
'http.route': '/test-transaction',
7372
'koa.name': '/test-transaction',
7473
'koa.type': 'router',
75-
'otel.kind': 'INTERNAL',
7674
'sentry.origin': 'auto.http.otel.koa',
7775
'sentry.op': 'router.koa',
7876
},
@@ -88,7 +86,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
8886
},
8987
{
9088
data: {
91-
'otel.kind': 'INTERNAL',
9289
'sentry.origin': 'manual',
9390
},
9491
description: 'test-span',
@@ -102,7 +99,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
10299
},
103100
{
104101
data: {
105-
'otel.kind': 'INTERNAL',
106102
'sentry.origin': 'manual',
107103
},
108104
description: 'child-span',

‎dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
7777
'http.route': '/',
7878
'express.name': 'query',
7979
'express.type': 'middleware',
80-
'otel.kind': 'INTERNAL',
8180
},
8281
description: 'query',
8382
op: 'middleware.express',
@@ -97,7 +96,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
9796
'http.route': '/',
9897
'express.name': 'expressInit',
9998
'express.type': 'middleware',
100-
'otel.kind': 'INTERNAL',
10199
},
102100
description: 'expressInit',
103101
op: 'middleware.express',
@@ -117,7 +115,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
117115
'http.route': '/test-transaction',
118116
'express.name': '/test-transaction',
119117
'express.type': 'request_handler',
120-
'otel.kind': 'INTERNAL',
121118
},
122119
description: '/test-transaction',
123120
op: 'request_handler.express',
@@ -158,7 +155,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
158155
'http.route': '/',
159156
'express.name': 'query',
160157
'express.type': 'middleware',
161-
'otel.kind': 'INTERNAL',
162158
},
163159
description: 'query',
164160
op: 'middleware.express',
@@ -178,7 +174,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
178174
'http.route': '/',
179175
'express.name': 'expressInit',
180176
'express.type': 'middleware',
181-
'otel.kind': 'INTERNAL',
182177
},
183178
description: 'expressInit',
184179
op: 'middleware.express',
@@ -198,7 +193,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
198193
'http.route': '/test-exception/:id',
199194
'express.name': '/test-exception/:id',
200195
'express.type': 'request_handler',
201-
'otel.kind': 'INTERNAL',
202196
},
203197
description: '/test-exception/:id',
204198
op: 'request_handler.express',

‎dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ describe('GraphQL/Apollo Tests', () => {
99
data: {
1010
'graphql.operation.type': 'query',
1111
'graphql.source': '{hello}',
12-
'otel.kind': 'INTERNAL',
1312
'sentry.origin': 'auto.graphql.otel.graphql',
1413
},
1514
description: 'query',
@@ -31,7 +30,6 @@ describe('GraphQL/Apollo Tests', () => {
3130
'graphql.operation.name': 'Mutation',
3231
'graphql.operation.type': 'mutation',
3332
'graphql.source': 'mutation Mutation($email: String) {\n login(email: $email)\n}',
34-
'otel.kind': 'INTERNAL',
3533
'sentry.origin': 'auto.graphql.otel.graphql',
3634
},
3735
description: 'mutation Mutation',

‎dev-packages/node-integration-tests/suites/tracing/connect/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ describe('connect auto-instrumentation', () => {
1515
'connect.name': '/',
1616
'connect.type': 'request_handler',
1717
'http.route': '/',
18-
'otel.kind': 'INTERNAL',
1918
'sentry.origin': 'auto.http.otel.connect',
2019
'sentry.op': 'request_handler.connect',
2120
}),

‎dev-packages/node-integration-tests/suites/tracing/nestjs/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ conditionalTest({ min: 16 })('nestjs auto instrumentation', () => {
2727
'nestjs.callback': 'getHello',
2828
'nestjs.controller': 'AppController',
2929
'nestjs.type': 'request_context',
30-
'otel.kind': 'INTERNAL',
3130
'sentry.op': 'http',
3231
}),
3332
}),

0 commit comments

Comments
 (0)