From 9703ca1bbe876a34bd7d412c8e0ece6d10171ae2 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Wed, 26 Aug 2026 11:12:45 +0200 Subject: [PATCH 1/2] ref: Remove `.otel` part of span origins --- .../suites/prisma/test.ts | 26 +++++++++---------- .../astro-4/tests/tracing.dynamic.test.ts | 4 +-- .../astro-5/tests/tracing.dynamic.test.ts | 4 +-- .../astro-6/tests/tracing.dynamic.test.ts | 4 +-- .../astro-7/tests/tracing.dynamic.test.ts | 4 +-- .../aws-serverless-layer/tests/layer.test.ts | 16 ++++++------ .../aws-serverless/tests/npm.test.ts | 8 +++--- .../nestjs-11/tests/transactions.test.ts | 4 +-- .../nestjs-8/tests/transactions.test.ts | 4 +-- .../nestjs-basic/tests/transactions.test.ts | 4 +-- .../tests/propagation.test.ts | 16 ++++++------ .../nestjs-fastify/tests/transactions.test.ts | 12 ++++----- .../tests/transactions.test.ts | 4 +-- .../tests/transactions.test.ts | 4 +-- .../nextjs-14/tests/propagation.test.ts | 2 +- .../tests/request-instrumentation.test.ts | 2 +- .../nextjs-16/tests/middleware.test.ts | 4 +-- .../tests/server.test.ts | 2 +- .../tests/spans.test.ts | 2 +- .../tests/transactions.test.ts | 4 +-- .../node-express/tests/transactions.test.ts | 4 +-- .../node-fastify-3/tests/propagation.test.ts | 16 ++++++------ .../node-fastify-3/tests/transactions.test.ts | 12 ++++----- .../node-fastify-4/tests/propagation.test.ts | 16 ++++++------ .../node-fastify-4/tests/transactions.test.ts | 8 +++--- .../node-fastify-5/tests/propagation.test.ts | 16 ++++++------ .../node-fastify-5/tests/transactions.test.ts | 8 +++--- .../node-hapi/tests/transactions.test.ts | 4 +-- .../node-koa/tests/propagation.test.ts | 16 ++++++------ .../node-koa/tests/transactions.test.ts | 4 +-- .../tests/tracing.server.test.ts | 2 +- .../tests/tracing.test.ts | 6 ++--- .../nuxt-3-min/tests/tracing.server.test.ts | 2 +- .../nuxt-3-min/tests/tracing.test.ts | 6 ++--- .../tests/tracing.server.test.ts | 2 +- .../tests/tracing.test.ts | 6 ++--- .../nuxt-3/tests/tracing.server.test.ts | 2 +- .../nuxt-3/tests/tracing.test.ts | 6 ++--- .../nuxt-4/tests/tracing.server.test.ts | 2 +- .../nuxt-4/tests/tracing.test.ts | 6 ++--- .../nuxt-5/tests/tracing.server.test.ts | 2 +- .../nuxt-5/tests/tracing.test.ts | 6 ++--- .../tsx-express/tests/transactions.test.ts | 4 +-- .../suites/tracing/fastify/test.ts | 8 +++--- .../tracing/graphql-tracing-channel/test.ts | 4 +-- .../http-client-spans/fetch-basic/test.ts | 4 +-- .../http-client-spans/fetch-error/test.ts | 2 +- .../fetch-forward-request-hook/test.ts | 4 +-- .../fetch-headers-to-span-attributes/test.ts | 2 +- .../fetch-strip-query/test.ts | 4 +-- .../suites/tracing/httpIntegration/test.ts | 4 +-- .../tracing/mongoose-tracing-channel/test.ts | 4 +-- .../tracing/mysql2-tracing-channel/test.ts | 4 +-- .../suites/tracing/postgres-streamed/test.ts | 4 +-- .../suites/tracing/prisma-orm-v5/test.ts | 14 +++++----- .../suites/tracing/prisma-orm-v6/test.ts | 4 +-- .../suites/tracing/prisma-orm-v7/test.ts | 6 ++--- packages/astro/src/server/sdk.ts | 2 +- packages/astro/test/server/sdk.test.ts | 2 +- .../aws-serverless/src/requestSpanOptions.ts | 2 +- .../utils/dropMiddlewareTunnelRequests.ts | 2 +- .../http/httpServerSpansIntegration.ts | 2 +- .../node-fetch/undici-instrumentation.ts | 2 +- .../node/test/integrations/undici.test.ts | 2 +- .../integrations/fastify/instrumentation.ts | 2 +- .../src/integrations/prisma/tracing-helper.ts | 2 +- 66 files changed, 185 insertions(+), 187 deletions(-) diff --git a/dev-packages/cloudflare-integration-tests/suites/prisma/test.ts b/dev-packages/cloudflare-integration-tests/suites/prisma/test.ts index 981f10f2eab0..586792d669c5 100644 --- a/dev-packages/cloudflare-integration-tests/suites/prisma/test.ts +++ b/dev-packages/cloudflare-integration-tests/suites/prisma/test.ts @@ -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); diff --git a/dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.dynamic.test.ts b/dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.dynamic.test.ts index d04bd128dbab..8414b3f4bd76 100644 --- a/dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.dynamic.test.ts +++ b/dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.dynamic.test.ts @@ -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', }, diff --git a/dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts b/dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts index 849c17fb386a..b0a6a9109207 100644 --- a/dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts +++ b/dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts @@ -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', }, diff --git a/dev-packages/e2e-tests/test-applications/astro-6/tests/tracing.dynamic.test.ts b/dev-packages/e2e-tests/test-applications/astro-6/tests/tracing.dynamic.test.ts index c5d5547afc76..9227d2a3b35f 100644 --- a/dev-packages/e2e-tests/test-applications/astro-6/tests/tracing.dynamic.test.ts +++ b/dev-packages/e2e-tests/test-applications/astro-6/tests/tracing.dynamic.test.ts @@ -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'), diff --git a/dev-packages/e2e-tests/test-applications/astro-7/tests/tracing.dynamic.test.ts b/dev-packages/e2e-tests/test-applications/astro-7/tests/tracing.dynamic.test.ts index 863c844c6fcd..58c72c298f7a 100644 --- a/dev-packages/e2e-tests/test-applications/astro-7/tests/tracing.dynamic.test.ts +++ b/dev-packages/e2e-tests/test-applications/astro-7/tests/tracing.dynamic.test.ts @@ -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'), diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless-layer/tests/layer.test.ts b/dev-packages/e2e-tests/test-applications/aws-serverless-layer/tests/layer.test.ts index b59043647ddc..525e51b01136 100644 --- a/dev-packages/e2e-tests/test-applications/aws-serverless-layer/tests/layer.test.ts +++ b/dev-packages/e2e-tests/test-applications/aws-serverless-layer/tests/layer.test.ts @@ -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', @@ -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}/), @@ -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', @@ -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}/), @@ -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', @@ -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}/), @@ -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', diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts index cf35053e572f..a1d4598a9d19 100644 --- a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts +++ b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts @@ -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', @@ -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}/), @@ -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', @@ -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}/), diff --git a/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts index b4baeaec78cf..d864ad454620 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts index bc877b06d278..c013e335be0a 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent.contexts?.response).toEqual({ diff --git a/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts index c7e781d9d80f..77e790659385 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts index 34eabe32d817..65521d682bb0 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', }); }); @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: expect.objectContaining({ 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', }); }); diff --git a/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts index da0c75b2d5fb..03fef6208ba0 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent).toEqual( @@ -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', @@ -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', @@ -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}/), diff --git a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/tests/transactions.test.ts index c3a9488127b0..fa8081d548b3 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/tests/transactions.test.ts index a14df196c572..0b71d57749e4 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/nextjs-14/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-14/tests/propagation.test.ts index 26395d6e0145..92e60066a559 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-14/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/nextjs-14/tests/propagation.test.ts @@ -48,7 +48,7 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL, request } expect(inboundTransaction.contexts?.trace?.trace_id).toBe(outboundTransaction.contexts?.trace?.trace_id); const httpClientSpan = outboundTransaction.spans?.find( - span => span.op === 'http.client' && span.data?.['sentry.origin'] === 'auto.http.otel.node_fetch', + span => span.op === 'http.client' && span.data?.['sentry.origin'] === 'auto.http.node_fetch', ); // Right now we assert that the OTEL span is the last span before propagating diff --git a/dev-packages/e2e-tests/test-applications/nextjs-14/tests/request-instrumentation.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-14/tests/request-instrumentation.test.ts index 7289c004d754..f1524ababc19 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-14/tests/request-instrumentation.test.ts +++ b/dev-packages/e2e-tests/test-applications/nextjs-14/tests/request-instrumentation.test.ts @@ -17,7 +17,7 @@ test('Should send a transaction with a fetch span', async ({ page }) => { data: expect.objectContaining({ 'http.request.method': 'GET', 'sentry.op': 'http.client', - 'sentry.origin': 'auto.http.otel.node_fetch', + 'sentry.origin': 'auto.http.node_fetch', }), description: 'GET https://github.com/', }), diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16/tests/middleware.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-16/tests/middleware.test.ts index d1f18f32ca54..23fc112a9a72 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-16/tests/middleware.test.ts +++ b/dev-packages/e2e-tests/test-applications/nextjs-16/tests/middleware.test.ts @@ -124,7 +124,7 @@ test('Should trace outgoing fetch requests inside middleware and create breadcru 'network.peer.port': 3030, 'sentry.kind': 'client', 'sentry.op': 'http.client', - 'sentry.origin': 'auto.http.otel.node_fetch', + 'sentry.origin': 'auto.http.node_fetch', 'server.address': 'localhost', 'server.port': 3030, 'url.full': 'http://localhost:3030/', @@ -134,7 +134,7 @@ test('Should trace outgoing fetch requests inside middleware and create breadcru }, description: 'GET http://localhost:3030/', op: 'http.client', - origin: 'auto.http.otel.node_fetch', + origin: 'auto.http.node_fetch', parent_span_id: expect.stringMatching(/[a-f0-9]{16}/), span_id: expect.stringMatching(/[a-f0-9]{16}/), start_timestamp: expect.any(Number), 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 index 81f01e81cf77..0fce20f5b245 100644 --- 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 @@ -49,7 +49,7 @@ test('Should record a transaction for route with parameters', async ({ request } 'network.transport': 'tcp', 'sentry.kind': 'server', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.sample_rate': 1, 'sentry.segment.name.source': 'route', }), diff --git a/dev-packages/e2e-tests/test-applications/node-express-streaming/tests/spans.test.ts b/dev-packages/e2e-tests/test-applications/node-express-streaming/tests/spans.test.ts index 5fc4fa3240d4..178f430c970d 100644 --- a/dev-packages/e2e-tests/test-applications/node-express-streaming/tests/spans.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-express-streaming/tests/spans.test.ts @@ -19,7 +19,7 @@ test('Sends streamed spans for an API route', async ({ baseURL }) => { expect(rootSpan!.status).toBe('ok'); expect(rootSpan!.trace_id).toMatch(/[a-f0-9]{32}/); expect(rootSpan!.attributes['sentry.segment.name.source']?.value).toBe('route'); - expect(rootSpan!.attributes['sentry.origin']?.value).toBe('auto.http.otel.http'); + expect(rootSpan!.attributes['sentry.origin']?.value).toBe('auto.http'); expect(rootSpan!.attributes['http.response.status_code']?.value).toBe(200); const childSpans = spans.filter(span => !span.is_segment); diff --git a/dev-packages/e2e-tests/test-applications/node-express-v5/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-express-v5/tests/transactions.test.ts index 99d212432614..f031f6a51a6d 100644 --- a/dev-packages/e2e-tests/test-applications/node-express-v5/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-express-v5/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent.contexts?.response).toEqual({ 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 index 8c427018e99a..18240ed59cfd 100644 --- 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 @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent.contexts?.response).toEqual({ diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/propagation.test.ts index e3742504fb03..4456feb78deb 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/propagation.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', }); }); @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -266,7 +266,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', }); }); diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/transactions.test.ts index e1f4fc1c73d9..0dbce16709ac 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -56,7 +56,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', }); expect(transactionEvent).toEqual( @@ -75,7 +75,7 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => { /* expect(spans).toContainEqual({ data: { - 'sentry.origin': 'auto.http.otel.fastify', + 'sentry.origin': 'auto.http.fastify', 'sentry.op': 'handler', 'fastify.root': '@sentry/instrumentation-fastify', 'http.request.method': 'GET', @@ -91,13 +91,13 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => { status: 'ok', timestamp: expect.any(Number), trace_id: expect.stringMatching(/[a-f0-9]{32}/), - origin: 'auto.http.otel.fastify', + origin: 'auto.http.fastify', }); */ expect(spans).toContainEqual({ data: expect.objectContaining({ - 'sentry.origin': 'auto.http.otel.fastify', + 'sentry.origin': 'auto.http.fastify', 'sentry.op': 'handler', 'fastify.type': expect.stringMatching(/request[-_]handler/), 'http.route': '/test-transaction', @@ -110,7 +110,7 @@ test.skip('Sends an API route transaction', async ({ baseURL }) => { status: 'ok', timestamp: expect.any(Number), trace_id: expect.stringMatching(/[a-f0-9]{32}/), - origin: 'auto.http.otel.fastify', + origin: 'auto.http.fastify', }); expect(spans).toContainEqual({ diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/propagation.test.ts index 481549e66952..d93c50ca182b 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/propagation.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', }); }); @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -266,7 +266,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', }); }); diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/transactions.test.ts index 7fe0bf2c4a5b..46d6b479b7e7 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent).toEqual( @@ -72,7 +72,7 @@ test('Sends an API route transaction', async ({ baseURL }) => { 'hook.callback.name': 'anonymous', 'hook.name': 'fastify -> @sentry/instrumentation-fastify - onRequest', 'sentry.op': 'middleware', - 'sentry.origin': 'auto.http.otel.fastify', + 'sentry.origin': 'auto.http.fastify', }, description: '@sentry/instrumentation-fastify - onRequest', op: 'middleware', @@ -82,7 +82,7 @@ test('Sends an API route transaction', async ({ baseURL }) => { status: 'ok', timestamp: expect.any(Number), trace_id: expect.stringMatching(/[a-f0-9]{32}/), - origin: 'auto.http.otel.fastify', + origin: 'auto.http.fastify', }); expect(spans).toContainEqual({ diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts index 70e16b2cdd60..978b4b53cba6 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', }); }); @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -266,7 +266,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', }); }); diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/transactions.test.ts index 8bed705fe905..1426c0a46bb2 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent).toEqual( @@ -72,7 +72,7 @@ test('Sends an API route transaction', async ({ baseURL }) => { 'hook.callback.name': 'anonymous', 'hook.name': 'fastify -> @sentry/instrumentation-fastify - onRequest', 'sentry.op': 'middleware', - 'sentry.origin': 'auto.http.otel.fastify', + 'sentry.origin': 'auto.http.fastify', }, description: '@sentry/instrumentation-fastify - onRequest', op: 'middleware', @@ -82,7 +82,7 @@ test('Sends an API route transaction', async ({ baseURL }) => { status: 'ok', timestamp: expect.any(Number), trace_id: expect.stringMatching(/[a-f0-9]{32}/), - origin: 'auto.http.otel.fastify', + origin: 'auto.http.fastify', }); expect(spans).toContainEqual({ 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 index 25bffcb0c280..36f57ccd88b8 100644 --- 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 @@ -15,7 +15,7 @@ test('Sends successful transaction', async ({ baseURL }) => { expect(transactionEvent.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -50,7 +50,7 @@ test('Sends successful 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', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts index e084391353ca..d54bad47c8ad 100644 --- a/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts @@ -56,7 +56,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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -91,13 +91,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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -128,7 +128,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', }); }); @@ -187,7 +187,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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -222,13 +222,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', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -265,7 +265,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', }); }); 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 index 48cd3a26c07c..7dfb7cb7828d 100644 --- 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 @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent).toMatchObject({ diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.server.test.ts index df8032551228..340362afbda3 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.test.ts index 64ae846d00d1..6efa37fd4f3c 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.server.test.ts index 260af81f11a4..be5db5509c48 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.test.ts index 5851ca1721db..9fa8ce49b8b2 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.test.ts @@ -55,7 +55,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }, }, }); @@ -128,7 +128,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }), }), }), @@ -142,7 +142,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.server.test.ts index cc4b6cd36567..972bd864e662 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.test.ts index 7ec391c3174c..f3760875b1e0 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.server.test.ts index e7b6a5ddfc09..602248d4e85f 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.test.ts index 8a11a0c3db81..6afef484b14f 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.server.test.ts index 91ccc021ceda..a867292f0354 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.test.ts index fcaeef2d46c5..b0d29f0089b2 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.server.test.ts index ebd367d96031..767d018cf48f 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.test.ts index 29f87cf85fa8..852fe35d706f 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http.otel.http', + origin: 'auto.http', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts index 3854337c3b9c..43209144d8ff 100644 --- a/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts @@ -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', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', }); expect(transactionEvent.contexts?.response).toEqual({ diff --git a/dev-packages/node-integration-tests/suites/tracing/fastify/test.ts b/dev-packages/node-integration-tests/suites/tracing/fastify/test.ts index 445aed9abb9f..93bfbde3e323 100644 --- a/dev-packages/node-integration-tests/suites/tracing/fastify/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/fastify/test.ts @@ -16,19 +16,19 @@ describe('fastify auto-instrumentation', () => { spans: expect.arrayContaining([ expect.objectContaining({ op: 'middleware', - origin: 'auto.http.otel.fastify', + origin: 'auto.http.fastify', data: expect.objectContaining({ 'fastify.type': 'hook', 'sentry.op': 'middleware', - 'sentry.origin': 'auto.http.otel.fastify', + 'sentry.origin': 'auto.http.fastify', }), }), expect.objectContaining({ op: 'handler', - origin: 'auto.http.otel.fastify', + origin: 'auto.http.fastify', data: expect.objectContaining({ 'sentry.op': 'handler', - 'sentry.origin': 'auto.http.otel.fastify', + 'sentry.origin': 'auto.http.fastify', }), }), expect.objectContaining({ diff --git a/dev-packages/node-integration-tests/suites/tracing/graphql-tracing-channel/test.ts b/dev-packages/node-integration-tests/suites/tracing/graphql-tracing-channel/test.ts index fff0e477a96a..3347c606e4fb 100644 --- a/dev-packages/node-integration-tests/suites/tracing/graphql-tracing-channel/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/graphql-tracing-channel/test.ts @@ -56,8 +56,8 @@ conditionalTest({ min: 22 })('GraphQL tracing channel Test', () => { .expect({ transaction: event => { const spans = event.spans || []; - // The vendored OTel path (origin `auto.graphql.otel.graphql`) must be inactive on 17+. - expect(spans.find(span => span.origin === 'auto.graphql.otel.graphql')).toBeUndefined(); + // The vendored OTel path (origin `auto.graphql.graphql`) must be inactive on 17+. + expect(spans.find(span => span.origin === 'auto.graphql.graphql')).toBeUndefined(); // ...while the diagnostics-channel path is active. expect(spans.find(span => span.origin === 'auto.graphql.diagnostic_channel')).toBeDefined(); }, diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-basic/test.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-basic/test.ts index aaaae6345b2f..2842aeead385 100644 --- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-basic/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-basic/test.ts @@ -35,13 +35,13 @@ describe('outgoing fetch spans', () => { expect.objectContaining({ description: expect.stringMatching(/GET .*\/api\/v0/), op: 'http.client', - origin: 'auto.http.otel.node_fetch', + origin: 'auto.http.node_fetch', status: 'ok', }), expect.objectContaining({ description: expect.stringMatching(/GET .*\/api\/v1/), op: 'http.client', - origin: 'auto.http.otel.node_fetch', + origin: 'auto.http.node_fetch', status: 'not_found', data: expect.objectContaining({ 'http.response.status_code': 404, diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-error/test.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-error/test.ts index 2e468ba52d31..dcd890b1d766 100644 --- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-error/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-error/test.ts @@ -16,7 +16,7 @@ describe('outgoing fetch spans - error', () => { expect.objectContaining({ description: expect.stringMatching(/GET http:\/\/localhost:\d+\//), op: 'http.client', - origin: 'auto.http.otel.node_fetch', + origin: 'auto.http.node_fetch', status: 'internal_error', }), ]), diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-forward-request-hook/test.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-forward-request-hook/test.ts index 7976ef4cd862..84c79873d8dd 100644 --- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-forward-request-hook/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-forward-request-hook/test.ts @@ -35,7 +35,7 @@ describe('outgoing fetch spans - request/response hooks', () => { expect.objectContaining({ description: expect.stringMatching(/GET .*\/api\/v0/), op: 'http.client', - origin: 'auto.http.otel.node_fetch', + origin: 'auto.http.node_fetch', status: 'ok', data: expect.objectContaining({ 'sentry.request.hook': '/api/v0', @@ -46,7 +46,7 @@ describe('outgoing fetch spans - request/response hooks', () => { expect.objectContaining({ description: expect.stringMatching(/GET .*\/api\/v1/), op: 'http.client', - origin: 'auto.http.otel.node_fetch', + origin: 'auto.http.node_fetch', status: 'not_found', data: expect.objectContaining({ 'sentry.request.hook': '/api/v1', diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-headers-to-span-attributes/test.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-headers-to-span-attributes/test.ts index 20ac432ca85b..d17d0a4132fe 100644 --- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-headers-to-span-attributes/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-headers-to-span-attributes/test.ts @@ -26,7 +26,7 @@ describe('outgoing fetch spans - headers to span attributes', () => { expect.objectContaining({ description: expect.stringMatching(/GET .*\/api\/v0/), op: 'http.client', - origin: 'auto.http.otel.node_fetch', + origin: 'auto.http.node_fetch', data: expect.objectContaining({ 'http.request.header.x-test-header': ['test-value'], 'http.response.header.x-powered-by': ['Express'], diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/test.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/test.ts index 16150f7cfd11..8d2a20e79d9e 100644 --- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/test.ts @@ -39,12 +39,12 @@ describe('outgoing fetch spans - strip query', () => { 'server.port': expect.any(Number), 'user_agent.original': 'node', 'sentry.op': 'http.client', - 'sentry.origin': 'auto.http.otel.node_fetch', + 'sentry.origin': 'auto.http.node_fetch', 'server.address': 'localhost', }, description: `GET ${SERVER_URL}/api/v0/users`, op: 'http.client', - origin: 'auto.http.otel.node_fetch', + origin: 'auto.http.node_fetch', status: 'ok', parent_span_id: txn.contexts?.trace?.span_id, span_id: expect.stringMatching(/[a-f\d]{16}/), diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts index b7960f6fe0cb..871d4e726fcc 100644 --- a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts @@ -112,7 +112,7 @@ describe('httpIntegration', () => { 'network.transport': 'tcp', 'sentry.kind': 'server', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.sample_rate': 1, 'sentry.segment.name.source': 'route', [URL_FULL]: `http://localhost:${port}/test?a=1&b=2`, @@ -155,7 +155,7 @@ describe('httpIntegration', () => { 'network.transport': 'tcp', 'sentry.kind': 'server', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.otel.http', + 'sentry.origin': 'auto.http', 'sentry.sample_rate': 1, 'sentry.segment.name.source': 'route', [URL_FULL]: `http://localhost:${port}/test?a=1&b=2`, diff --git a/dev-packages/node-integration-tests/suites/tracing/mongoose-tracing-channel/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongoose-tracing-channel/test.ts index c6cc6fddd4eb..cbb068cf7674 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mongoose-tracing-channel/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mongoose-tracing-channel/test.ts @@ -67,8 +67,8 @@ describe('Mongoose tracing channel Test', () => { .expect({ transaction: event => { const spans = event.spans || []; - // The monkey-patch path (origin `auto.db.otel.mongoose`) must be inactive on 9.7+. - expect(spans.find(span => span.origin === 'auto.db.otel.mongoose')).toBeUndefined(); + // The monkey-patch path (origin `auto.db.mongoose`) must be inactive on 9.7+. + expect(spans.find(span => span.origin === 'auto.db.mongoose')).toBeUndefined(); // ...while the diagnostics-channel path is active. expect(spans.find(span => span.origin === 'auto.db.mongoose.diagnostic_channel')).toBeDefined(); }, diff --git a/dev-packages/node-integration-tests/suites/tracing/mysql2-tracing-channel/test.ts b/dev-packages/node-integration-tests/suites/tracing/mysql2-tracing-channel/test.ts index a89d4f3cb19b..b243da576bb3 100644 --- a/dev-packages/node-integration-tests/suites/tracing/mysql2-tracing-channel/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/mysql2-tracing-channel/test.ts @@ -56,8 +56,8 @@ describe('mysql2 tracing channel Test', () => { transaction: event => { expect(event.transaction).toBe('Test Transaction'); const spans = event.spans || []; - // The monkey-patch path (origin `auto.db.otel.mysql2`) must be inactive on 3.20.0+. - expect(spans.find(span => span.origin === 'auto.db.otel.mysql2')).toBeUndefined(); + // The monkey-patch path (origin `auto.db.mysql2`) must be inactive on 3.20.0+. + expect(spans.find(span => span.origin === 'auto.db.mysql2')).toBeUndefined(); // ...while the diagnostics-channel path is active. expect(spans.find(span => span.origin === 'auto.db.mysql2.diagnostic_channel')).toBeDefined(); }, diff --git a/dev-packages/node-integration-tests/suites/tracing/postgres-streamed/test.ts b/dev-packages/node-integration-tests/suites/tracing/postgres-streamed/test.ts index 8675b9ff008d..d091a36523f1 100644 --- a/dev-packages/node-integration-tests/suites/tracing/postgres-streamed/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/postgres-streamed/test.ts @@ -77,7 +77,7 @@ const COMMON_DB_ATTRIBUTES = { /** * Builds the expected strict shape of a streamed postgres db span. * - * Query spans carry a `db.statement` and the query origin (`auto.db.otel.postgres`, or + * Query spans carry a `db.statement` and the query origin (`auto.db.postgres`, or * `auto.db.postgres` under the generic orchestrion run — see `QUERY_ORIGIN`). The * `pg.connect` span has no `db.statement`, and since the pg instrumentation sets no origin on it, it * carries the default `manual` origin (written as an attribute on the streamed-span path; the @@ -87,7 +87,7 @@ const COMMON_DB_ATTRIBUTES = { * (`127.0.0.1`) explicitly, so the reported peer name and connection string reflect that. * * `origin` defaults to `QUERY_ORIGIN`; blocks that force the OTel path (explicit `postgresIntegration()`) - * pass `auto.db.otel.postgres` explicitly. + * pass `auto.db.postgres` explicitly. */ function expectedDbSpan({ name, diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v5/test.ts b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v5/test.ts index e4c4f031dced..6c104e7ed8ea 100644 --- a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v5/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v5/test.ts @@ -40,7 +40,7 @@ function expectPrismaV5Spans(transaction: TransactionEvent): void { method: 'create', model: 'User', name: 'User.create', - 'sentry.origin': 'auto.db.otel.prisma', + 'sentry.origin': 'auto.db.prisma', }, description: 'prisma:client:operation', status: 'ok', @@ -50,21 +50,21 @@ function expectPrismaV5Spans(transaction: TransactionEvent): void { method: 'findMany', model: 'User', name: 'User.findMany', - 'sentry.origin': 'auto.db.otel.prisma', + 'sentry.origin': 'auto.db.prisma', }, description: 'prisma:client:operation', status: 'ok', }), expect.objectContaining({ data: { - 'sentry.origin': 'auto.db.otel.prisma', + 'sentry.origin': 'auto.db.prisma', }, description: 'prisma:client:serialize', status: 'ok', }), expect.objectContaining({ data: { - 'sentry.origin': 'auto.db.otel.prisma', + 'sentry.origin': 'auto.db.prisma', }, description: 'prisma:client:connect', status: 'ok', @@ -75,7 +75,7 @@ function expectPrismaV5Spans(transaction: TransactionEvent): void { 'db.system': 'postgresql', 'sentry.kind': 'client', 'sentry.op': 'db', - 'sentry.origin': 'auto.db.otel.prisma', + 'sentry.origin': 'auto.db.prisma', }, op: 'db', description: expect.stringContaining('INSERT INTO'), @@ -87,7 +87,7 @@ function expectPrismaV5Spans(transaction: TransactionEvent): void { 'db.system': 'postgresql', 'sentry.kind': 'client', 'sentry.op': 'db', - 'sentry.origin': 'auto.db.otel.prisma', + 'sentry.origin': 'auto.db.prisma', }, op: 'db', description: expect.stringContaining('SELECT'), @@ -99,7 +99,7 @@ function expectPrismaV5Spans(transaction: TransactionEvent): void { 'db.system': 'postgresql', 'sentry.kind': 'client', 'sentry.op': 'db', - 'sentry.origin': 'auto.db.otel.prisma', + 'sentry.origin': 'auto.db.prisma', }, op: 'db', description: expect.stringContaining('DELETE'), diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v6/test.ts b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v6/test.ts index 28187d820d1a..853217824013 100644 --- a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v6/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v6/test.ts @@ -31,7 +31,7 @@ describeWithDockerCompose('Prisma ORM v6 Tests', { workingDirectory: [__dirname] }); const dbQuerySpan = spans.find( - s => s.data?.['sentry.origin'] === 'auto.db.otel.prisma' && s.data?.['db.query.text'], + s => s.data?.['sentry.origin'] === 'auto.db.prisma' && s.data?.['db.query.text'], ); expect(dbQuerySpan).toBeDefined(); const dbQueryParent = spans.find(s => s.span_id === dbQuerySpan?.parent_span_id); @@ -43,7 +43,7 @@ describeWithDockerCompose('Prisma ORM v6 Tests', { workingDirectory: [__dirname] ...span, data: { ...span.data, - 'sentry.origin': 'auto.db.otel.prisma', + 'sentry.origin': 'auto.db.prisma', }, status: 'ok', }), diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v7/test.ts b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v7/test.ts index 9d7d98d48db1..f7d93c2ca2ca 100644 --- a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v7/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v7/test.ts @@ -31,16 +31,14 @@ describe('Prisma ORM v7 Tests', () => { }); const prismaDbQuerySpan = spans.find( - s => s.data?.['sentry.origin'] === 'auto.db.otel.prisma' && s.data?.['db.query.text'], + s => s.data?.['sentry.origin'] === 'auto.db.prisma' && s.data?.['db.query.text'], ); expect(prismaDbQuerySpan).toBeDefined(); const dbQueryParent = spans.find(s => s.span_id === prismaDbQuerySpan?.parent_span_id); expect(dbQueryParent?.description).toBe('prisma:client:operation'); // Verify Prisma spans have the correct origin - const prismaSpans = spans.filter( - span => span.data && span.data['sentry.origin'] === 'auto.db.otel.prisma', - ); + const prismaSpans = spans.filter(span => span.data && span.data['sentry.origin'] === 'auto.db.prisma'); expect(prismaSpans.length).toBeGreaterThanOrEqual(5); // Check for key Prisma span descriptions diff --git a/packages/astro/src/server/sdk.ts b/packages/astro/src/server/sdk.ts index 727350f2b046..c7b7fee7bf8e 100644 --- a/packages/astro/src/server/sdk.ts +++ b/packages/astro/src/server/sdk.ts @@ -19,7 +19,7 @@ export function init(options: NodeOptions): NodeClient | undefined { // we want to drop them // this is the case with http.server spans of prerendered pages // we do not care about those, as they are effectively static - { op: 'http.server', attributes: { 'sentry.origin': 'auto.http.otel.http' } }, + { op: 'http.server', attributes: { 'sentry.origin': 'auto.http' } }, ]; return initNodeSdk(opts); diff --git a/packages/astro/test/server/sdk.test.ts b/packages/astro/test/server/sdk.test.ts index 08801aeddc96..249467caeb57 100644 --- a/packages/astro/test/server/sdk.test.ts +++ b/packages/astro/test/server/sdk.test.ts @@ -46,7 +46,7 @@ describe('Sentry server SDK', () => { expect(nodeInit).toHaveBeenCalledWith( expect.objectContaining({ ignoreSpans: expect.arrayContaining([ - { op: 'http.server', attributes: { 'sentry.origin': 'auto.http.otel.http' } }, + { op: 'http.server', attributes: { 'sentry.origin': 'auto.http' } }, ]), }), ); diff --git a/packages/aws-serverless/src/requestSpanOptions.ts b/packages/aws-serverless/src/requestSpanOptions.ts index b28571e5988e..ed41aa2d334b 100644 --- a/packages/aws-serverless/src/requestSpanOptions.ts +++ b/packages/aws-serverless/src/requestSpanOptions.ts @@ -49,7 +49,7 @@ export function getRequestSpanOptions(event: unknown, context: Context, requestI forceTransaction: true, attributes: { [SENTRY_OP]: FUNCTION_AWS, - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.otel.aws_lambda', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.aws_lambda', [SENTRY_KIND]: 'server', [ATTR_FAAS_EXECUTION]: context.awsRequestId, [ATTR_FAAS_ID]: context.invokedFunctionArn, diff --git a/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts b/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts index 42fa54903797..a2d2ab9ac0d2 100644 --- a/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts +++ b/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts @@ -32,7 +32,7 @@ export function dropMiddlewareTunnelRequests( const isMiddleware = attrs?.[ATTR_NEXT_SPAN_TYPE] === 'Middleware.execute'; // The fetch span could be originating from rewrites re-writing a tunnel request // So we want to filter it out - const isFetchSpan = attrs?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.http.otel.node_fetch'; + const isFetchSpan = attrs?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.http.node_fetch'; const isBaseServerHandleRequest = attrs?.[ATTR_NEXT_SPAN_TYPE] === 'BaseServer.handleRequest'; // If the span is not a middleware span, fetch span, or BaseServer.handleRequest span, return diff --git a/packages/node/src/integrations/http/httpServerSpansIntegration.ts b/packages/node/src/integrations/http/httpServerSpansIntegration.ts index eaa82b8eaa31..71acb822d449 100644 --- a/packages/node/src/integrations/http/httpServerSpansIntegration.ts +++ b/packages/node/src/integrations/http/httpServerSpansIntegration.ts @@ -160,7 +160,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions [SENTRY_KIND]: 'server', [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', [SENTRY_SEGMENT_NAME_SOURCE]: 'url', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', [SENTRY_HTTP_PREFETCH]: isKnownPrefetchRequest(request) || undefined, [URL_FULL]: filterCollectedUrl(fullUrl, client), [URL_PATH]: urlObj?.pathname ?? httpTargetWithoutQueryFragment, diff --git a/packages/node/src/integrations/node-fetch/undici-instrumentation.ts b/packages/node/src/integrations/node-fetch/undici-instrumentation.ts index 78a4bfd3e806..322a82dba495 100644 --- a/packages/node/src/integrations/node-fetch/undici-instrumentation.ts +++ b/packages/node/src/integrations/node-fetch/undici-instrumentation.ts @@ -224,7 +224,7 @@ function onRequestCreated(config: NodeFetchOptions, { request }: RequestMessage) [URL_QUERY]: filterCollectedUrlQuery(getUrlQuery(requestUrl.search)), [URL_FRAGMENT]: getUrlFragment(requestUrl.hash), [URL_SCHEME]: urlScheme, - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.node_fetch', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.node_fetch', }; // Sanitize data URLs to prevent long base64 strings in span attributes diff --git a/packages/node/test/integrations/undici.test.ts b/packages/node/test/integrations/undici.test.ts index 47184411fed9..f48539fb0119 100644 --- a/packages/node/test/integrations/undici.test.ts +++ b/packages/node/test/integrations/undici.test.ts @@ -58,7 +58,7 @@ describe('instrumentUndici', () => { [URL_QUERY]: 'limit=10', [URL_FRAGMENT]: undefined, [URL_SCHEME]: 'https', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.node_fetch', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.node_fetch', [SERVER_ADDRESS]: 'api.example.com', [SERVER_PORT]: 443, }, diff --git a/packages/server-utils/src/integrations/fastify/instrumentation.ts b/packages/server-utils/src/integrations/fastify/instrumentation.ts index b38893e0cec9..bf8f55ac76b8 100644 --- a/packages/server-utils/src/integrations/fastify/instrumentation.ts +++ b/packages/server-utils/src/integrations/fastify/instrumentation.ts @@ -41,7 +41,7 @@ import { setHttpServerSpanRouteAttribute } from '../../utils/setHttpServerSpanRo const PACKAGE_NAME = '@sentry/instrumentation-fastify'; const SUPPORTED_VERSIONS = '>=3.21.0 <6'; -const ORIGIN = 'auto.http.otel.fastify'; +const ORIGIN = 'auto.http.fastify'; const HOOK_OP = MIDDLEWARE; // TODO(conventions): Replace with the `handler` span op constant once it is released in `@sentry/conventions`. const REQUEST_HANDLER_OP = 'handler'; diff --git a/packages/server-utils/src/integrations/prisma/tracing-helper.ts b/packages/server-utils/src/integrations/prisma/tracing-helper.ts index 20f1e3552d18..390113843f0f 100644 --- a/packages/server-utils/src/integrations/prisma/tracing-helper.ts +++ b/packages/server-utils/src/integrations/prisma/tracing-helper.ts @@ -38,7 +38,7 @@ const showAllTraces = ((): boolean => { const nonSampledTraceParent = `00-10-10-00`; -const PRISMA_ORIGIN = 'auto.db.otel.prisma'; +const PRISMA_ORIGIN = 'auto.db.prisma'; type Options = { ignoreSpanTypes: (string | RegExp)[]; From 0b91865a839eb49f5826171e7103891aa2ca5b98 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Wed, 26 Aug 2026 11:14:01 +0200 Subject: [PATCH 2/2] ref http server --- .../nestjs-11/tests/transactions.test.ts | 4 ++-- .../nestjs-8/tests/transactions.test.ts | 4 ++-- .../nestjs-basic/tests/transactions.test.ts | 4 ++-- .../tests/propagation.test.ts | 16 ++++++++-------- .../nestjs-fastify/tests/transactions.test.ts | 4 ++-- .../tests/transactions.test.ts | 4 ++-- .../tests/transactions.test.ts | 4 ++-- .../node-express-esm-loader/tests/server.test.ts | 2 +- .../node-express-streaming/tests/spans.test.ts | 2 +- .../node-express-v5/tests/transactions.test.ts | 4 ++-- .../node-express/tests/transactions.test.ts | 4 ++-- .../node-fastify-3/tests/propagation.test.ts | 16 ++++++++-------- .../node-fastify-3/tests/transactions.test.ts | 4 ++-- .../node-fastify-4/tests/propagation.test.ts | 16 ++++++++-------- .../node-fastify-4/tests/transactions.test.ts | 4 ++-- .../node-fastify-5/tests/propagation.test.ts | 16 ++++++++-------- .../node-fastify-5/tests/transactions.test.ts | 4 ++-- .../node-hapi/tests/transactions.test.ts | 4 ++-- .../node-koa/tests/propagation.test.ts | 16 ++++++++-------- .../node-koa/tests/transactions.test.ts | 4 ++-- .../tests/tracing.server.test.ts | 2 +- .../nuxt-3-dynamic-import/tests/tracing.test.ts | 6 +++--- .../nuxt-3-min/tests/tracing.server.test.ts | 2 +- .../nuxt-3-min/tests/tracing.test.ts | 6 +++--- .../tests/tracing.server.test.ts | 2 +- .../tests/tracing.test.ts | 6 +++--- .../nuxt-3/tests/tracing.server.test.ts | 2 +- .../nuxt-3/tests/tracing.test.ts | 6 +++--- .../nuxt-4/tests/tracing.server.test.ts | 2 +- .../nuxt-4/tests/tracing.test.ts | 6 +++--- .../nuxt-5/tests/tracing.server.test.ts | 2 +- .../nuxt-5/tests/tracing.test.ts | 6 +++--- .../tsx-express/tests/transactions.test.ts | 4 ++-- .../suites/tracing/httpIntegration/test.ts | 4 ++-- packages/astro/src/server/sdk.ts | 2 +- packages/astro/test/server/sdk.test.ts | 2 +- .../http/httpServerSpansIntegration.ts | 2 +- 37 files changed, 99 insertions(+), 99 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts index d864ad454620..2bd0339d500e 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts index c013e335be0a..7dfb8f2cfcd0 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent.contexts?.response).toEqual({ diff --git a/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts index 77e790659385..31440f2e8d38 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts index 65521d682bb0..16a528accdfd 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', + origin: 'auto.http.http_server', }); }); @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: expect.objectContaining({ 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', + origin: 'auto.http.http_server', }); }); diff --git a/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts index 03fef6208ba0..d650d71cc519 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/tests/transactions.test.ts index fa8081d548b3..fd4cb40d3c2b 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules-decorator/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/tests/transactions.test.ts index 0b71d57749e4..c5829a9425bc 100644 --- a/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/nestjs-with-submodules/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent).toEqual( 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 index 0fce20f5b245..9b6f44f13041 100644 --- 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 @@ -49,7 +49,7 @@ test('Should record a transaction for route with parameters', async ({ request } 'network.transport': 'tcp', 'sentry.kind': 'server', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.sample_rate': 1, 'sentry.segment.name.source': 'route', }), diff --git a/dev-packages/e2e-tests/test-applications/node-express-streaming/tests/spans.test.ts b/dev-packages/e2e-tests/test-applications/node-express-streaming/tests/spans.test.ts index 178f430c970d..1d879f20c32e 100644 --- a/dev-packages/e2e-tests/test-applications/node-express-streaming/tests/spans.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-express-streaming/tests/spans.test.ts @@ -19,7 +19,7 @@ test('Sends streamed spans for an API route', async ({ baseURL }) => { expect(rootSpan!.status).toBe('ok'); expect(rootSpan!.trace_id).toMatch(/[a-f0-9]{32}/); expect(rootSpan!.attributes['sentry.segment.name.source']?.value).toBe('route'); - expect(rootSpan!.attributes['sentry.origin']?.value).toBe('auto.http'); + expect(rootSpan!.attributes['sentry.origin']?.value).toBe('auto.http.http_server'); expect(rootSpan!.attributes['http.response.status_code']?.value).toBe(200); const childSpans = spans.filter(span => !span.is_segment); diff --git a/dev-packages/e2e-tests/test-applications/node-express-v5/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-express-v5/tests/transactions.test.ts index f031f6a51a6d..f487396b6af2 100644 --- a/dev-packages/e2e-tests/test-applications/node-express-v5/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-express-v5/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent.contexts?.response).toEqual({ 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 index 18240ed59cfd..6b7c4f9e33f8 100644 --- 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 @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent.contexts?.response).toEqual({ diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/propagation.test.ts index 4456feb78deb..d2333b55156d 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/propagation.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', + origin: 'auto.http.http_server', }); }); @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -266,7 +266,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', + origin: 'auto.http.http_server', }); }); diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/transactions.test.ts index 0dbce16709ac..49be3c6da167 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-3/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -56,7 +56,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', + origin: 'auto.http.http_server', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/propagation.test.ts index d93c50ca182b..1c817ec8f17b 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/propagation.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', + origin: 'auto.http.http_server', }); }); @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -266,7 +266,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', + origin: 'auto.http.http_server', }); }); diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/transactions.test.ts index 46d6b479b7e7..e16a67ee213f 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-4/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts index 978b4b53cba6..ebff1774678e 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -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', + origin: 'auto.http.http_server', }); }); @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -266,7 +266,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', + origin: 'auto.http.http_server', }); }); diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/transactions.test.ts index 1426c0a46bb2..a2e2a3091466 100644 --- a/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-fastify-5/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent).toEqual( 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 index 36f57ccd88b8..d90e44824dfe 100644 --- 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 @@ -15,7 +15,7 @@ test('Sends successful transaction', async ({ baseURL }) => { expect(transactionEvent.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -50,7 +50,7 @@ test('Sends successful transaction', async ({ baseURL }) => { span_id: expect.stringMatching(/[a-f0-9]{16}/), status: 'ok', trace_id: expect.stringMatching(/[a-f0-9]{32}/), - origin: 'auto.http', + origin: 'auto.http.http_server', }); expect(transactionEvent).toEqual( diff --git a/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts index d54bad47c8ad..940541b27e00 100644 --- a/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts +++ b/dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts @@ -56,7 +56,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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -91,13 +91,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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -128,7 +128,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', + origin: 'auto.http.http_server', }); }); @@ -187,7 +187,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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -222,13 +222,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', + origin: 'auto.http.http_server', }); expect(inboundTransaction.contexts?.trace).toEqual({ data: { 'sentry.segment.name.source': 'route', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.kind': 'server', 'http.response.status_code': 200, @@ -265,7 +265,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', + origin: 'auto.http.http_server', }); }); 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 index 7dfb7cb7828d..b4af3c532e7f 100644 --- 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 @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent).toMatchObject({ diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.server.test.ts index 340362afbda3..fc39ac094910 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.http_server', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.test.ts index 6efa37fd4f3c..94c8df1642de 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.server.test.ts index be5db5509c48..bd6c4fa61602 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.http_server', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.test.ts index 9fa8ce49b8b2..cbd74b6d6df5 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.test.ts @@ -55,7 +55,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }, }, }); @@ -128,7 +128,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }), }), }), @@ -142,7 +142,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.server.test.ts index 972bd864e662..dfeaf7d482ea 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.http_server', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.test.ts index f3760875b1e0..e2b0d97abe1c 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.server.test.ts index 602248d4e85f..edd186c2b971 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.http_server', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.test.ts index 6afef484b14f..7602f7ed606a 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.server.test.ts index a867292f0354..7c9298cbfd6b 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.http_server', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.test.ts index b0d29f0089b2..7979a9e82782 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-4/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.server.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.server.test.ts index 767d018cf48f..70679251cfed 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.server.test.ts @@ -15,7 +15,7 @@ test('sends a server action transaction on pageload', async ({ page }) => { expect.objectContaining({ data: expect.objectContaining({ [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.http_server', }), }), ); diff --git a/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.test.ts index 852fe35d706f..392ae9e46793 100644 --- a/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.test.ts +++ b/dev-packages/e2e-tests/test-applications/nuxt-5/tests/tracing.test.ts @@ -54,7 +54,7 @@ test.describe('distributed tracing', () => { contexts: { trace: { op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }, }, }); @@ -127,7 +127,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', }), }), }), @@ -141,7 +141,7 @@ test.describe('distributed tracing', () => { contexts: expect.objectContaining({ trace: expect.objectContaining({ op: 'http.server', - origin: 'auto.http', + origin: 'auto.http.http_server', parent_span_id: httpClientSpan?.span_id, // http.client span is parent }), }), diff --git a/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts index 43209144d8ff..7296646533d9 100644 --- a/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts +++ b/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts @@ -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', + 'sentry.origin': 'auto.http.http_server', 'sentry.op': 'http.server', 'sentry.sample_rate': 1, 'sentry.kind': 'server', @@ -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', + origin: 'auto.http.http_server', }); expect(transactionEvent.contexts?.response).toEqual({ diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts index 871d4e726fcc..9700fa29a07c 100644 --- a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts @@ -112,7 +112,7 @@ describe('httpIntegration', () => { 'network.transport': 'tcp', 'sentry.kind': 'server', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.sample_rate': 1, 'sentry.segment.name.source': 'route', [URL_FULL]: `http://localhost:${port}/test?a=1&b=2`, @@ -155,7 +155,7 @@ describe('httpIntegration', () => { 'network.transport': 'tcp', 'sentry.kind': 'server', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http', + 'sentry.origin': 'auto.http.http_server', 'sentry.sample_rate': 1, 'sentry.segment.name.source': 'route', [URL_FULL]: `http://localhost:${port}/test?a=1&b=2`, diff --git a/packages/astro/src/server/sdk.ts b/packages/astro/src/server/sdk.ts index c7b7fee7bf8e..0755f2bbffeb 100644 --- a/packages/astro/src/server/sdk.ts +++ b/packages/astro/src/server/sdk.ts @@ -19,7 +19,7 @@ export function init(options: NodeOptions): NodeClient | undefined { // we want to drop them // this is the case with http.server spans of prerendered pages // we do not care about those, as they are effectively static - { op: 'http.server', attributes: { 'sentry.origin': 'auto.http' } }, + { op: 'http.server', attributes: { 'sentry.origin': 'auto.http.http_server' } }, ]; return initNodeSdk(opts); diff --git a/packages/astro/test/server/sdk.test.ts b/packages/astro/test/server/sdk.test.ts index 249467caeb57..6de7cab9f38e 100644 --- a/packages/astro/test/server/sdk.test.ts +++ b/packages/astro/test/server/sdk.test.ts @@ -46,7 +46,7 @@ describe('Sentry server SDK', () => { expect(nodeInit).toHaveBeenCalledWith( expect.objectContaining({ ignoreSpans: expect.arrayContaining([ - { op: 'http.server', attributes: { 'sentry.origin': 'auto.http' } }, + { op: 'http.server', attributes: { 'sentry.origin': 'auto.http.http_server' } }, ]), }), ); diff --git a/packages/node/src/integrations/http/httpServerSpansIntegration.ts b/packages/node/src/integrations/http/httpServerSpansIntegration.ts index 71acb822d449..73e093334446 100644 --- a/packages/node/src/integrations/http/httpServerSpansIntegration.ts +++ b/packages/node/src/integrations/http/httpServerSpansIntegration.ts @@ -160,7 +160,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions [SENTRY_KIND]: 'server', [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', [SENTRY_SEGMENT_NAME_SOURCE]: 'url', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.http_server', [SENTRY_HTTP_PREFETCH]: isKnownPrefetchRequest(request) || undefined, [URL_FULL]: filterCollectedUrl(fullUrl, client), [URL_PATH]: urlObj?.pathname ?? httpTargetWithoutQueryFragment,