fix tests...

Author: mydea

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

@@ -3,8 +3,11 @@ import { waitForError, waitForTransaction } from '@sentry-internal/event-proxy-s
 
 test('Should create a transaction for route handlers', async ({ request }) => {
   const routehandlerTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
-    console.log('transactionEvent1', JSON.stringify(transactionEvent, null, 2));
-    return transactionEvent?.transaction === 'GET /route-handlers/[param]';
+    // Sometimes, next.js adds /route there, we accept both variants
+    return (
+      transactionEvent?.transaction === 'GET /route-handlers/[param]' ||
+      transactionEvent?.transaction === 'GET /route-handlers/[param]/route'
+    );
   });
 
   const response = await request.get('/route-handlers/foo', { headers: { 'x-yeet': 'test-value' } });
@@ -21,8 +24,11 @@ test('Should create a transaction for route handlers and correctly set span stat
   request,
 }) => {
   const routehandlerTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
-    console.log('transactionEvent2', JSON.stringify(transactionEvent, null, 2));
-    return transactionEvent?.transaction === 'POST /route-handlers/[param]';
+    // Sometimes, next.js adds /route there, we accept both variants
+    return (
+      transactionEvent?.transaction === 'POST /route-handlers/[param]' ||
+      transactionEvent?.transaction === 'POST /route-handlers/[param]/route'
+    );
   });
 
   const response = await request.post('/route-handlers/bar');
@@ -41,7 +47,11 @@ test('Should record exceptions and transactions for faulty route handlers', asyn
 
   const routehandlerTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
     console.log('transactionEvent3', JSON.stringify(transactionEvent, null, 2));
-    return transactionEvent?.transaction === 'PUT /route-handlers/[param]/error';
+    // Sometimes, next.js adds /route there, we accept both variants
+    return (
+      transactionEvent?.transaction === 'PUT /route-handlers/[param]' ||
+      transactionEvent?.transaction === 'PUT /route-handlers/[param]/route'
+    );
   });
 
   await request.put('/route-handlers/baz/error').catch(() => {

packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts

@@ -30,8 +30,6 @@ function startOrUpdateSpan(spanName: string, cb: (rootSpan: Span) => Promise<Res
       [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
       [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
       [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs',
-      'sentry.updated_span': 'yes',
-      'sentry.spanName': spanName,
     });
 
     return cb(rootSpan);
@@ -45,8 +43,6 @@ function startOrUpdateSpan(spanName: string, cb: (rootSpan: Span) => Promise<Res
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs',
-          'sentry.updated_span': 'no',
-          'sentry.spanName': spanName,
         },
       },
       (span: Span) => {