fix(nextjs): Fix navigation tracing on app router (#10502)

Author: Luca Forstner

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

@@ -37,7 +37,7 @@ test('Creates a navigation transaction for app router routes', async ({ page })
     );
   });
 
-  const servercomponentTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
+  const serverComponentTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
     return (
       transactionEvent?.transaction === 'Page Server Component (/server-component/parameter/[...parameters])' &&
       (await clientNavigationTransactionPromise).contexts?.trace?.trace_id ===
@@ -48,5 +48,5 @@ test('Creates a navigation transaction for app router routes', async ({ page })
   await page.getByText('/server-component/parameter/foo/bar/baz').click();
 
   expect(await clientNavigationTransactionPromise).toBeDefined();
-  expect(await servercomponentTransactionPromise).toBeDefined();
+  expect(await serverComponentTransactionPromise).toBeDefined();
 });

packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts

@@ -3,6 +3,7 @@ import {
   addTracingExtensions,
   captureException,
   getClient,
+  getCurrentScope,
   handleCallbackErrors,
   startSpanManual,
   withIsolationScope,
@@ -59,6 +60,7 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
 
         const propagationContext = commonObjectToPropagationContext(headers, incomingPropagationContext);
         isolationScope.setPropagationContext(propagationContext);
+        getCurrentScope().setPropagationContext(propagationContext);
 
         return startSpanManual(
           {

packages/nextjs/src/common/wrapServerComponentWithSentry.ts

@@ -2,6 +2,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   addTracingExtensions,
   captureException,
+  getCurrentScope,
   handleCallbackErrors,
   startSpanManual,
   withIsolationScope,
@@ -51,6 +52,7 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
 
         const propagationContext = commonObjectToPropagationContext(context.headers, incomingPropagationContext);
         isolationScope.setPropagationContext(propagationContext);
+        getCurrentScope().setPropagationContext(propagationContext);
 
         return startSpanManual(
           {