fixup! fix(react-router): Resolve the Cloudflare entry in Workers and skip trace meta tags in prerendered pages

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: JPeer264

packages/react-router/src/server/wrapSentryHandleRequest.ts

@@ -66,8 +66,11 @@ export function wrapSentryHandleRequest(
     routerContext: EntryContext,
     loadContext: AppLoadContext | RouterContextProvider,
   ) {
-    const parameterizedPath =
-      routerContext?.staticHandlerContext?.matches?.[routerContext.staticHandlerContext.matches.length - 1]?.route.path;
+    const matches = routerContext?.staticHandlerContext?.matches;
+    // An index route has no `path` of its own and renders at its nearest ancestor's path, or at `/`.
+    const parameterizedPath = matches?.length
+      ? ([...matches].reverse().find(match => match.route.path)?.route.path ?? '/')
+      : undefined;
 
     const activeSpan = getActiveSpan();
     const rootSpan = activeSpan ? getRootSpan(activeSpan) : undefined;

packages/react-router/test/server/wrapSentryHandleRequest.test.ts

@@ -74,6 +74,45 @@ describe('wrapSentryHandleRequest', () => {
     });
   });
 
+  test('should name an index route after its nearest ancestor path, or `/`', async () => {
+    const mockRootSpan = { setAttributes: vi.fn() };
+
+    (getActiveSpan as unknown as ReturnType<typeof vi.fn>).mockReturnValue({});
+    (getRootSpan as unknown as ReturnType<typeof vi.fn>).mockReturnValue(mockRootSpan);
+
+    const wrappedHandler = wrapSentryHandleRequest(vi.fn().mockResolvedValue('test'));
+
+    const rootIndexContext = {
+      staticHandlerContext: { matches: [{ route: { path: '' } }, { route: { index: true } }] },
+    } as any;
+    await wrappedHandler(new Request('https://nacho.queso/'), 200, new Headers(), rootIndexContext, {} as any);
+
+    expect(mockRootSpan.setAttributes).toHaveBeenLastCalledWith({
+      [HTTP_ROUTE]: '/',
+      [SENTRY_SEGMENT_NAME_SOURCE]: 'route',
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
+    });
+
+    const nestedIndexContext = {
+      staticHandlerContext: {
+        matches: [{ route: { path: '' } }, { route: { path: 'dashboard' } }, { route: { index: true } }],
+      },
+    } as any;
+    await wrappedHandler(
+      new Request('https://nacho.queso/dashboard'),
+      200,
+      new Headers(),
+      nestedIndexContext,
+      {} as any,
+    );
+
+    expect(mockRootSpan.setAttributes).toHaveBeenLastCalledWith({
+      [HTTP_ROUTE]: '/dashboard',
+      [SENTRY_SEGMENT_NAME_SOURCE]: 'route',
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
+    });
+  });
+
   test('should not set span attributes when parameterized path does not exist', async () => {
     const mockActiveSpan = {};
     const mockRootSpan = { setAttributes: vi.fn() };