fix: just delete the tags

Author: logaretm

packages/nextjs/src/client/index.ts

@@ -15,6 +15,7 @@ export * from '../common';
 export { captureUnderscoreErrorException } from '../common/pages-router-instrumentation/_error';
 export { browserTracingIntegration } from './browserTracingIntegration';
 export { captureRouterTransitionStart } from './routing/appRouterRoutingInstrumentation';
+import { removeIsrSsgTraceMetaTags } from './routing/isrRoutingTracing';
 
 let clientIsInitialized = false;
 
@@ -41,6 +42,10 @@ export function init(options: BrowserOptions): Client | undefined {
   }
   clientIsInitialized = true;
 
+  // Remove cached trace meta tags for ISR/SSG pages before initializing
+  // This prevents the browser tracing integration from using stale trace IDs
+  removeIsrSsgTraceMetaTags();
+
   const opts = {
     environment: getVercelEnv(true) || process.env.NODE_ENV,
     defaultIntegrations: getDefaultIntegrations(options),

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

@@ -1,14 +1,13 @@
 import type { Client, Span } from '@sentry/core';
 import {
   browserPerformanceTimeOrigin,
-  GLOBAL_OBJ,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
 } from '@sentry/core';
 import { startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, WINDOW } from '@sentry/react';
-import type { RouteManifest } from '../../config/manifest/types';
 import { maybeParameterizeRoute } from './parameterization';
+import { GLOBAL_OBJ } from '@sentry/core';
 
 export const INCOMPLETE_APP_ROUTER_INSTRUMENTATION_TRANSACTION_NAME = 'incomplete-app-router-transaction';
 
@@ -34,66 +33,21 @@ let navigationRoutingMode: 'router-patch' | 'transition-start-hook' = 'router-pa
 
 const currentRouterPatchingNavigationSpanRef: NavigationSpanRef = { current: undefined };
 
-/**
- * Check if the current route is an ISR/SSG page by looking it up in the route manifest
- */
-function isIsrSsgRoute(pathname: string): boolean {
-  const globalWithManifest = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
-    _sentryRouteManifest?: string | RouteManifest;
-  };
-
-  const manifestData = globalWithManifest._sentryRouteManifest;
-  if (!manifestData) {
-    return false;
-  }
-
-  let manifest: RouteManifest;
-  if (typeof manifestData === 'string') {
-    try {
-      manifest = JSON.parse(manifestData);
-    } catch {
-      return false;
-    }
-  } else {
-    manifest = manifestData;
-  }
-
-  if (!manifest.isrRoutes || manifest.isrRoutes.length === 0) {
-    return false;
-  }
-
-  // Check if the pathname matches any ISR route
-  // For dynamic routes, we need to match the parameterized pattern
-  const parameterizedPath = maybeParameterizeRoute(pathname);
-  const pathToCheck = parameterizedPath || pathname;
-
-  return manifest.isrRoutes.includes(pathToCheck);
-}
-
 /** Instruments the Next.js app router for pageloads. */
 export function appRouterInstrumentPageLoad(client: Client): void {
   const parameterizedPathname = maybeParameterizeRoute(WINDOW.location.pathname);
   const origin = browserPerformanceTimeOrigin();
 
-  // Check if this is an ISR/SSG page
-  // if so, don't use cached trace meta tags to prevent using cached trace data
-  const isIsrSsgPage = isIsrSsgRoute(WINDOW.location.pathname);
-
-  startBrowserTracingPageLoadSpan(
-    client,
-    {
-      name: parameterizedPathname ?? WINDOW.location.pathname,
-      // pageload should always start at timeOrigin (and needs to be in s, not ms)
-      startTime: origin ? origin / 1000 : undefined,
-      attributes: {
-        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
-        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.nextjs.app_router_instrumentation',
-        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: parameterizedPathname ? 'route' : 'url',
-      },
+  startBrowserTracingPageLoadSpan(client, {
+    name: parameterizedPathname ?? WINDOW.location.pathname,
+    // pageload should always start at timeOrigin (and needs to be in s, not ms)
+    startTime: origin ? origin / 1000 : undefined,
+    attributes: {
+      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.nextjs.app_router_instrumentation',
+      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: parameterizedPathname ? 'route' : 'url',
     },
-    // For ISR/SSG pages, pass empty trace data to prevent using cached meta tags
-    isIsrSsgPage ? { sentryTrace: undefined, baggage: undefined } : undefined,
-  );
+  });
 }
 
 interface NavigationSpanRef {

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

@@ -0,0 +1,62 @@
+import type { RouteManifest } from '../../config/manifest/types';
+import { maybeParameterizeRoute } from './parameterization';
+import { GLOBAL_OBJ } from '@sentry/core';
+
+const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
+  _sentryRouteManifest: string | RouteManifest;
+};
+
+/**
+ * Check if the current page is an ISR/SSG route by checking the route manifest.
+ */
+function isIsrSsgRoute(pathname: string): boolean {
+  const manifestData = globalWithInjectedValues._sentryRouteManifest;
+  if (!manifestData) {
+    return false;
+  }
+
+  let manifest: RouteManifest;
+  if (typeof manifestData === 'string') {
+    try {
+      manifest = JSON.parse(manifestData);
+    } catch {
+      return false;
+    }
+  } else {
+    manifest = manifestData;
+  }
+
+  if (!manifest.isrRoutes || manifest.isrRoutes.length === 0) {
+    return false;
+  }
+
+  const parameterizedPath = maybeParameterizeRoute(pathname);
+  const pathToCheck = parameterizedPath || pathname;
+
+  return manifest.isrRoutes.includes(pathToCheck);
+}
+
+/**
+ * Remove sentry-trace and baggage meta tags from the DOM if this is an ISR/SSG page.
+ * This prevents the browser tracing integration from using stale/cached trace IDs.
+ */
+export function removeIsrSsgTraceMetaTags(): void {
+  if (typeof document === 'undefined') {
+    return;
+  }
+
+  if (!isIsrSsgRoute(window.location.pathname)) {
+    return;
+  }
+
+  // Remove the meta tags so browserTracingIntegration won't pick them up
+  const sentryTraceMeta = document.querySelector('meta[name="sentry-trace"]');
+  if (sentryTraceMeta) {
+    sentryTraceMeta.remove();
+  }
+
+  const baggageMeta = document.querySelector('meta[name="baggage"]');
+  if (baggageMeta) {
+    baggageMeta.remove();
+  }
+}