edge hurts

Author: chargome

dev-packages/e2e-tests/test-applications/nextjs-15/tests/route-handler.test.ts

@@ -34,5 +34,5 @@ test('Should create a transaction for edge route handlers', async ({ request })
   expect(routehandlerTransaction.contexts?.trace?.status).toBe('ok');
   expect(routehandlerTransaction.contexts?.trace?.op).toBe('http.server');
   // todo: check if we can set request headers for edge on sdkProcessingMetadata
-  // expect(routehandlerTransaction.contexts?.trace?.data?.['http.request.header.x-charly']).toBe('gomez');
+  // expect(routehandlerTransaction.contexts?.trace?.data?.['http.request.header.x_charly']).toBe('gomez');
 });

packages/nextjs/src/edge/index.ts

@@ -1,6 +1,8 @@
 import {
   applySdkMetadata,
+  getClient,
   getGlobalScope,
+  getIsolationScope,
   getRootSpan,
   GLOBAL_OBJ,
   registerSpanErrorInstrumentation,
@@ -13,6 +15,7 @@ import {
 } from '@sentry/core';
 import type { VercelEdgeOptions } from '@sentry/vercel-edge';
 import { getDefaultIntegrations, init as vercelEdgeInit } from '@sentry/vercel-edge';
+import { addHeadersAsAttributes } from '../common/utils/addHeadersAsAttributes';
 import { isBuild } from '../common/utils/isBuild';
 import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
 import { distDirRewriteFramesIntegration } from './distDirRewriteFramesIntegration';
@@ -59,6 +62,8 @@ export function init(options: VercelEdgeOptions = {}): void {
 
   client?.on('spanStart', span => {
     const spanAttributes = spanToJSON(span).data;
+    const rootSpan = getRootSpan(span);
+    const isRootSpan = span === rootSpan;
 
     // Mark all spans generated by Next.js as 'auto'
     if (spanAttributes?.['next.span_type'] !== undefined) {
@@ -70,6 +75,13 @@ export function init(options: VercelEdgeOptions = {}): void {
       span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'http.server.middleware');
       span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'url');
     }
+
+    const shouldSendDefaultPii = getClient()?.getOptions().sendDefaultPii ?? false;
+    if (shouldSendDefaultPii && isRootSpan) {
+      // todo: check if we can set request headers for edge on sdkProcessingMetadata
+      const headers = getIsolationScope().getScopeData().sdkProcessingMetadata?.normalizedRequest?.headers;
+      addHeadersAsAttributes(headers, rootSpan);
+    }
   });
 
   // Use the preprocessEvent hook instead of an event processor, so that the users event processors receive the most

packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts

@@ -13,6 +13,7 @@ import {
   winterCGRequestToRequestData,
   withIsolationScope,
 } from '@sentry/core';
+import { addHeadersAsAttributes } from '../common/utils/addHeadersAsAttributes';
 import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
 import type { EdgeRouteHandler } from './types';
 
@@ -31,13 +32,14 @@ export function wrapApiHandlerWithSentry<H extends EdgeRouteHandler>(
         const req: unknown = args[0];
         const currentScope = getCurrentScope();
 
-        const headerAttributes: Record<string, string> = {};
+        let headerAttributes: Record<string, string> = {};
 
         if (req instanceof Request) {
           isolationScope.setSDKProcessingMetadata({
             normalizedRequest: winterCGRequestToRequestData(req),
           });
           currentScope.setTransactionName(`${req.method} ${parameterizedRoute}`);
+          headerAttributes = addHeadersAsAttributes(req.headers);
         } else {
           currentScope.setTransactionName(`handler (${parameterizedRoute})`);
         }