feat(core): Deprecate transaction metadata in favor of attributes

Author: mydea

MIGRATION.md

@@ -69,6 +69,8 @@ In v8, the Span class is heavily reworked. The following properties & methods ar
 * `span.toTraceparent()`: use `spanToTraceHeader(span)` util instead.
 * `span.getTraceContext()`: Use `spanToTraceContext(span)` utility function instead.
 * `span.sampled`: Use `span.isRecording()` instead.
+* `transaction.setMetadata()`: Use attributes instead, or set data on the scope.
+* `transaction.metadata`: Use attributes instead, or set data on the scope.
 
 ## Deprecate `pushScope` & `popScope` in favor of `withScope`
 

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts

@@ -1,4 +1,5 @@
 import http from 'http';
+import { SentrySemanticAttributes } from '@sentry/core';
 import * as Sentry from '@sentry/node';
 import * as Tracing from '@sentry/tracing';
 import cors from 'cors';
@@ -32,7 +33,7 @@ app.get('/test/express', (_req, res) => {
   const transaction = Sentry.getCurrentHub().getScope().getTransaction();
   if (transaction) {
     transaction.traceId = '86f39e84263a4de99c326acab3bfe3bd';
-    transaction.setMetadata({ source: 'route' });
+    transaction.setAttribute(SentrySemanticAttributes.Source, 'route');
   }
   const headers = http.get('http://somewhere.not.sentry/').getHeaders();
 

packages/angular-ivy/ng-package.json

@@ -5,9 +5,10 @@
     "entryFile": "src/index.ts",
     "umdModuleIds": {
       "@sentry/browser": "Sentry",
-      "@sentry/utils": "Sentry.util"
+      "@sentry/utils": "Sentry.util",
+      "@sentry/core": "Sentry.core"
     }
   },
-  "allowedNonPeerDependencies": ["@sentry/browser", "@sentry/utils", "@sentry/types", "tslib"],
+  "allowedNonPeerDependencies": ["@sentry/browser", "@sentry/core", "@sentry/utils", "@sentry/types", "tslib"],
   "assets": ["README.md", "LICENSE"]
 }

packages/angular-ivy/package.json

@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@sentry/browser": "7.92.0",
+    "@sentry/core": "7.92.0",
     "@sentry/types": "7.92.0",
     "@sentry/utils": "7.92.0",
     "tslib": "^2.4.1"

packages/angular/ng-package.json

@@ -5,9 +5,10 @@
     "entryFile": "src/index.ts",
     "umdModuleIds": {
       "@sentry/browser": "Sentry",
-      "@sentry/utils": "Sentry.util"
+      "@sentry/utils": "Sentry.util",
+      "@sentry/core": "Sentry.core"
     }
   },
-  "whitelistedNonPeerDependencies": ["@sentry/browser", "@sentry/utils", "@sentry/types", "tslib"],
+  "whitelistedNonPeerDependencies": ["@sentry/browser", "@sentry/core", "@sentry/utils", "@sentry/types", "tslib"],
   "assets": ["README.md", "LICENSE"]
 }

packages/angular/package.json

@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@sentry/browser": "7.92.0",
+    "@sentry/core": "7.92.0",
     "@sentry/types": "7.92.0",
     "@sentry/utils": "7.92.0",
     "tslib": "^2.4.1"

packages/angular/src/tracing.ts

@@ -8,6 +8,7 @@ import type { ActivatedRouteSnapshot, Event, RouterState } from '@angular/router
 import { NavigationCancel, NavigationError, Router } from '@angular/router';
 import { NavigationEnd, NavigationStart, ResolveEnd } from '@angular/router';
 import { WINDOW, getCurrentScope } from '@sentry/browser';
+import { SentrySemanticAttributes, spanToJSON } from '@sentry/core';
 import type { Span, Transaction, TransactionContext } from '@sentry/types';
 import { logger, stripUrlQueryAndFragment, timestampInSeconds } from '@sentry/utils';
 import type { Observable } from 'rxjs';
@@ -39,7 +40,9 @@ export function routingInstrumentation(
       name: WINDOW.location.pathname,
       op: 'pageload',
       origin: 'auto.pageload.angular',
-      metadata: { source: 'url' },
+      data: {
+        [SentrySemanticAttributes.Source]: 'url',
+      },
     });
   }
 }
@@ -76,7 +79,9 @@ export class TraceService implements OnDestroy {
           name: strippedUrl,
           op: 'navigation',
           origin: 'auto.navigation.angular',
-          metadata: { source: 'url' },
+          data: {
+            [SentrySemanticAttributes.Source]: 'url',
+          },
         });
       }
 
@@ -118,9 +123,10 @@ export class TraceService implements OnDestroy {
 
       const transaction = getActiveTransaction();
       // TODO (v8 / #5416): revisit the source condition. Do we want to make the parameterized route the default?
-      if (transaction && transaction.metadata.source === 'url') {
+      const attributes = (transaction && spanToJSON(transaction).data) || {};
+      if (transaction && attributes[SentrySemanticAttributes.Source] === 'url') {
         transaction.updateName(route);
-        transaction.setMetadata({ source: 'route' });
+        transaction.setAttribute(SentrySemanticAttributes.Source, 'route');
       }
     }),
   );

