Skip to content

Commit 2f41fa9

Browse files
mydeamydea
authored
ref(server-utils): Remove otel part from span origins (#23627)
We still have a bunch of `.otel.` parts in our span origins. This removes these as they no longer make any sense. Replacing `auto.http.otel.http` with `auto.http.http_server` for clarity.
1 parent 55b36b2 commit 2f41fa9

66 files changed

Lines changed: 185 additions & 187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dev-packages/cloudflare-integration-tests/suites/prisma/test.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ it('captures a transaction with Prisma spans for a D1 query via the @sentry/clou
6161
op: 'db.query',
6262
origin: 'auto.db.cloudflare.d1',
6363
},
64-
{ description: 'prisma:client:connect', op: undefined, origin: 'auto.db.otel.prisma' },
65-
{ description: 'prisma:client:load_engine', op: undefined, origin: 'auto.db.otel.prisma' },
66-
{ description: 'prisma:client:operation', op: undefined, origin: 'auto.db.otel.prisma' },
67-
{ description: 'prisma:client:serialize', op: undefined, origin: 'auto.db.otel.prisma' },
68-
{ description: 'prisma:engine:connect', op: undefined, origin: 'auto.db.otel.prisma' },
69-
{ description: 'prisma:engine:connection', op: 'db', origin: 'auto.db.otel.prisma' },
70-
{ description: 'prisma:engine:query', op: undefined, origin: 'auto.db.otel.prisma' },
71-
{ description: selectUsersQuery, op: 'db', origin: 'auto.db.otel.prisma' },
72-
{ description: 'prisma:engine:js:query:args', op: undefined, origin: 'auto.db.otel.prisma' },
73-
{ description: 'prisma:engine:js:query:sql', op: 'db', origin: 'auto.db.otel.prisma' },
74-
{ description: 'prisma:engine:js:query:result', op: undefined, origin: 'auto.db.otel.prisma' },
75-
{ description: 'prisma:engine:serialize', op: undefined, origin: 'auto.db.otel.prisma' },
76-
{ description: 'prisma:engine:response_json_serialization', op: undefined, origin: 'auto.db.otel.prisma' },
64+
{ description: 'prisma:client:connect', op: undefined, origin: 'auto.db.prisma' },
65+
{ description: 'prisma:client:load_engine', op: undefined, origin: 'auto.db.prisma' },
66+
{ description: 'prisma:client:operation', op: undefined, origin: 'auto.db.prisma' },
67+
{ description: 'prisma:client:serialize', op: undefined, origin: 'auto.db.prisma' },
68+
{ description: 'prisma:engine:connect', op: undefined, origin: 'auto.db.prisma' },
69+
{ description: 'prisma:engine:connection', op: 'db', origin: 'auto.db.prisma' },
70+
{ description: 'prisma:engine:query', op: undefined, origin: 'auto.db.prisma' },
71+
{ description: selectUsersQuery, op: 'db', origin: 'auto.db.prisma' },
72+
{ description: 'prisma:engine:js:query:args', op: undefined, origin: 'auto.db.prisma' },
73+
{ description: 'prisma:engine:js:query:sql', op: 'db', origin: 'auto.db.prisma' },
74+
{ description: 'prisma:engine:js:query:result', op: undefined, origin: 'auto.db.prisma' },
75+
{ description: 'prisma:engine:serialize', op: undefined, origin: 'auto.db.prisma' },
76+
{ description: 'prisma:engine:response_json_serialization', op: undefined, origin: 'auto.db.prisma' },
7777
]),
7878
);
7979
expect(spans.filter(span => span.description === 'prisma:engine:connection')).toHaveLength(2);

