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?)
getsentry · Jul 10, 2024 · 196fc09 · 196fc09
1 parent 94ad1a3
commit 196fc09
Show file tree

Hide file tree

Showing 25 changed files with 5 additions and 92 deletions.
diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless-esm/tests/basic.test.ts b/dev-packages/e2e-tests/test-applications/aws-serverless-esm/tests/basic.test.ts
@@ -31,7 +31,6 @@ test('AWS Serverless SDK sends events in ESM mode', async ({ request }) => {
       'sentry.source': 'component',
       'sentry.origin': 'auto.function.serverless',
       'sentry.op': 'function.aws.lambda',
-      'otel.kind': 'INTERNAL',
     },
     op: 'function.aws.lambda',
     origin: 'auto.function.serverless',

diff --git a/dev-packages/e2e-tests/test-applications/create-next-app/tests/server-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-next-app/tests/server-transactions.test.ts
@@ -40,7 +40,6 @@ test('Sends server-side transactions to Sentry', async ({ baseURL }) => {
       spans: [
         {
           data: {
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'manual',
           },
           description: 'test-span',

diff --git a/dev-packages/e2e-tests/test-applications/nestjs/tests/span-decorator.test.ts b/dev-packages/e2e-tests/test-applications/nestjs/tests/span-decorator.test.ts
@@ -24,7 +24,6 @@ test('Transaction includes span and correct value for decorated async function',
         data: {
           'sentry.origin': 'manual',
           'sentry.op': 'wait and return a string',
-          'otel.kind': 'INTERNAL',
         },
         description: 'wait',
         parent_span_id: expect.any(String),
@@ -60,7 +59,6 @@ test('Transaction includes span and correct value for decorated sync function',
         data: {
           'sentry.origin': 'manual',
           'sentry.op': 'return a string',
-          'otel.kind': 'INTERNAL',
         },
         description: 'getString',
         parent_span_id: expect.any(String),

diff --git a/dev-packages/e2e-tests/test-applications/nestjs/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs/tests/transactions.test.ts
@@ -54,7 +54,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
             'express.name': '/test-transaction',
             'express.type': 'request_handler',
             'http.route': '/test-transaction',
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'auto.http.otel.express',
             'sentry.op': 'request_handler.express',
           },
@@ -70,7 +69,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
         },
         {
           data: {
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'manual',
           },
           description: 'test-span',
@@ -84,7 +82,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
         },
         {
           data: {
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'manual',
           },
           description: 'child-span',
@@ -106,7 +103,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
             'nestjs.version': expect.any(String),
             'nestjs.type': 'handler',
             'nestjs.callback': 'testTransaction',
-            'otel.kind': 'INTERNAL',
           },
           description: 'testTransaction',
           parent_span_id: expect.any(String),

diff --git a/dev-packages/e2e-tests/test-applications/node-connect/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-connect/tests/transactions.test.ts
@@ -53,7 +53,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
         {
           data: {
             'sentry.origin': 'manual',
-            'otel.kind': 'INTERNAL',
           },
           description: 'test-span',
           parent_span_id: expect.any(String),
@@ -71,7 +70,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
             'http.route': '/test-transaction',
             'connect.type': 'request_handler',
             'connect.name': '/test-transaction',
-            'otel.kind': 'INTERNAL',
           },
           op: 'request_handler.connect',
           description: '/test-transaction',

diff --git a/dev-packages/e2e-tests/test-applications/node-express-cjs-preload/tests/server.test.ts b/dev-packages/e2e-tests/test-applications/node-express-cjs-preload/tests/server.test.ts
@@ -66,7 +66,6 @@ test('Should record a transaction for route with parameters', async ({ request }
       'express.name': 'query',
       'express.type': 'middleware',
       'http.route': '/',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
     },
@@ -86,7 +85,6 @@ test('Should record a transaction for route with parameters', async ({ request }
       'express.name': 'expressInit',
       'express.type': 'middleware',
       'http.route': '/',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
     },
@@ -106,7 +104,6 @@ test('Should record a transaction for route with parameters', async ({ request }
       'express.name': '/test-transaction/:param',
       'express.type': 'request_handler',
       'http.route': '/test-transaction/:param',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'request_handler.express',
     },

diff --git a/dev-packages/e2e-tests/test-applications/node-express-esm-loader/tests/server.test.ts b/dev-packages/e2e-tests/test-applications/node-express-esm-loader/tests/server.test.ts
@@ -66,7 +66,6 @@ test('Should record a transaction for route with parameters', async ({ request }
       'express.name': 'query',
       'express.type': 'middleware',
       'http.route': '/',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
     },
@@ -86,7 +85,6 @@ test('Should record a transaction for route with parameters', async ({ request }
       'express.name': 'expressInit',
       'express.type': 'middleware',
       'http.route': '/',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
     },
@@ -106,7 +104,6 @@ test('Should record a transaction for route with parameters', async ({ request }
       'express.name': '/test-transaction/:param',
       'express.type': 'request_handler',
       'http.route': '/test-transaction/:param',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'request_handler.express',
     },

diff --git a/dev-packages/e2e-tests/test-applications/node-express-esm-preload/tests/server.test.ts b/dev-packages/e2e-tests/test-applications/node-express-esm-preload/tests/server.test.ts
@@ -66,7 +66,6 @@ test('Should record a transaction for route with parameters', async ({ request }
       'express.name': 'query',
       'express.type': 'middleware',
       'http.route': '/',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
     },
@@ -86,7 +85,6 @@ test('Should record a transaction for route with parameters', async ({ request }
       'express.name': 'expressInit',
       'express.type': 'middleware',
       'http.route': '/',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'middleware.express',
     },
@@ -106,7 +104,6 @@ test('Should record a transaction for route with parameters', async ({ request }
       'express.name': '/test-transaction/:param',
       'express.type': 'request_handler',
       'http.route': '/test-transaction/:param',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.express',
       'sentry.op': 'request_handler.express',
     },

diff --git a/dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts
@@ -65,7 +65,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       'http.route': '/',
       'express.name': 'query',
       'express.type': 'middleware',
-      'otel.kind': 'INTERNAL',
     },
     description: 'query',
     op: 'middleware.express',
@@ -85,7 +84,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       'http.route': '/',
       'express.name': 'expressInit',
       'express.type': 'middleware',
-      'otel.kind': 'INTERNAL',
     },
     description: 'expressInit',
     op: 'middleware.express',
@@ -105,7 +103,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       'http.route': '/test-transaction',
       'express.name': '/test-transaction',
       'express.type': 'request_handler',
-      'otel.kind': 'INTERNAL',
     },
     description: '/test-transaction',
     op: 'request_handler.express',
@@ -146,7 +143,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
       'http.route': '/',
       'express.name': 'query',
       'express.type': 'middleware',
-      'otel.kind': 'INTERNAL',
     },
     description: 'query',
     op: 'middleware.express',
@@ -166,7 +162,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
       'http.route': '/',
       'express.name': 'expressInit',
       'express.type': 'middleware',
-      'otel.kind': 'INTERNAL',
     },
     description: 'expressInit',
     op: 'middleware.express',
@@ -186,7 +181,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
       'http.route': '/test-exception/:id',
       'express.name': '/test-exception/:id',
       'express.type': 'request_handler',
-      'otel.kind': 'INTERNAL',
     },
     description: '/test-exception/:id',
     op: 'request_handler.express',

diff --git a/dev-packages/e2e-tests/test-applications/node-fastify/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify/tests/transactions.test.ts
@@ -63,7 +63,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       'plugin.name': 'fastify -> sentry-fastify-error-handler',
       'fastify.type': 'middleware',
       'hook.name': 'onRequest',
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'auto.http.otel.fastify',
       'sentry.op': 'middleware.fastify',
     },
@@ -83,7 +82,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       'plugin.name': 'fastify -> sentry-fastify-error-handler',
       'fastify.type': 'request_handler',
       'http.route': '/test-transaction',
-      'otel.kind': 'INTERNAL',
       'sentry.op': 'request_handler.fastify',
       'sentry.origin': 'auto.http.otel.fastify',
     },
@@ -100,7 +98,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
 
   expect(spans).toContainEqual({
     data: {
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'manual',
     },
     description: 'test-span',
@@ -115,7 +112,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
 
   expect(spans).toContainEqual({
     data: {
-      'otel.kind': 'INTERNAL',
       'sentry.origin': 'manual',
     },
     description: 'child-span',

diff --git a/dev-packages/e2e-tests/test-applications/node-hapi/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-hapi/tests/transactions.test.ts
@@ -63,7 +63,6 @@ test('Sends successful transaction', async ({ baseURL }) => {
         'hapi.type': 'router',
         'http.method': 'GET',
         'http.route': '/test-success',
-        'otel.kind': 'INTERNAL',
         'sentry.op': 'router.hapi',
         'sentry.origin': 'auto.http.otel.hapi',
       },
@@ -81,7 +80,6 @@ test('Sends successful transaction', async ({ baseURL }) => {
       // this comes from "onPreResponse"
       data: {
         'hapi.type': 'server.ext',
-        'otel.kind': 'INTERNAL',
         'sentry.op': 'server.ext.hapi',
         'sentry.origin': 'auto.http.otel.hapi',
         'server.ext.type': 'onPreResponse',

diff --git a/dev-packages/e2e-tests/test-applications/node-koa/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-koa/tests/transactions.test.ts
@@ -53,7 +53,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
           data: {
             'koa.name': '',
             'koa.type': 'middleware',
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'auto.http.otel.koa',
             'sentry.op': 'middleware.koa',
           },
@@ -72,7 +71,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
             'http.route': '/test-transaction',
             'koa.name': '/test-transaction',
             'koa.type': 'router',
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'auto.http.otel.koa',
             'sentry.op': 'router.koa',
           },
@@ -88,7 +86,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
         },
         {
           data: {
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'manual',
           },
           description: 'test-span',
@@ -102,7 +99,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
         },
         {
           data: {
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'manual',
           },
           description: 'child-span',

diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts
@@ -77,7 +77,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       'http.route': '/',
       'express.name': 'query',
       'express.type': 'middleware',
-      'otel.kind': 'INTERNAL',
     },
     description: 'query',
     op: 'middleware.express',
@@ -97,7 +96,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       'http.route': '/',
       'express.name': 'expressInit',
       'express.type': 'middleware',
-      'otel.kind': 'INTERNAL',
     },
     description: 'expressInit',
     op: 'middleware.express',
@@ -117,7 +115,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       'http.route': '/test-transaction',
       'express.name': '/test-transaction',
       'express.type': 'request_handler',
-      'otel.kind': 'INTERNAL',
     },
     description: '/test-transaction',
     op: 'request_handler.express',
@@ -158,7 +155,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
       'http.route': '/',
       'express.name': 'query',
       'express.type': 'middleware',
-      'otel.kind': 'INTERNAL',
     },
     description: 'query',
     op: 'middleware.express',
@@ -178,7 +174,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
       'http.route': '/',
       'express.name': 'expressInit',
       'express.type': 'middleware',
-      'otel.kind': 'INTERNAL',
     },
     description: 'expressInit',
     op: 'middleware.express',
@@ -198,7 +193,6 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
       'http.route': '/test-exception/:id',
       'express.name': '/test-exception/:id',
       'express.type': 'request_handler',
-      'otel.kind': 'INTERNAL',
     },
     description: '/test-exception/:id',
     op: 'request_handler.express',

diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
@@ -9,7 +9,6 @@ describe('GraphQL/Apollo Tests', () => {
           data: {
             'graphql.operation.type': 'query',
             'graphql.source': '{hello}',
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'auto.graphql.otel.graphql',
           },
           description: 'query',
@@ -31,7 +30,6 @@ describe('GraphQL/Apollo Tests', () => {
             'graphql.operation.name': 'Mutation',
             'graphql.operation.type': 'mutation',
             'graphql.source': 'mutation Mutation($email: String) {\n  login(email: $email)\n}',
-            'otel.kind': 'INTERNAL',
             'sentry.origin': 'auto.graphql.otel.graphql',
           },
           description: 'mutation Mutation',

diff --git a/dev-packages/node-integration-tests/suites/tracing/connect/test.ts b/dev-packages/node-integration-tests/suites/tracing/connect/test.ts
@@ -15,7 +15,6 @@ describe('connect auto-instrumentation', () => {
           'connect.name': '/',
           'connect.type': 'request_handler',
           'http.route': '/',
-          'otel.kind': 'INTERNAL',
           'sentry.origin': 'auto.http.otel.connect',
           'sentry.op': 'request_handler.connect',
         }),

diff --git a/dev-packages/node-integration-tests/suites/tracing/nestjs/test.ts b/dev-packages/node-integration-tests/suites/tracing/nestjs/test.ts
@@ -27,7 +27,6 @@ conditionalTest({ min: 16 })('nestjs auto instrumentation', () => {
           'nestjs.callback': 'getHello',
           'nestjs.controller': 'AppController',
           'nestjs.type': 'request_context',
-          'otel.kind': 'INTERNAL',
           'sentry.op': 'http',
         }),
       }),