ensure we have scopes on root span?!

Author: mydea

packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts

@@ -1,4 +1,4 @@
-import { spanToJSON } from '@sentry/core';
+import { getCurrentScope, spanToJSON } from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
@@ -13,7 +13,7 @@ import {
   startSpan,
   withIsolationScope,
 } from '@sentry/core';
-import { getSpanScopes } from '@sentry/opentelemetry';
+import { getSpanScopes, setSpanScopes } from '@sentry/opentelemetry';
 import type { Span } from '@sentry/types';
 import { winterCGHeadersToDict } from '@sentry/utils';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
@@ -84,8 +84,15 @@ export function wrapRouteHandlerWithSentry<F extends (...args: any[]) => any>(
           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);
+            rootSpan.setAttribute('has_span_scopes', !!scopes);
+            console.log('getting scopes', scopes);
             if (scopes) {
               scopes.isolationScope = isolationScope;
+            } else {
+              setSpanScopes(rootSpan, {
+                scope: getCurrentScope(),
+                isolationScope,
+              });
             }
 
             const response: Response = await handleCallbackErrors(

packages/opentelemetry/src/index.ts

@@ -4,7 +4,7 @@ export type { OpenTelemetryClient } from './types';
 export { wrapClientClass } from './custom/client';
 
 export { getSpanKind } from './utils/getSpanKind';
-export { getSpanScopes } from './utils/spanData';
+export { getSpanScopes, setSpanScopes } from './utils/spanData';
 
 export { getScopesFromContext } from './utils/contextData';