‎dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.dynamic.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ test.describe('nested SSR routes (client, server, server request)', () => {
244244
// HTTP client span - actual API URL with client operation
245245
expect(serverRequestHTTPClientSpan).toMatchObject({
246246
op: 'http.client',
247-
origin: 'auto.http.otel.node_fetch',
247+
origin: 'auto.http.node_fetch',
248248
description: 'GET http://localhost:3030/api/user/myUsername123.json', // http.client does not need to be parametrized
249249
data: {
250250
'sentry.op': 'http.client',
251-
'sentry.origin': 'auto.http.otel.node_fetch',
251+
'sentry.origin': 'auto.http.node_fetch',
252252
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
253253
'url.path': '/api/user/myUsername123.json',
254254
},

‎dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,11 @@ test.describe('nested SSR routes (client, server, server request)', () => {
250250
// HTTP client span - actual API URL with client operation
251251
expect(serverRequestHTTPClientSpan).toMatchObject({
252252
op: 'http.client',
253-
origin: 'auto.http.otel.node_fetch',
253+
origin: 'auto.http.node_fetch',
254254
description: 'GET http://localhost:3030/api/user/myUsername123.json', // http.client does not need to be parametrized
255255
data: {
256256
'sentry.op': 'http.client',
257-
'sentry.origin': 'auto.http.otel.node_fetch',
257+
'sentry.origin': 'auto.http.node_fetch',
258258
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
259259
'url.path': '/api/user/myUsername123.json',
260260
},

‎dev-packages/e2e-tests/test-applications/astro-6/tests/tracing.dynamic.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,11 @@ test.describe('nested SSR routes (client, server, server request)', () => {
250250
// HTTP client span - actual API URL with client operation
251251
expect(serverRequestHTTPClientSpan).toMatchObject({
252252
op: 'http.client',
253-
origin: 'auto.http.otel.node_fetch',
253+
origin: 'auto.http.node_fetch',
254254
description: 'GET http://localhost:3030/api/user/myUsername123.json', // http.client does not need to be parametrized
255255
data: {
256256
'sentry.op': 'http.client',
257-
'sentry.origin': 'auto.http.otel.node_fetch',
257+
'sentry.origin': 'auto.http.node_fetch',
258258
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
259259
'url.path': '/api/user/myUsername123.json',
260260
'url.full': expect.stringContaining('/api/user/myUsername123.json'),

‎dev-packages/e2e-tests/test-applications/astro-7/tests/tracing.dynamic.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,11 @@ test.describe('nested SSR routes (client, server, server request)', () => {
244244
// HTTP client span - actual API URL with client operation
245245
expect(serverRequestHTTPClientSpan).toMatchObject({
246246
op: 'http.client',
247-
origin: 'auto.http.otel.node_fetch',
247+
origin: 'auto.http.node_fetch',
248248
description: 'GET http://localhost:3030/api/user/myUsername123.json', // http.client does not need to be parametrized
249249
data: {
250250
'sentry.op': 'http.client',
251-
'sentry.origin': 'auto.http.otel.node_fetch',
251+
'sentry.origin': 'auto.http.node_fetch',
252252
'url.full': expect.stringContaining('/api/user/myUsername123.json'),
253253
'url.path': '/api/user/myUsername123.json',
254254
'url.full': expect.stringContaining('/api/user/myUsername123.json'),

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test.describe('Lambda layer', () => {
3737
data: {
3838
'sentry.sample_rate': 1,
3939
'sentry.segment.name.source': 'custom',
40-
'sentry.origin': 'auto.otel.aws_lambda',
40+
'sentry.origin': 'auto.aws_lambda',
4141
'sentry.op': 'function.aws',
4242
'cloud.account.id': '012345678912',
4343
'cloud.platform': 'aws_lambda',
@@ -49,7 +49,7 @@ test.describe('Lambda layer', () => {
4949
'sentry.kind': 'server',
5050
},
5151
op: 'function.aws',
52-
origin: 'auto.otel.aws_lambda',
52+
origin: 'auto.aws_lambda',
5353
span_id: expect.stringMatching(/[a-f0-9]{16}/),
5454
status: 'ok',
5555
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -108,7 +108,7 @@ test.describe('Lambda layer', () => {
108108
data: {
109109
'sentry.sample_rate': 1,
110110
'sentry.segment.name.source': 'custom',
111-
'sentry.origin': 'auto.otel.aws_lambda',
111+
'sentry.origin': 'auto.aws_lambda',
112112
'sentry.op': 'function.aws',
113113
'cloud.account.id': '012345678912',
114114
'cloud.platform': 'aws_lambda',
@@ -120,7 +120,7 @@ test.describe('Lambda layer', () => {
120120
'sentry.kind': 'server',
121121
},
122122
op: 'function.aws',
123-
origin: 'auto.otel.aws_lambda',
123+
origin: 'auto.aws_lambda',
124124
span_id: expect.stringMatching(/[a-f0-9]{16}/),
125125
status: 'ok',
126126
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -234,7 +234,7 @@ test.describe('Lambda layer', () => {
234234
data: {
235235
'sentry.sample_rate': 1,
236236
'sentry.segment.name.source': 'custom',
237-
'sentry.origin': 'auto.otel.aws_lambda',
237+
'sentry.origin': 'auto.aws_lambda',
238238
'sentry.op': 'function.aws',
239239
'cloud.account.id': '012345678912',
240240
'cloud.platform': 'aws_lambda',
@@ -246,7 +246,7 @@ test.describe('Lambda layer', () => {
246246
'sentry.kind': 'server',
247247
},
248248
op: 'function.aws',
249-
origin: 'auto.otel.aws_lambda',
249+
origin: 'auto.aws_lambda',
250250
span_id: expect.stringMatching(/[a-f0-9]{16}/),
251251
status: 'ok',
252252
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -283,11 +283,11 @@ test.describe('Lambda layer', () => {
283283
expect(transactionEvent.contexts?.trace).toEqual(
284284
expect.objectContaining({
285285
op: 'function.aws',
286-
origin: 'auto.otel.aws_lambda',
286+
origin: 'auto.aws_lambda',
287287
status: 'ok',
288288
data: expect.objectContaining({
289289
'sentry.op': 'function.aws',
290-
'sentry.origin': 'auto.otel.aws_lambda',
290+
'sentry.origin': 'auto.aws_lambda',
291291
'sentry.kind': 'server',
292292
'faas.id': 'arn:aws:lambda:us-east-1:012345678912:function:LayerCallback',
293293
'faas.name': 'LayerCallback',

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ test.describe('NPM package', () => {
2323
data: {
2424
'sentry.sample_rate': 1,
2525
'sentry.segment.name.source': 'custom',
26-
'sentry.origin': 'auto.otel.aws_lambda',
26+
'sentry.origin': 'auto.aws_lambda',
2727
'sentry.op': 'function.aws',
2828
'cloud.account.id': '012345678912',
2929
'cloud.platform': 'aws_lambda',
@@ -35,7 +35,7 @@ test.describe('NPM package', () => {
3535
'sentry.kind': 'server',
3636
},
3737
op: 'function.aws',
38-
origin: 'auto.otel.aws_lambda',
38+
origin: 'auto.aws_lambda',
3939
span_id: expect.stringMatching(/[a-f0-9]{16}/),
4040
status: 'ok',
4141
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -94,7 +94,7 @@ test.describe('NPM package', () => {
9494
data: {
9595
'sentry.sample_rate': 1,
9696
'sentry.segment.name.source': 'custom',
97-
'sentry.origin': 'auto.otel.aws_lambda',
97+
'sentry.origin': 'auto.aws_lambda',
9898
'sentry.op': 'function.aws',
9999
'cloud.account.id': '012345678912',
100100
'cloud.platform': 'aws_lambda',
@@ -106,7 +106,7 @@ test.describe('NPM package', () => {
106106
'sentry.kind': 'server',
107107
},
108108
op: 'function.aws',
109-
origin: 'auto.otel.aws_lambda',
109+
origin: 'auto.aws_lambda',
110110
span_id: expect.stringMatching(/[a-f0-9]{16}/),
111111
status: 'ok',
112112
trace_id: expect.stringMatching(/[a-f0-9]{32}/),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
1616
expect(transactionEvent.contexts?.trace).toEqual({
1717
data: {
1818
'sentry.segment.name.source': 'route',
19-
'sentry.origin': 'auto.http.otel.http',
19+
'sentry.origin': 'auto.http.http_server',
2020
'sentry.op': 'http.server',
2121
'sentry.sample_rate': 1,
2222
'sentry.kind': 'server',
@@ -51,7 +51,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
5151
span_id: expect.stringMatching(/[a-f0-9]{16}/),
5252
status: 'ok',
5353
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
54-
origin: 'auto.http.otel.http',
54+
origin: 'auto.http.http_server',
5555
});
5656

5757
expect(transactionEvent).toEqual(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
1616
expect(transactionEvent.contexts?.trace).toEqual({
1717
data: {
1818
'sentry.segment.name.source': 'route',
19-
'sentry.origin': 'auto.http.otel.http',
19+
'sentry.origin': 'auto.http.http_server',
2020
'sentry.op': 'http.server',
2121
'sentry.sample_rate': 1,
2222
'sentry.kind': 'server',
@@ -51,7 +51,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
5151
span_id: expect.stringMatching(/[a-f0-9]{16}/),
5252
status: 'ok',
5353
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
54-
origin: 'auto.http.otel.http',
54+
origin: 'auto.http.http_server',
5555
});
5656

5757
expect(transactionEvent.contexts?.response).toEqual({

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
4242
expect(transactionEvent.contexts?.trace).toEqual({
4343
data: {
4444
'sentry.segment.name.source': 'route',
45-
'sentry.origin': 'auto.http.otel.http',
45+
'sentry.origin': 'auto.http.http_server',
4646
'sentry.op': 'http.server',
4747
'sentry.sample_rate': 1,
4848
'sentry.kind': 'server',
@@ -77,7 +77,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
7777
span_id: expect.stringMatching(/[a-f0-9]{16}/),
7878
status: 'ok',
7979
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
80-
origin: 'auto.http.otel.http',
80+
origin: 'auto.http.http_server',
8181
});
8282

8383
expect(transactionEvent).toEqual(

0 commit comments

Comments
 (0)