test

Author: Luca Forstner

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/client-app-routing-instrumentation.test.ts

@@ -38,12 +38,13 @@ test('Creates a navigation transaction for app router routes', async ({ page })
   });
 
   const serverComponentTransactionPromise = waitForTransaction('nextjs-app-dir', async transactionEvent => {
-    console.log({ t: transactionEvent.transaction });
+    console.log({
+      t: transactionEvent.transaction,
+      tid: transactionEvent.contexts?.trace?.trace_id,
+      ctid: (await clientNavigationTransactionPromise).contexts?.trace?.trace_id,
+    });
     return (
-      // Next.js 14+
-      (transactionEvent?.transaction === 'GET /server-component/parameter/foo/bar/baz' ||
-        // Next.js 13
-        transactionEvent?.transaction === 'GET /server-component/parameter/[...parameters]') &&
+      transactionEvent?.transaction === 'GET /server-component/parameter/foo/bar/baz' &&
       (await clientNavigationTransactionPromise).contexts?.trace?.trace_id ===
         transactionEvent.contexts?.trace?.trace_id
     );

packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts

@@ -5,6 +5,7 @@ import {
   Scope,
   captureException,
   getActiveSpan,
+  getCapturedScopesOnSpan,
   getClient,
   getRootSpan,
   handleCallbackErrors,
@@ -45,8 +46,11 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
       const activeSpan = getActiveSpan();
       if (activeSpan) {
         const rootSpan = getRootSpan(activeSpan);
+        const { scope } = getCapturedScopesOnSpan(rootSpan);
+        setCapturedScopesOnSpan(rootSpan, scope ?? new Scope(), isolationScope);
+
+        // We mark the root span as an app router span so we can allow-list it in our span processor that would normally filter out all Next.js transactions/spans
         rootSpan.setAttribute('sentry.rsc', true);
-        setCapturedScopesOnSpan(rootSpan, new Scope(), isolationScope);
       }
 
       let data: Record<string, unknown> | undefined = undefined;

packages/nextjs/src/common/wrapServerComponentWithSentry.ts

@@ -5,6 +5,7 @@ import {
   Scope,
   captureException,
   getActiveSpan,
+  getCapturedScopesOnSpan,
   getRootSpan,
   handleCallbackErrors,
   setCapturedScopesOnSpan,
@@ -40,8 +41,11 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
       const activeSpan = getActiveSpan();
       if (activeSpan) {
         const rootSpan = getRootSpan(activeSpan);
+        const { scope } = getCapturedScopesOnSpan(rootSpan);
+        setCapturedScopesOnSpan(rootSpan, scope ?? new Scope(), isolationScope);
+
+        // We mark the root span as an app router span so we can allow-list it in our span processor that would normally filter out all Next.js transactions/spans
         rootSpan.setAttribute('sentry.rsc', true);
-        setCapturedScopesOnSpan(rootSpan, new Scope(), isolationScope);
       }
 
       const headersDict = context.headers ? winterCGHeadersToDict(context.headers) : undefined;