.

Author: lforst

packages/nextjs/package.json

@@ -66,6 +66,7 @@
   },
   "dependencies": {
     "@opentelemetry/instrumentation-http": "0.51.1",
+    "@opentelemetry/api": "^1.8.0",
     "@rollup/plugin-commonjs": "24.0.0",
     "@sentry/core": "8.2.1",
     "@sentry/node": "8.2.1",

packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts

@@ -5,10 +5,39 @@ import {
 } from '@sentry/core';
 import { WINDOW, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '@sentry/react';
 import type { Client } from '@sentry/types';
-import { addFetchInstrumentationHandler, browserPerformanceTimeOrigin } from '@sentry/utils';
+import { addFetchInstrumentationHandler, browserPerformanceTimeOrigin, parseBaggageHeader } from '@sentry/utils';
 
 /** Instruments the Next.js app router for pageloads. */
 export function appRouterInstrumentPageLoad(client: Client): void {
+  // We use an event processor to override the automatically collected Request Browser metric span ID with the span ID
+  // hint from the server so that the SSR spans are properly attached to the request span.
+  client.addEventProcessor(event => {
+    if (event.type !== 'transaction' || event.contexts?.trace?.op !== 'pageload') {
+      return event;
+    }
+
+    const baggage = WINDOW.document.querySelector('meta[name=baggage]')?.getAttribute('content');
+    if (baggage) {
+      const parsedBaggage = parseBaggageHeader(baggage);
+      if (parsedBaggage && parsedBaggage['sentry-request-span-id-suggestion']) {
+        const spanIdSuggestion = parsedBaggage['sentry-request-span-id-suggestion'];
+        event.spans?.forEach(span => {
+          if (span.description === 'request' && span.op === 'browser') {
+            // Replace request span ID
+            span.span_id = spanIdSuggestion;
+
+            if (event.contexts?.trace) {
+              // Unset the parent span of the pageload transaction - it is now the root of the trace
+              event.contexts.trace.parent_span_id = undefined;
+            }
+          }
+        });
+      }
+    }
+
+    return event;
+  });
+
   startBrowserTracingPageLoadSpan(client, {
     name: WINDOW.location.pathname,
     // pageload should always start at timeOrigin (and needs to be in s, not ms)

packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts

@@ -3,16 +3,19 @@ import {
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
   captureException,
+  getActiveSpan,
   getClient,
   handleCallbackErrors,
   startSpanManual,
   withIsolationScope,
   withScope,
 } from '@sentry/core';
 import type { WebFetchHeaders } from '@sentry/types';
-import { propagationContextFromHeaders, winterCGHeadersToDict } from '@sentry/utils';
+import { propagationContextFromHeaders, uuid4, winterCGHeadersToDict } from '@sentry/utils';
 
+import { context as otelContext } from '@opentelemetry/api';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY } from '@sentry/opentelemetry';
 import type { GenerationFunctionContext } from '../common/types';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
 import {
@@ -32,6 +35,7 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
   const { requestAsyncStorage, componentRoute, componentType, generationFunctionIdentifier } = context;
   return new Proxy(generationFunction, {
     apply: (originalFunction, thisArg, args) => {
+      const requestTraceId = getActiveSpan()?.spanContext().traceId;
       return escapeNextjsTracing(() => {
         let headers: WebFetchHeaders | undefined = undefined;
         // We try-catch here just in case anything goes wrong with the async storage here goes wrong since it is Next.js internal API
@@ -50,22 +54,32 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
           data = { params, searchParams };
         }
 
-        const incomingPropagationContext = propagationContextFromHeaders(
-          headers?.get('sentry-trace') ?? undefined,
-          headers?.get('baggage'),
-        );
+        const completeHeadersDict: Record<string, string> = headers ? winterCGHeadersToDict(headers) : {};
 
         const isolationScope = commonObjectToIsolationScope(headers);
-        const propagationContext = commonObjectToPropagationContext(headers, incomingPropagationContext);
+
+        isolationScope.setSDKProcessingMetadata({
+          request: {
+            headers: completeHeadersDict,
+          },
+        });
 
         return withIsolationScope(isolationScope, () => {
           return withScope(scope => {
             scope.setTransactionName(`${componentType}.${generationFunctionIdentifier} (${componentRoute})`);
-            isolationScope.setSDKProcessingMetadata({
-              request: {
-                headers: headers ? winterCGHeadersToDict(headers) : undefined,
-              },
-            });
+
+            const propagationContext = commonObjectToPropagationContext(
+              headers,
+              completeHeadersDict['sentry-trace']
+                ? propagationContextFromHeaders(completeHeadersDict['sentry-trace'], completeHeadersDict['baggage'])
+                : {
+                    traceId: requestTraceId || uuid4(),
+                    spanId: uuid4().substring(16),
+                    parentSpanId: otelContext
+                      .active()
+                      .getValue(EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY) as string | undefined,
+                  },
+            );
 
             scope.setExtra('route_data', data);
             scope.setPropagationContext(propagationContext);

packages/nextjs/src/common/wrapServerComponentWithSentry.ts

@@ -3,14 +3,17 @@ import {
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
   captureException,
+  getActiveSpan,
   handleCallbackErrors,
   startSpanManual,
   withIsolationScope,
   withScope,
 } from '@sentry/core';
-import { propagationContextFromHeaders, winterCGHeadersToDict } from '@sentry/utils';
+import { propagationContextFromHeaders, uuid4, winterCGHeadersToDict } from '@sentry/utils';
 
+import { context as otelContext } from '@opentelemetry/api';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY } from '@sentry/opentelemetry';
 import { isNotFoundNavigationError, isRedirectNavigationError } from '../common/nextNavigationErrorUtils';
 import type { ServerComponentContext } from '../common/types';
 import { flushQueue } from './utils/responseEnd';
@@ -34,6 +37,7 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
   // hook. 🤯
   return new Proxy(appDirComponent, {
     apply: (originalFunction, thisArg, args) => {
+      const requestTraceId = getActiveSpan()?.spanContext().traceId;
       return escapeNextjsTracing(() => {
         const isolationScope = commonObjectToIsolationScope(context.headers);
 
@@ -47,17 +51,23 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
           },
         });
 
-        const incomingPropagationContext = propagationContextFromHeaders(
-          completeHeadersDict['sentry-trace'],
-          completeHeadersDict['baggage'],
-        );
-
-        const propagationContext = commonObjectToPropagationContext(context.headers, incomingPropagationContext);
-
         return withIsolationScope(isolationScope, () => {
           return withScope(scope => {
             scope.setTransactionName(`${componentType} Server Component (${componentRoute})`);
 
+            const propagationContext = commonObjectToPropagationContext(
+              context.headers,
+              completeHeadersDict['sentry-trace']
+                ? propagationContextFromHeaders(completeHeadersDict['sentry-trace'], completeHeadersDict['baggage'])
+                : {
+                    traceId: requestTraceId || uuid4(),
+                    spanId: uuid4().substring(16),
+                    parentSpanId: otelContext
+                      .active()
+                      .getValue(EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY) as string | undefined,
+                  },
+            );
+
             scope.setPropagationContext(propagationContext);
             return startSpanManual(
               {

packages/nextjs/src/server/httpIntegration.ts

@@ -1,6 +1,9 @@
+import { context } from '@opentelemetry/api';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 import { httpIntegration as originalHttpIntegration } from '@sentry/node';
+import { EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY } from '@sentry/opentelemetry';
 import type { IntegrationFn } from '@sentry/types';
+import { uuid4 } from '@sentry/utils';
 
 /**
  * Next.js handles incoming requests itself,
@@ -16,7 +19,15 @@ class CustomNextjsHttpIntegration extends HttpInstrumentation {
       original: (event: string, ...args: unknown[]) => boolean,
     ): ((this: unknown, event: string, ...args: unknown[]) => boolean) => {
       return function incomingRequest(this: unknown, event: string, ...args: unknown[]): boolean {
-        return original.apply(this, [event, ...args]);
+        const requestSpanIdSuggestion = uuid4().substring(16);
+        return context.with(
+          context
+            .active()
+            .setValue(EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY, requestSpanIdSuggestion),
+          () => {
+            return original.apply(this, [event, ...args]);
+          },
+        );
       };
     };
   }

packages/opentelemetry/src/constants.ts

@@ -15,3 +15,7 @@ export const SENTRY_FORK_ISOLATION_SCOPE_CONTEXT_KEY = createContextKey('sentry_
 export const SENTRY_FORK_SET_SCOPE_CONTEXT_KEY = createContextKey('sentry_fork_set_scope');
 
 export const SENTRY_FORK_SET_ISOLATION_SCOPE_CONTEXT_KEY = createContextKey('sentry_fork_set_isolation_scope');
+
+export const EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY = createContextKey(
+  'sentry_request_span_id_suggestion',
+);

packages/opentelemetry/src/index.ts

@@ -39,5 +39,7 @@ export { openTelemetrySetupCheck } from './utils/setupCheck';
 
 export { addOpenTelemetryInstrumentation } from './instrumentation';
 
+export { EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY } from './constants';
+
 // Legacy
 export { getClient } from '@sentry/core';

packages/opentelemetry/src/propagator.ts

@@ -22,6 +22,7 @@ import {
 } from '@sentry/utils';
 
 import {
+  EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY,
   SENTRY_BAGGAGE_HEADER,
   SENTRY_TRACE_HEADER,
   SENTRY_TRACE_STATE_DSC,
@@ -131,6 +132,15 @@ export class SentryPropagator extends W3CBaggagePropagator {
       setter.set(carrier, SENTRY_TRACE_HEADER, generateSentryTraceHeader(traceId, spanId, sampled));
     }
 
+    const requestSpanIdSuggestion = context.getValue(EXPERIMENTAL_SENTRY_REQUEST_SPAN_ID_SUGGESTION_CONTEXT_KEY) as
+      | string
+      | undefined;
+    if (requestSpanIdSuggestion) {
+      baggage = baggage.setEntry(`${SENTRY_BAGGAGE_KEY_PREFIX}request-span-id-suggestion`, {
+        value: requestSpanIdSuggestion,
+      });
+    }
+
     super.inject(propagation.setBaggage(context, baggage), carrier, setter);
   }