ref: Refactor most usage of tags on spans

Only missing are browser metrics, where we need to verify this can be refactored already.

Author: mydea

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/middleware.test.ts

@@ -78,7 +78,6 @@ test('Should trace outgoing fetch requests inside middleware and create breadcru
         span_id: expect.any(String),
         start_timestamp: expect.any(Number),
         status: 'ok',
-        tags: { 'http.status_code': '200' },
         timestamp: expect.any(Number),
         trace_id: expect.any(String),
       },

dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/propagation.test.ts

@@ -70,9 +70,6 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
           op: 'http.server',
           span_id: expect.any(String),
           status: 'ok',
-          tags: {
-            'http.status_code': '200',
-          },
           trace_id: traceId,
           origin: 'auto.http.otel.http',
         },
@@ -96,9 +93,6 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
           parent_span_id: outgoingHttpSpanId,
           span_id: expect.any(String),
           status: 'ok',
-          tags: {
-            'http.status_code': '200',
-          },
           trace_id: traceId,
           origin: 'auto.http.otel.http',
         },
@@ -169,9 +163,6 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
           op: 'http.server',
           span_id: expect.any(String),
           status: 'ok',
-          tags: {
-            'http.status_code': '200',
-          },
           trace_id: traceId,
           origin: 'auto.http.otel.http',
         },
@@ -195,9 +186,6 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
           parent_span_id: outgoingHttpSpanId,
           span_id: expect.any(String),
           status: 'ok',
-          tags: {
-            'http.status_code': '200',
-          },
           trace_id: traceId,
           origin: 'auto.http.otel.http',
         },

dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/transactions.test.ts

@@ -35,9 +35,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
           op: 'http.server',
           span_id: expect.any(String),
           status: 'ok',
-          tags: {
-            'http.status_code': '200',
-          },
           trace_id: expect.any(String),
           origin: 'auto.http.otel.http',
         },
@@ -90,9 +87,6 @@ test('Sends an API route transaction', async ({ baseURL }) => {
           origin: 'manual',
         },
       ],
-      tags: {
-        'http.status_code': '200',
-      },
       transaction: 'GET /test-transaction',
       type: 'transaction',
       transaction_info: {

dev-packages/e2e-tests/test-applications/sveltekit/test/performance.test.ts

@@ -22,9 +22,6 @@ test('sends a pageload transaction', async ({ page }) => {
         origin: 'auto.pageload.sveltekit',
       },
     },
-    tags: {
-      'routing.instrumentation': '@sentry/sveltekit',
-    },
   });
 });
 

dev-packages/node-integration-tests/suites/express/tracing-experimental/test.ts

@@ -21,9 +21,6 @@ describe('express tracing experimental', () => {
                 },
                 op: 'http.server',
                 status: 'ok',
-                tags: {
-                  'http.status_code': '200',
-                },
               },
             },
             spans: expect.arrayContaining([
@@ -61,9 +58,6 @@ describe('express tracing experimental', () => {
                 },
                 op: 'http.server',
                 status: 'ok',
-                tags: {
-                  'http.status_code': '200',
-                },
               },
             },
           },
@@ -93,9 +87,6 @@ describe('express tracing experimental', () => {
                   },
                   op: 'http.server',
                   status: 'ok',
-                  tags: {
-                    'http.status_code': '200',
-                  },
                 },
               },
             },
@@ -133,9 +124,6 @@ describe('express tracing experimental', () => {
                 },
                 op: 'http.server',
                 status: 'ok',
-                tags: {
-                  'http.status_code': '200',
-                },
               },
             },
           },

dev-packages/node-integration-tests/suites/express/tracing/test.ts

@@ -19,9 +19,6 @@ test('should create and send transactions for Express routes and spans for middl
             },
             op: 'http.server',
             status: 'ok',
-            tags: {
-              'http.status_code': '200',
-            },
           },
         },
         spans: [
@@ -55,9 +52,6 @@ test('should set a correct transaction name for routes specified in RegEx', done
             },
             op: 'http.server',
             status: 'ok',
-            tags: {
-              'http.status_code': '200',
-            },
           },
         },
       },
@@ -87,9 +81,6 @@ test.each([['array1'], ['array5']])(
               },
               op: 'http.server',
               status: 'ok',
-              tags: {
-                'http.status_code': '200',
-              },
             },
           },
         },