packages/angular/test/tracing.test.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import type { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
+import { SentrySemanticAttributes } from '@sentry/core';
 
 import { TraceClassDecorator, TraceDirective, TraceMethodDecorator, instrumentAngularRouting } from '../src';
 import { getParameterizedRouteFromSnapshot } from '../src/tracing';
@@ -11,7 +12,13 @@ const defaultStartTransaction = (ctx: any) => {
   transaction = {
     ...ctx,
     updateName: jest.fn(name => (transaction.name = name)),
-    setMetadata: jest.fn(),
+    setAttribute: jest.fn(),
+    toJSON: () => ({
+      data: {
+        [SentrySemanticAttributes.Source]: 'custom',
+        ...ctx.data,
+      },
+    }),
   };
 
   return transaction;
@@ -45,7 +52,7 @@ describe('Angular Tracing', () => {
         name: '/',
         op: 'pageload',
         origin: 'auto.pageload.angular',
-        metadata: { source: 'url' },
+        data: { [SentrySemanticAttributes.Source]: 'url' },
       });
     });
   });
@@ -107,11 +114,15 @@ describe('Angular Tracing', () => {
       const customStartTransaction = jest.fn((ctx: any) => {
         transaction = {
           ...ctx,
-          metadata: {
-            ...ctx.metadata,
-            source: 'custom',
-          },
+          toJSON: () => ({
+            data: {
+              ...ctx.data,
+              [SentrySemanticAttributes.Source]: 'custom',
+            },
+          }),
+          metadata: ctx.metadata,
           updateName: jest.fn(name => (transaction.name = name)),
+          setAttribute: jest.fn(),
         };
 
         return transaction;
@@ -135,12 +146,12 @@ describe('Angular Tracing', () => {
         name: url,
         op: 'pageload',
         origin: 'auto.pageload.angular',
-        metadata: { source: 'url' },
+        data: { [SentrySemanticAttributes.Source]: 'url' },
       });
 
       expect(transaction.updateName).toHaveBeenCalledTimes(0);
       expect(transaction.name).toEqual(url);
-      expect(transaction.metadata.source).toBe('custom');
+      expect(transaction.toJSON().data).toEqual({ [SentrySemanticAttributes.Source]: 'custom' });
 
       env.destroy();
     });
@@ -326,10 +337,10 @@ describe('Angular Tracing', () => {
           name: url,
           op: 'navigation',
           origin: 'auto.navigation.angular',
-          metadata: { source: 'url' },
+          data: { [SentrySemanticAttributes.Source]: 'url' },
         });
         expect(transaction.updateName).toHaveBeenCalledWith(result);
-        expect(transaction.setMetadata).toHaveBeenCalledWith({ source: 'route' });
+        expect(transaction.setAttribute).toHaveBeenCalledWith(SentrySemanticAttributes.Source, 'route');
 
         env.destroy();
       });

packages/astro/src/server/middleware.ts

@@ -1,3 +1,4 @@
+import { SentrySemanticAttributes } from '@sentry/core';
 import {
   captureException,
   continueTrace,
@@ -111,6 +112,7 @@ async function instrumentRequest(
 
   try {
     const interpolatedRoute = interpolateRouteFromUrlAndParams(ctx.url.pathname, ctx.params);
+    const source = interpolatedRoute ? 'route' : 'url';
     // storing res in a variable instead of directly returning is necessary to
     // invoke the catch block if next() throws
     const res = await startSpan(
@@ -121,12 +123,13 @@ async function instrumentRequest(
         origin: 'auto.http.astro',
         status: 'ok',
         metadata: {
+          // eslint-disable-next-line deprecation/deprecation
           ...traceCtx?.metadata,
-          source: interpolatedRoute ? 'route' : 'url',
         },
         data: {
           method,
           url: stripUrlQueryAndFragment(ctx.url.href),
+          [SentrySemanticAttributes.Source]: source,
           ...(ctx.url.search && { 'http.query': ctx.url.search }),
           ...(ctx.url.hash && { 'http.fragment': ctx.url.hash }),
           ...(options.trackHeaders && { headers: allHeaders }),

packages/astro/test/server/middleware.test.ts

@@ -1,3 +1,4 @@
+import { SentrySemanticAttributes } from '@sentry/core';
 import * as SentryNode from '@sentry/node';
 import type { Client } from '@sentry/types';
 import { vi } from 'vitest';
@@ -57,10 +58,9 @@ describe('sentryMiddleware', () => {
         data: {
           method: 'GET',
           url: 'https://mydomain.io/users/123/details',
+          [SentrySemanticAttributes.Source]: 'route',
         },
-        metadata: {
-          source: 'route',
-        },
+        metadata: {},
         name: 'GET /users/[id]/details',
         op: 'http.server',
         origin: 'auto.http.astro',
@@ -94,10 +94,9 @@ describe('sentryMiddleware', () => {
         data: {
           method: 'GET',
           url: 'http://localhost:1234/a%xx',
+          [SentrySemanticAttributes.Source]: 'url',
         },
-        metadata: {
-          source: 'url',
-        },
+        metadata: {},
         name: 'GET a%xx',
         op: 'http.server',
         origin: 'auto.http.astro',
@@ -159,8 +158,10 @@ describe('sentryMiddleware', () => {
 
     expect(startSpanSpy).toHaveBeenCalledWith(
       expect.objectContaining({
+        data: expect.objectContaining({
+          [SentrySemanticAttributes.Source]: 'route',
+        }),
         metadata: {
-          source: 'route',
           dynamicSamplingContext: {
             release: '1.0.0',
           },