fixes...

mydea · mydea · commit 83b150680cde · 2024-02-26T15:05:13.000Z
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit/test/performance.test.ts b/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',
-    },
   });
 });
 
diff --git a/dev-packages/node-integration-tests/suites/tracing-experimental/nestjs/scenario.ts b/dev-packages/node-integration-tests/suites/tracing-experimental/nestjs/scenario.ts
@@ -21,9 +21,9 @@ setInterval(() => {}, 1000);
 
 @Injectable()
 class AppService {
-  getHello(): string {
-    return 'Hello World!';
-  }
+  return;
+  'Hello World!';
+}
 }
 
 @Controller()
diff --git a/packages/bun/test/integrations/bunserver.test.ts b/packages/bun/test/integrations/bunserver.test.ts
@@ -25,8 +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({
+      expect(spanToJSON(transaction).data).toEqual({
         'http.status_code': '200',
       });
       expect(spanToJSON(transaction).op).toEqual('http.server');
@@ -48,8 +47,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({
+      expect(spanToJSON(transaction).data).toEqual({
         'http.status_code': '200',
       });
       expect(spanToJSON(transaction).op).toEqual('http.server');
diff --git a/packages/ember/addon/instance-initializers/sentry-performance.ts b/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',
       },
     });
 
diff --git a/packages/ember/tests/acceptance/sentry-performance-test.ts b/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',
       },
diff --git a/packages/ember/tests/helpers/utils.ts b/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;
diff --git a/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts b/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',
diff --git a/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts
@@ -97,10 +97,6 @@ function extractNextDataTagInformation(): NextDataTagInfo {
   return nextDataTagInfo;
 }
 