@@ -127,9 +118,6 @@ test.each([
             },
             op: 'http.server',
             status: 'ok',
-            tags: {
-              'http.status_code': '200',
-            },
           },
         },
       },

dev-packages/node-integration-tests/suites/tracing/spans/test.ts

@@ -22,18 +22,12 @@ test('should capture spans for outgoing http requests', async () => {
         op: 'http.client',
         origin: 'auto.http.node.http',
         status: 'ok',
-        tags: {
-          'http.status_code': '200',
-        },
       },
       {
         description: 'GET http://match-this-url.com/api/v1',
         op: 'http.client',
         origin: 'auto.http.node.http',
         status: 'ok',
-        tags: {
-          'http.status_code': '200',
-        },
       },
     ],
   });

packages/angular/src/tracing.ts

@@ -144,8 +144,6 @@ export class TraceService implements OnDestroy {
             attributes: {
               [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular',
               [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-            },
-            tags: {
               url: strippedUrl,
               ...(navigationEvent.navigationTrigger && {
                 navigationTrigger: navigationEvent.navigationTrigger,
@@ -176,8 +174,7 @@ export class TraceService implements OnDestroy {
           name: `${navigationEvent.url}`,
           op: ANGULAR_ROUTING_OP,
           origin: 'auto.ui.angular',
-          tags: {
-            'routing.instrumentation': '@sentry/angular',
+          attributes: {
             url: strippedUrl,
             ...(navigationEvent.navigationTrigger && {
               navigationTrigger: navigationEvent.navigationTrigger,

packages/bun/test/integrations/bunserver.test.ts

@@ -25,10 +25,7 @@ describe('Bun Serve Integration', () => {
   test('generates a transaction around a request', async () => {
     client.on('finishTransaction', transaction => {
       expect(transaction.status).toBe('ok');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.tags).toEqual({
-        'http.status_code': '200',
-      });
+      expect(spanToJSON(transaction).data?.['http.response.status_code']).toEqual(200);
       expect(spanToJSON(transaction).op).toEqual('http.server');
       expect(spanToJSON(transaction).description).toEqual('GET /');
     });
@@ -48,10 +45,7 @@ describe('Bun Serve Integration', () => {
   test('generates a post transaction', async () => {
     client.on('finishTransaction', transaction => {
       expect(transaction.status).toBe('ok');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.tags).toEqual({
-        'http.status_code': '200',
-      });
+      expect(spanToJSON(transaction).data?.['http.response.status_code']).toEqual(200);
       expect(spanToJSON(transaction).op).toEqual('http.server');
       expect(spanToJSON(transaction).description).toEqual('POST /');
     });

packages/core/src/tracing/spanstatus.ts

@@ -128,17 +128,7 @@ export function getSpanStatusFromHttpCode(httpStatus: number): SpanStatusType {
  * Additionally, the span's status is updated, depending on the http code.
  */
 export function setHttpStatus(span: Span, httpStatus: number): void {
-  // TODO (v8): Remove these calls
-  // Relay does not require us to send the status code as a tag
-  // For now, just because users might expect it to land as a tag we keep sending it.
-  // Same with data.
-  // In v8, we replace both, simply with
-  // span.setAttribute('http.response.status_code', httpStatus);
-
-  // eslint-disable-next-line deprecation/deprecation
-  span.setTag('http.status_code', String(httpStatus));
-  // eslint-disable-next-line deprecation/deprecation
-  span.setData('http.response.status_code', httpStatus);
+  span.setAttribute('http.response.status_code', httpStatus);
 
   const spanStatus = getSpanStatusFromHttpCode(httpStatus);
   if (spanStatus !== 'unknown_error') {

packages/core/test/lib/tracing/spanstatus.test.ts

@@ -20,22 +20,20 @@ describe('setHttpStatus', () => {
 
     setHttpStatus(span!, code);
 
-    const { status: spanStatus, data, tags } = spanToJSON(span!);
+    const { status: spanStatus, data } = spanToJSON(span!);
 
     expect(spanStatus).toBe(status);
     expect(data).toMatchObject({ 'http.response.status_code': code });
-    expect(tags).toMatchObject({ 'http.status_code': String(code) });
   });
 
   it("doesn't set the status for an unknown http status code", () => {
     const span = new SentrySpan({ name: 'test' });
 
     setHttpStatus(span!, 600);
 
-    const { status: spanStatus, data, tags } = spanToJSON(span!);
+    const { status: spanStatus, data } = spanToJSON(span!);
 
     expect(spanStatus).toBeUndefined();
     expect(data).toMatchObject({ 'http.response.status_code': 600 });
-    expect(tags).toMatchObject({ 'http.status_code': '600' });
   });
 });

packages/core/test/lib/utils/spanUtils.test.ts

@@ -68,9 +68,6 @@ describe('spanToJSON', () => {
       parentSpanId: '1234',
       spanId: '5678',
       status: 'ok',
-      tags: {
-        foo: 'bar',
-      },
       traceId: 'abcd',
       origin: 'auto',
       startTimestamp: 123,
@@ -83,9 +80,6 @@ describe('spanToJSON', () => {
       parent_span_id: '1234',
       span_id: '5678',
       status: 'ok',
-      tags: {
-        foo: 'bar',
-      },
       trace_id: 'abcd',
       origin: 'auto',
       start_timestamp: 123,

packages/ember/addon/instance-initializers/sentry-performance.ts

@@ -116,11 +116,8 @@ export function _instrumentEmberRouter(
       origin: 'auto.pageload.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-      },
-      tags: {
         url,
         toRoute: routeInfo.name,
-        'routing.instrumentation': '@sentry/ember',
       },
     });
   }
@@ -146,11 +143,8 @@ export function _instrumentEmberRouter(
       origin: 'auto.navigation.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-      },
-      tags: {
         fromRoute,
         toRoute,
-        'routing.instrumentation': '@sentry/ember',
       },
     });
 

packages/ember/tests/acceptance/sentry-performance-test.ts

@@ -21,7 +21,7 @@ module('Acceptance | Sentry Performance', function (hooks) {
         'ui.ember.component.render | component:test-section',
       ],
       transaction: 'route:tracing',
-      tags: {
+      attributes: {
         fromRoute: undefined,
         toRoute: 'tracing',
       },
@@ -50,7 +50,7 @@ module('Acceptance | Sentry Performance', function (hooks) {
       ],
       transaction: 'route:slow-loading-route.index',
       durationCheck: duration => duration > SLOW_TRANSITION_WAIT,
-      tags: {
+      attributes: {
         fromRoute: 'tracing',
         toRoute: 'slow-loading-route.index',
       },

packages/ember/tests/helpers/utils.ts

@@ -51,7 +51,7 @@ export function assertSentryTransactions(
   options: {
     spans: string[];
     transaction: string;
-    tags: Record<string, string | undefined>;
+    attributes: Record<string, string | undefined>;
     durationCheck?: (duration: number) => boolean;
   },
 ): void {
@@ -83,8 +83,10 @@ export function assertSentryTransactions(
   assert.deepEqual(filteredSpans, options.spans, 'Has correct spans');
 
   assert.equal(event.transaction, options.transaction);
-  assert.equal(event.tags?.fromRoute, options.tags.fromRoute);
-  assert.equal(event.tags?.toRoute, options.tags.toRoute);
+
+  Object.keys(options.attributes).forEach(key => {
+    assert.equal(event.contexts?.trace?.data?.[key], options.attributes[key]);
+  });
 
   if (options.durationCheck && event.timestamp && event.start_timestamp) {
     const duration = (event.timestamp - event.start_timestamp) * 1000;

packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts

@@ -9,10 +9,6 @@ import { addFetchInstrumentationHandler, browserPerformanceTimeOrigin } from '@s
 
 type StartSpanCb = (context: StartSpanOptions) => void;
 
-const DEFAULT_TAGS = {
-  'routing.instrumentation': 'next-app-router',
-} as const;
-
 /**
  * Instruments the Next.js Client App Router.
  */
@@ -29,7 +25,6 @@ export function appRouterInstrumentation(
   if (shouldInstrumentPageload) {
     startPageloadSpanCallback({
       name: currPathname,
-      tags: DEFAULT_TAGS,
       // pageload should always start at timeOrigin (and needs to be in s, not ms)
       startTime: browserPerformanceTimeOrigin ? browserPerformanceTimeOrigin / 1000 : undefined,
       attributes: {
@@ -64,11 +59,8 @@ export function appRouterInstrumentation(
 
       startNavigationSpanCallback({
         name: newPathname,
-        tags: {
-          ...DEFAULT_TAGS,
-          from: currPathname,
-        },
         attributes: {
+          from: currPathname,
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.nextjs.app_router_instrumentation',
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',