FIX ME NOW??!

Author: mydea

packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts

@@ -13,6 +13,7 @@ import {
   startSpan,
   withIsolationScope,
 } from '@sentry/core';
+import { getSpanScopes } from '@sentry/opentelemetry';
 import type { Span } from '@sentry/types';
 import { winterCGHeadersToDict } from '@sentry/utils';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
@@ -69,7 +70,6 @@ export function wrapRouteHandlerWithSentry<F extends (...args: any[]) => any>(
   return new Proxy(routeHandler, {
     apply: (originalFunction, thisArg, args) => {
       return withIsolationScope(async isolationScope => {
-        console.log('SETTING ISOLATION SCOPE');
         isolationScope.setSDKProcessingMetadata({
           request: {
             headers: headers ? winterCGHeadersToDict(headers) : undefined,
@@ -78,6 +78,12 @@ export function wrapRouteHandlerWithSentry<F extends (...args: any[]) => any>(
 
         try {
           return await startOrUpdateSpan(`${method} ${parameterizedRoute}`, async (rootSpan: Span) => {
+            // Ensure root span has the correct isolation scope - even if it was triggered by next
+            const scopes = getSpanScopes(rootSpan);
+            if (scopes) {
+              scopes.isolationScope = isolationScope;
+            }
+
             const response: Response = await handleCallbackErrors(
               () => originalFunction.apply(thisArg, args),
               error => {