-const DEFAULT_TAGS = {
-  'routing.instrumentation': 'next-pages-router',
-} as const;
-
 /**
  * Instruments the Next.js pages router. Only supported for
  * client side routing. Works for Next >= 10.
@@ -123,7 +119,6 @@ export function pagesRouterInstrumentation(
     const client = getClient();
     startPageloadSpanCallback({
       name: prevLocationName,
-      tags: DEFAULT_TAGS,
       // pageload should always start at timeOrigin (and needs to be in s, not ms)
       startTime: browserPerformanceTimeOrigin ? browserPerformanceTimeOrigin / 1000 : undefined,
       traceId,
@@ -159,11 +154,8 @@ export function pagesRouterInstrumentation(
 
       startNavigationSpanCallback({
         name: newLocation,
-        tags: {
-          ...DEFAULT_TAGS,
-          from: prevLocationName,
-        },
         attributes: {
+          from: prevLocationName,
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.nextjs.pages_router_instrumentation',
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: spanSource,
diff --git a/packages/nextjs/test/integration/test/client/tracingNavigate.test.ts b/packages/nextjs/test/integration/test/client/tracingNavigate.test.ts
@@ -31,7 +31,7 @@ test('should report navigation transactions', async ({ page }) => {
     contexts: {
       trace: {
         op: 'navigation',
-        tags: {
+        data: {
           from: '/[id]/withInitialProps',
         },
       },
@@ -51,7 +51,7 @@ test('should report navigation transactions', async ({ page }) => {
     contexts: {
       trace: {
         op: 'navigation',
-        tags: {
+        data: {
           from: '/[id]/withServerSideProps',
         },
       },
diff --git a/packages/nextjs/test/integration/test/server/cjsApiEndpoints.test.ts b/packages/nextjs/test/integration/test/server/cjsApiEndpoints.test.ts
@@ -17,7 +17,6 @@ describe('CommonJS API Endpoints', () => {
         trace: {
           op: 'http.server',
           status: 'ok',
-          tags: { 'http.status_code': '200' },
           data: {
             'http.response.status_code': 200,
           },
@@ -53,7 +52,6 @@ describe('CommonJS API Endpoints', () => {
         trace: {
           op: 'http.server',
           status: 'ok',
-          tags: { 'http.status_code': '200' },
           data: {
             'http.response.status_code': 200,
           },
@@ -89,7 +87,6 @@ describe('CommonJS API Endpoints', () => {
         trace: {
           op: 'http.server',
           status: 'ok',
-          tags: { 'http.status_code': '200' },
           data: {
             'http.response.status_code': 200,
           },
diff --git a/packages/nextjs/test/integration/test/server/errorApiEndpoint.test.ts b/packages/nextjs/test/integration/test/server/errorApiEndpoint.test.ts
@@ -44,7 +44,6 @@ describe('Error API Endpoints', () => {
         trace: {
           op: 'http.server',
           status: 'internal_error',
-          tags: { 'http.status_code': '500' },
           data: {
             'http.response.status_code': 500,
           },
diff --git a/packages/nextjs/test/integration/test/server/tracing200.test.ts b/packages/nextjs/test/integration/test/server/tracing200.test.ts
@@ -15,7 +15,6 @@ describe('Tracing 200', () => {
         trace: {
           op: 'http.server',
           status: 'ok',
-          tags: { 'http.status_code': '200' },
           data: {
             'http.response.status_code': 200,
           },
diff --git a/packages/nextjs/test/integration/test/server/tracing500.test.ts b/packages/nextjs/test/integration/test/server/tracing500.test.ts
@@ -15,7 +15,6 @@ describe('Tracing 500', () => {
         trace: {
           op: 'http.server',
           status: 'internal_error',
-          tags: { 'http.status_code': '500' },
           data: {
             'http.response.status_code': 500,
           },
diff --git a/packages/nextjs/test/integration/test/server/tracingHttp.test.ts b/packages/nextjs/test/integration/test/server/tracingHttp.test.ts
@@ -19,7 +19,6 @@ describe('Tracing HTTP', () => {
         trace: {
           op: 'http.server',
           status: 'ok',
-          tags: { 'http.status_code': '200' },
           data: {
             'http.response.status_code': 200,
           },
@@ -30,7 +29,6 @@ describe('Tracing HTTP', () => {
           description: 'GET http://example.com/',
           op: 'http.client',
           status: 'ok',
-          tags: { 'http.status_code': '200' },
           data: {
             'http.response.status_code': 200,
           },
diff --git a/packages/nextjs/test/performance/appRouterInstrumentation.test.ts b/packages/nextjs/test/performance/appRouterInstrumentation.test.ts
@@ -84,14 +84,11 @@ describe('appRouterInstrumentation', () => {
     expect(mockStartNavigationSpan).toHaveBeenCalledWith({
       name: '/some/server/component/page',
       attributes: {
+        from: '/some/server/component/page',
         'sentry.op': 'navigation',
         'sentry.origin': 'auto.navigation.nextjs.app_router_instrumentation',
         'sentry.source': 'url',
       },
-      tags: {
-        from: '/some/server/component/page',
-        'routing.instrumentation': 'next-app-router',
-      },
     });
   });
 
diff --git a/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts b/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts
@@ -243,6 +243,7 @@ describe('pagesRouterInstrumentation', () => {
           expect.objectContaining({
             name: expectedTransactionName,
             attributes: {
+              from: '/home',
               'sentry.op': 'navigation',
               'sentry.origin': 'auto.navigation.nextjs.pages_router_instrumentation',
               'sentry.source': expectedTransactionSource,
diff --git a/packages/remix/src/client/performance.tsx b/packages/remix/src/client/performance.tsx
@@ -43,10 +43,6 @@ export type RemixBrowserTracingIntegrationOptions = Partial<Parameters<typeof or
   useMatches?: UseMatches;
 };
 
-const DEFAULT_TAGS = {
-  'routing.instrumentation': 'remix-router',
-} as const;
-
 let _useEffect: UseEffect | undefined;
 let _useLocation: UseLocation | undefined;
 let _useMatches: UseMatches | undefined;
@@ -77,7 +73,6 @@ export function startPageloadSpan(): void {
     name: initPathName,
     op: 'pageload',
     origin: 'auto.pageload.remix',
-    tags: DEFAULT_TAGS,
     attributes: {
       [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
     },
@@ -102,7 +97,6 @@ function startNavigationSpan(matches: RouteMatch<string>[]): void {
     name: matches[matches.length - 1].id,
     op: 'navigation',
     origin: 'auto.navigation.remix',
-    tags: DEFAULT_TAGS,
     attributes: {
       [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
     },
diff --git a/packages/remix/test/integration/test/client/capture-exception.test.ts b/packages/remix/test/integration/test/client/capture-exception.test.ts
@@ -19,7 +19,6 @@ test('should report a manually captured error.', async ({ page }) => {
   ]);
 
   expect(pageloadEnvelope.contexts?.trace.op).toBe('pageload');
-  expect(pageloadEnvelope.tags?.['routing.instrumentation']).toBe('remix-router');
   expect(pageloadEnvelope.type).toBe('transaction');
   expect(pageloadEnvelope.transaction).toBe('routes/capture-exception');
 });
diff --git a/packages/remix/test/integration/test/client/capture-message.test.ts b/packages/remix/test/integration/test/client/capture-message.test.ts
@@ -12,7 +12,6 @@ test('should report a manually captured message.', async ({ page }) => {
   expect(messageEnvelope.message).toBe('Sentry Manually Captured Message');
 
   expect(pageloadEnvelope.contexts?.trace.op).toBe('pageload');
-  expect(pageloadEnvelope.tags?.['routing.instrumentation']).toBe('remix-router');
   expect(pageloadEnvelope.type).toBe('transaction');
   expect(pageloadEnvelope.transaction).toBe('routes/capture-message');
 });
diff --git a/packages/remix/test/integration/test/client/errorboundary.test.ts b/packages/remix/test/integration/test/client/errorboundary.test.ts
@@ -12,7 +12,6 @@ test('should capture React component errors.', async ({ page }) => {
   const [pageloadEnvelope, errorEnvelope] = envelopes;
 
   expect(pageloadEnvelope.contexts?.trace?.op).toBe('pageload');
-  expect(pageloadEnvelope.tags?.['routing.instrumentation']).toBe('remix-router');
   expect(pageloadEnvelope.type).toBe('transaction');
   expect(pageloadEnvelope.transaction).toBe(
     useV2 ? 'routes/error-boundary-capture.$id' : 'routes/error-boundary-capture/$id',
diff --git a/packages/remix/test/integration/test/client/manualtracing.test.ts b/packages/remix/test/integration/test/client/manualtracing.test.ts
@@ -17,7 +17,6 @@ test('should report a manually created / finished transaction.', async ({ page }
   expect(manualTransactionEnvelope.timestamp).toBeDefined();
 
   expect(pageloadEnvelope.contexts?.trace?.op).toBe('pageload');
-  expect(pageloadEnvelope.tags?.['routing.instrumentation']).toBe('remix-router');
   expect(pageloadEnvelope.type).toBe('transaction');
   expect(pageloadEnvelope.transaction).toBe(useV2 ? 'routes/manual-tracing.$id' : 'routes/manual-tracing/$id');
 });
diff --git a/packages/remix/test/integration/test/client/pageload.test.ts b/packages/remix/test/integration/test/client/pageload.test.ts
@@ -8,7 +8,6 @@ test('should add `pageload` transaction on load.', async ({ page }) => {
   const envelope = await getFirstSentryEnvelopeRequest<Event>(page, '/');
 
   expect(envelope.contexts?.trace.op).toBe('pageload');
-  expect(envelope.tags?.['routing.instrumentation']).toBe('remix-router');
   expect(envelope.type).toBe('transaction');
 
   expect(envelope.transaction).toBe(useV2 ? 'root' : 'routes/index');
diff --git a/packages/remix/test/integration/test/server/action.test.ts b/packages/remix/test/integration/test/server/action.test.ts
diff --git a/packages/remix/test/integration/test/server/loader.test.ts b/packages/remix/test/integration/test/server/loader.test.ts
diff --git a/packages/remix/test/integration/test/server/ssr.test.ts b/packages/remix/test/integration/test/server/ssr.test.ts
diff --git a/packages/replay/test/fixtures/transaction.ts b/packages/replay/test/fixtures/transaction.ts
diff --git a/packages/replay/test/integration/coreHandlers/handleGlobalEvent.test.ts b/packages/replay/test/integration/coreHandlers/handleGlobalEvent.test.ts
diff --git a/packages/sveltekit/src/client/browserTracingIntegration.ts b/packages/sveltekit/src/client/browserTracingIntegration.ts
diff --git a/packages/sveltekit/test/client/browserTracingIntegration.test.ts b/packages/sveltekit/test/client/browserTracingIntegration.test.ts
diff --git a/packages/types/src/startSpanOptions.ts b/packages/types/src/startSpanOptions.ts
