Skip to content

ref(server-utils): Remove otel part from span origins #23627

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

Merged
mydea merged 2 commits into from
Aug 26, 2026
Merged

ref(server-utils): Remove otel part from span origins #23627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9703ca1
ref: Remove `.otel` part of span origins
mydea Aug 26, 2026
0b91865
ref http server
mydea Aug 26, 2026
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
26 changes: 13 additions & 13 deletions dev-packages/cloudflare-integration-tests/suites/prisma/test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@ it('captures a transaction with Prisma spans for a D1 query via the @sentry/clou
op: 'db.query',
origin: 'auto.db.cloudflare.d1',
},
{ description: 'prisma:client:connect', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: 'prisma:client:load_engine', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: 'prisma:client:operation', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: 'prisma:client:serialize', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: 'prisma:engine:connect', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: 'prisma:engine:connection', op: 'db', origin: 'auto.db.otel.prisma' },
{ description: 'prisma:engine:query', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: selectUsersQuery, op: 'db', origin: 'auto.db.otel.prisma' },
{ description: 'prisma:engine:js:query:args', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: 'prisma:engine:js:query:sql', op: 'db', origin: 'auto.db.otel.prisma' },
{ description: 'prisma:engine:js:query:result', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: 'prisma:engine:serialize', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: 'prisma:engine:response_json_serialization', op: undefined, origin: 'auto.db.otel.prisma' },
{ description: 'prisma:client:connect', op: undefined, origin: 'auto.db.prisma' },
{ description: 'prisma:client:load_engine', op: undefined, origin: 'auto.db.prisma' },
{ description: 'prisma:client:operation', op: undefined, origin: 'auto.db.prisma' },
{ description: 'prisma:client:serialize', op: undefined, origin: 'auto.db.prisma' },
{ description: 'prisma:engine:connect', op: undefined, origin: 'auto.db.prisma' },
{ description: 'prisma:engine:connection', op: 'db', origin: 'auto.db.prisma' },
{ description: 'prisma:engine:query', op: undefined, origin: 'auto.db.prisma' },
{ description: selectUsersQuery, op: 'db', origin: 'auto.db.prisma' },
{ description: 'prisma:engine:js:query:args', op: undefined, origin: 'auto.db.prisma' },
{ description: 'prisma:engine:js:query:sql', op: 'db', origin: 'auto.db.prisma' },
{ description: 'prisma:engine:js:query:result', op: undefined, origin: 'auto.db.prisma' },
{ description: 'prisma:engine:serialize', op: undefined, origin: 'auto.db.prisma' },
{ description: 'prisma:engine:response_json_serialization', op: undefined, origin: 'auto.db.prisma' },
]),
);
expect(spans.filter(span => span.description === 'prisma:engine:connection')).toHaveLength(2);
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.dynamic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@ test.describe('nested SSR routes (client, server, server request)', () => {
// HTTP client span - actual API URL with client operation
expect(serverRequestHTTPClientSpan).toMatchObject({
op: 'http.client',
origin: 'auto.http.otel.node_fetch',
origin: 'auto.http.node_fetch',
description: 'GET http://localhost:3030/api/user/myUsername123.json', // http.client does not need to be parametrized
data: {
'sentry.op': 'http.client',
'sentry.origin': 'auto.http.otel.node_fetch',
'sentry.origin': 'auto.http.node_fetch',
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
'url.path': '/api/user/myUsername123.json',
},
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@ test.describe('nested SSR routes (client, server, server request)', () => {
// HTTP client span - actual API URL with client operation
expect(serverRequestHTTPClientSpan).toMatchObject({
op: 'http.client',
origin: 'auto.http.otel.node_fetch',
origin: 'auto.http.node_fetch',
description: 'GET http://localhost:3030/api/user/myUsername123.json', // http.client does not need to be parametrized
data: {
'sentry.op': 'http.client',
'sentry.origin': 'auto.http.otel.node_fetch',
'sentry.origin': 'auto.http.node_fetch',
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
'url.path': '/api/user/myUsername123.json',
},
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/astro-6/tests/tracing.dynamic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,11 @@ test.describe('nested SSR routes (client, server, server request)', () => {
// HTTP client span - actual API URL with client operation
expect(serverRequestHTTPClientSpan).toMatchObject({
op: 'http.client',
origin: 'auto.http.otel.node_fetch',
origin: 'auto.http.node_fetch',
description: 'GET http://localhost:3030/api/user/myUsername123.json', // http.client does not need to be parametrized
data: {
'sentry.op': 'http.client',
'sentry.origin': 'auto.http.otel.node_fetch',
'sentry.origin': 'auto.http.node_fetch',
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
'url.path': '/api/user/myUsername123.json',
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/astro-7/tests/tracing.dynamic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@ test.describe('nested SSR routes (client, server, server request)', () => {
// HTTP client span - actual API URL with client operation
expect(serverRequestHTTPClientSpan).toMatchObject({
op: 'http.client',
origin: 'auto.http.otel.node_fetch',
origin: 'auto.http.node_fetch',
description: 'GET http://localhost:3030/api/user/myUsername123.json', // http.client does not need to be parametrized
data: {
'sentry.op': 'http.client',
'sentry.origin': 'auto.http.otel.node_fetch',
'sentry.origin': 'auto.http.node_fetch',
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
'url.path': '/api/user/myUsername123.json',
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
Expand Down
16 changes: 8 additions & 8 deletions dev-packages/e2e-tests/test-applications/aws-serverless-layer/tests/layer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ test.describe('Lambda layer', () => {
data: {
'sentry.sample_rate': 1,
'sentry.segment.name.source': 'custom',
'sentry.origin': 'auto.otel.aws_lambda',
'sentry.origin': 'auto.aws_lambda',
'sentry.op': 'function.aws',
'cloud.account.id': '012345678912',
'cloud.platform': 'aws_lambda',
Expand All @@ -49,7 +49,7 @@ test.describe('Lambda layer', () => {
'sentry.kind': 'server',
},
op: 'function.aws',
origin: 'auto.otel.aws_lambda',
origin: 'auto.aws_lambda',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
Expand Down Expand Up @@ -108,7 +108,7 @@ test.describe('Lambda layer', () => {
data: {
'sentry.sample_rate': 1,
'sentry.segment.name.source': 'custom',
'sentry.origin': 'auto.otel.aws_lambda',
'sentry.origin': 'auto.aws_lambda',
'sentry.op': 'function.aws',
'cloud.account.id': '012345678912',
'cloud.platform': 'aws_lambda',
Expand All @@ -120,7 +120,7 @@ test.describe('Lambda layer', () => {
'sentry.kind': 'server',
},
op: 'function.aws',
origin: 'auto.otel.aws_lambda',
origin: 'auto.aws_lambda',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
Expand Down Expand Up @@ -234,7 +234,7 @@ test.describe('Lambda layer', () => {
data: {
'sentry.sample_rate': 1,
'sentry.segment.name.source': 'custom',
'sentry.origin': 'auto.otel.aws_lambda',
'sentry.origin': 'auto.aws_lambda',
'sentry.op': 'function.aws',
'cloud.account.id': '012345678912',
'cloud.platform': 'aws_lambda',
Expand All @@ -246,7 +246,7 @@ test.describe('Lambda layer', () => {
'sentry.kind': 'server',
},
op: 'function.aws',
origin: 'auto.otel.aws_lambda',
origin: 'auto.aws_lambda',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
Expand Down Expand Up @@ -283,11 +283,11 @@ test.describe('Lambda layer', () => {
expect(transactionEvent.contexts?.trace).toEqual(
expect.objectContaining({
op: 'function.aws',
origin: 'auto.otel.aws_lambda',
origin: 'auto.aws_lambda',
status: 'ok',
data: expect.objectContaining({
'sentry.op': 'function.aws',
'sentry.origin': 'auto.otel.aws_lambda',
'sentry.origin': 'auto.aws_lambda',
'sentry.kind': 'server',
'faas.id': 'arn:aws:lambda:us-east-1:012345678912:function:LayerCallback',
'faas.name': 'LayerCallback',
Expand Down
8 changes: 4 additions & 4 deletions dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test.describe('NPM package', () => {
data: {
'sentry.sample_rate': 1,
'sentry.segment.name.source': 'custom',
'sentry.origin': 'auto.otel.aws_lambda',
'sentry.origin': 'auto.aws_lambda',
'sentry.op': 'function.aws',
'cloud.account.id': '012345678912',
'cloud.platform': 'aws_lambda',
Expand All @@ -35,7 +35,7 @@ test.describe('NPM package', () => {
'sentry.kind': 'server',
},
op: 'function.aws',
origin: 'auto.otel.aws_lambda',
origin: 'auto.aws_lambda',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
Expand Down Expand Up @@ -94,7 +94,7 @@ test.describe('NPM package', () => {
data: {
'sentry.sample_rate': 1,
'sentry.segment.name.source': 'custom',
'sentry.origin': 'auto.otel.aws_lambda',
'sentry.origin': 'auto.aws_lambda',
'sentry.op': 'function.aws',
'cloud.account.id': '012345678912',
'cloud.platform': 'aws_lambda',
Expand All @@ -106,7 +106,7 @@ test.describe('NPM package', () => {
'sentry.kind': 'server',
},
op: 'function.aws',
origin: 'auto.otel.aws_lambda',
origin: 'auto.aws_lambda',
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
expect(transactionEvent.contexts?.trace).toEqual({
data: {
'sentry.segment.name.source': 'route',
'sentry.origin': 'auto.http.otel.http',
'sentry.origin': 'auto.http.http_server',
'sentry.op': 'http.server',
'sentry.sample_rate': 1,
'sentry.kind': 'server',
Expand Down Expand Up @@ -51,7 +51,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.http',
origin: 'auto.http.http_server',
});

expect(transactionEvent).toEqual(
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
expect(transactionEvent.contexts?.trace).toEqual({
data: {
'sentry.segment.name.source': 'route',
'sentry.origin': 'auto.http.otel.http',
'sentry.origin': 'auto.http.http_server',
'sentry.op': 'http.server',
'sentry.sample_rate': 1,
'sentry.kind': 'server',
Expand Down Expand Up @@ -51,7 +51,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.http',
origin: 'auto.http.http_server',
});

expect(transactionEvent.contexts?.response).toEqual({
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
expect(transactionEvent.contexts?.trace).toEqual({
data: {
'sentry.segment.name.source': 'route',
'sentry.origin': 'auto.http.otel.http',
'sentry.origin': 'auto.http.http_server',
'sentry.op': 'http.server',
'sentry.sample_rate': 1,
'sentry.kind': 'server',
Expand Down Expand Up @@ -77,7 +77,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.http',
origin: 'auto.http.http_server',
});

expect(transactionEvent).toEqual(
Expand Down
16 changes: 8 additions & 8 deletions ...packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
expect(outboundTransaction.contexts?.trace).toEqual({
data: {
'sentry.segment.name.source': 'route',
'sentry.origin': 'auto.http.otel.http',
'sentry.origin': 'auto.http.http_server',
'sentry.op': 'http.server',
'sentry.sample_rate': 1,
'sentry.kind': 'server',
Expand Down Expand Up @@ -92,13 +92,13 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: traceId,
origin: 'auto.http.otel.http',
origin: 'auto.http.http_server',
});

expect(inboundTransaction.contexts?.trace).toEqual({
data: {
'sentry.segment.name.source': 'route',
'sentry.origin': 'auto.http.otel.http',
'sentry.origin': 'auto.http.http_server',
'sentry.op': 'http.server',
'sentry.kind': 'server',
'http.response.status_code': 200,
Expand Down Expand Up @@ -129,7 +129,7 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: traceId,
origin: 'auto.http.otel.http',
origin: 'auto.http.http_server',
});
});

Expand Down Expand Up @@ -188,7 +188,7 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
expect(outboundTransaction.contexts?.trace).toEqual({
data: {
'sentry.segment.name.source': 'route',
'sentry.origin': 'auto.http.otel.http',
'sentry.origin': 'auto.http.http_server',
'sentry.op': 'http.server',
'sentry.sample_rate': 1,
'sentry.kind': 'server',
Expand Down Expand Up @@ -223,13 +223,13 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: traceId,
origin: 'auto.http.otel.http',
origin: 'auto.http.http_server',
});

expect(inboundTransaction.contexts?.trace).toEqual({
data: expect.objectContaining({
'sentry.segment.name.source': 'route',
'sentry.origin': 'auto.http.otel.http',
'sentry.origin': 'auto.http.http_server',
'sentry.op': 'http.server',
'sentry.kind': 'server',
'http.response.status_code': 200,
Expand All @@ -256,7 +256,7 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: traceId,
origin: 'auto.http.otel.http',
origin: 'auto.http.http_server',
});
});

Expand Down
12 changes: 6 additions & 6 deletions dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
expect(transactionEvent.contexts?.trace).toEqual({
data: {
'sentry.segment.name.source': 'route',
'sentry.origin': 'auto.http.otel.http',
'sentry.origin': 'auto.http.http_server',
'sentry.op': 'http.server',
'sentry.sample_rate': 1,
'sentry.kind': 'server',
Expand Down Expand Up @@ -55,7 +55,7 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.http',
origin: 'auto.http.http_server',
});

expect(transactionEvent).toEqual(
Expand All @@ -65,7 +65,7 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.origin': 'auto.http.otel.fastify',
'sentry.origin': 'auto.http.fastify',
'sentry.op': 'middleware',
'hook.name': 'fastify -> @sentry/instrumentation-fastify -> @fastify/middie - onRequest',
'fastify.type': 'hook',
Expand All @@ -77,13 +77,13 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
origin: 'auto.http.otel.fastify',
origin: 'auto.http.fastify',
},
{
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'sentry.origin': 'auto.http.otel.fastify',
'sentry.origin': 'auto.http.fastify',
'sentry.op': 'handler',
'hook.name': 'fastify -> @sentry/instrumentation-fastify -> @fastify/middie - route-handler',
'fastify.type': 'request-handler',
Expand All @@ -96,7 +96,7 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => {
start_timestamp: expect.any(Number),
timestamp: expect.any(Number),
status: 'ok',
origin: 'auto.http.otel.fastify',
origin: 'auto.http.fastify',
},
{
span_id: expect.stringMatching(/[a-f0-9]{16}/),
Expand Down
4 changes: 2 additions & 2 deletions ...s/e2e-tests/test-applications/nestjs-with-submodules-decorator/tests/transactions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
expect(transactionEvent.contexts?.trace).toEqual({
data: {
'sentry.segment.name.source': 'route',
'sentry.origin': 'auto.http.otel.http',
'sentry.origin': 'auto.http.http_server',
'sentry.op': 'http.server',
'sentry.sample_rate': 1,
'sentry.kind': 'server',
Expand Down Expand Up @@ -51,7 +51,7 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
status: 'ok',
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.http',
origin: 'auto.http.http_server',
});

expect(transactionEvent).toEqual(
Expand Down
Loading
Loading