Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(otel): Do not add otel.kind: INTERNAL attribute #12841

Merged
merged 3 commits into from
Jul 10, 2024
Merged

fix(otel): Do not add otel.kind: INTERNAL attribute #12841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc0a542
fix(otel): Do not add `otel.kind: INTERNAL` attribute
mydea Jul 10, 2024
d8099e1
fix it, oops
mydea Jul 10, 2024
f210f0e
fix remaining
mydea Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/aws-serverless-esm/tests/basic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
1 change: 0 additions & 1 deletion dev-packages/e2e-tests/test-applications/create-next-app/tests/server-transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ test('Sends server-side transactions to Sentry', async ({ baseURL }) => {
spans: [
{
data: {
'otel.kind': 'INTERNAL',
'sentry.origin': 'manual',
},
description: 'test-span',
Expand Down
2 changes: 0 additions & 2 deletions dev-packages/e2e-tests/test-applications/nestjs/tests/span-decorator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
4 changes: 0 additions & 4 deletions dev-packages/e2e-tests/test-applications/nestjs/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand All @@ -70,7 +69,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
},
{
data: {
'otel.kind': 'INTERNAL',
'sentry.origin': 'manual',
},
description: 'test-span',
Expand All @@ -84,7 +82,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
},
{
data: {
'otel.kind': 'INTERNAL',
'sentry.origin': 'manual',
},
description: 'child-span',
Expand All @@ -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),
Expand Down
2 changes: 0 additions & 2 deletions dev-packages/e2e-tests/test-applications/node-connect/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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',
Expand Down
3 changes: 0 additions & 3 deletions dev-packages/e2e-tests/test-applications/node-express-cjs-preload/tests/server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand All @@ -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',
},
Expand All @@ -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',
},
Expand Down
3 changes: 0 additions & 3 deletions dev-packages/e2e-tests/test-applications/node-express-esm-loader/tests/server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand All @@ -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',
},
Expand All @@ -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',
},
Expand Down
3 changes: 0 additions & 3 deletions dev-packages/e2e-tests/test-applications/node-express-esm-preload/tests/server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand All @@ -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',
},
Expand All @@ -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',
},
Expand Down
6 changes: 0 additions & 6 deletions dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down
4 changes: 0 additions & 4 deletions dev-packages/e2e-tests/test-applications/node-fastify/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand All @@ -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',
},
Expand All @@ -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',
Expand All @@ -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',
Expand Down
2 changes: 0 additions & 2 deletions dev-packages/e2e-tests/test-applications/node-hapi/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand All @@ -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',
Expand Down
4 changes: 0 additions & 4 deletions dev-packages/e2e-tests/test-applications/node-koa/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
Expand All @@ -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',
},
Expand All @@ -88,7 +86,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
},
{
data: {
'otel.kind': 'INTERNAL',
'sentry.origin': 'manual',
},
description: 'test-span',
Expand All @@ -102,7 +99,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
},
{
data: {
'otel.kind': 'INTERNAL',
'sentry.origin': 'manual',
},
description: 'child-span',
Expand Down
6 changes: 0 additions & 6 deletions dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down
2 changes: 0 additions & 2 deletions dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/tracing/connect/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}),
Expand Down
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/suites/tracing/nestjs/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}),
}),
Expand Down
Loading
Loading