fix(nextjs): Stop accessing sync props in template (#18113)

We need to stop accessing params within our wrapper templates as this
can break statically rendered pages and cause cache busts in dynamic
pages.

Opened #18115 to
investigate other ways of handling the functionality we're removing
here.

closes #18097
closes #17431

Note: There's some unused code in the utils that I did not delete as we
might be able to reuse this in
#18115

Author: chargome

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts

@@ -39,7 +39,6 @@ test('Sends a transaction for a request to app router', async ({ page }) => {
     headers: expect.objectContaining({
       'user-agent': expect.any(String),
     }),
-    url: expect.stringContaining('/server-component/parameter/1337/42'),
   });
 
   // The transaction should not contain any spans with the same name as the transaction

packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts

@@ -3,7 +3,6 @@ import {
   captureException,
   getActiveSpan,
   getCapturedScopesOnSpan,
-  getClient,
   getRootSpan,
   handleCallbackErrors,
   propagationContextFromHeaders,
@@ -13,7 +12,6 @@ import {
   setCapturedScopesOnSpan,
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
-  spanToJSON,
   startSpanManual,
   winterCGHeadersToDict,
   withIsolationScope,
@@ -23,8 +21,6 @@ import type { GenerationFunctionContext } from '../common/types';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
 import { TRANSACTION_ATTR_SENTRY_TRACE_BACKFILL } from './span-attributes-with-logic-attached';
 import { commonObjectToIsolationScope, commonObjectToPropagationContext } from './utils/tracingUtils';
-import { getSanitizedRequestUrl } from './utils/urls';
-import { maybeExtractSynchronousParamsAndSearchParams } from './utils/wrapperUtils';
 /**
  * Wraps a generation function (e.g. generateMetadata) with Sentry error and performance instrumentation.
  */
@@ -46,43 +42,23 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
       }
 
       const isolationScope = commonObjectToIsolationScope(headers);
-      let pathname = undefined as string | undefined;
 
       const activeSpan = getActiveSpan();
       if (activeSpan) {
         const rootSpan = getRootSpan(activeSpan);
         const { scope } = getCapturedScopesOnSpan(rootSpan);
         setCapturedScopesOnSpan(rootSpan, scope ?? new Scope(), isolationScope);
-
-        const spanData = spanToJSON(rootSpan);
-
-        if (spanData.data && 'http.target' in spanData.data) {
-          pathname = spanData.data['http.target'] as string;
-        }
       }
 
       const headersDict = headers ? winterCGHeadersToDict(headers) : undefined;
 
-      let data: Record<string, unknown> | undefined = undefined;
-      if (getClient()?.getOptions().sendDefaultPii) {
-        const props: unknown = args[0];
-        const { params, searchParams } = maybeExtractSynchronousParamsAndSearchParams(props);
-        data = { params, searchParams };
-      }
-
       return withIsolationScope(isolationScope, () => {
         return withScope(scope => {
           scope.setTransactionName(`${componentType}.${generationFunctionIdentifier} (${componentRoute})`);
 
           isolationScope.setSDKProcessingMetadata({
             normalizedRequest: {
               headers: headersDict,
-              url: getSanitizedRequestUrl(
-                componentRoute,
-                data?.params as Record<string, string> | undefined,
-                headersDict,
-                pathname,
-              ),
             } satisfies RequestEventData,
           });
 
@@ -106,8 +82,6 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
 
           scope.setPropagationContext(propagationContext);
 
-          scope.setExtra('route_data', data);
-
           return startSpanManual(
             {
               op: 'function.nextjs',

packages/nextjs/src/common/wrapServerComponentWithSentry.ts

@@ -3,7 +3,6 @@ import {
   captureException,
   getActiveSpan,
   getCapturedScopesOnSpan,
-  getClient,
   getRootSpan,
   handleCallbackErrors,
   propagationContextFromHeaders,
@@ -13,7 +12,6 @@ import {
   setCapturedScopesOnSpan,
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
-  spanToJSON,
   startSpanManual,
   vercelWaitUntil,
   winterCGHeadersToDict,
@@ -25,8 +23,6 @@ import type { ServerComponentContext } from '../common/types';
 import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
 import { TRANSACTION_ATTR_SENTRY_TRACE_BACKFILL } from './span-attributes-with-logic-attached';
 import { commonObjectToIsolationScope, commonObjectToPropagationContext } from './utils/tracingUtils';
-import { getSanitizedRequestUrl } from './utils/urls';
-import { maybeExtractSynchronousParamsAndSearchParams } from './utils/wrapperUtils';
 
 /**
  * Wraps an `app` directory server component with Sentry error instrumentation.
@@ -45,34 +41,18 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
       const requestTraceId = getActiveSpan()?.spanContext().traceId;
       const isolationScope = commonObjectToIsolationScope(context.headers);
 
-      let pathname = undefined as string | undefined;
       const activeSpan = getActiveSpan();
       if (activeSpan) {
         const rootSpan = getRootSpan(activeSpan);
         const { scope } = getCapturedScopesOnSpan(rootSpan);
         setCapturedScopesOnSpan(rootSpan, scope ?? new Scope(), isolationScope);
-
-        const spanData = spanToJSON(rootSpan);
-
-        if (spanData.data && 'http.target' in spanData.data) {
-          pathname = spanData.data['http.target']?.toString();
-        }
       }
 
       const headersDict = context.headers ? winterCGHeadersToDict(context.headers) : undefined;
 
-      let params: Record<string, string> | undefined = undefined;
-
-      if (getClient()?.getOptions().sendDefaultPii) {
-        const props: unknown = args[0];
-        const { params: paramsFromProps } = maybeExtractSynchronousParamsAndSearchParams(props);
-        params = paramsFromProps;
-      }
-
       isolationScope.setSDKProcessingMetadata({
         normalizedRequest: {
           headers: headersDict,
-          url: getSanitizedRequestUrl(componentRoute, params, headersDict, pathname),
         } satisfies RequestEventData,
       });