From 6753bfc949043599405694484ca7a7112294fb72 Mon Sep 17 00:00:00 2001 From: Onur Temizkan Date: Fri, 28 Nov 2025 13:58:41 +0000 Subject: [PATCH 1/3] fix(react-router): Use underscores in trace origin values --- .../performance/navigation.client.test.ts | 8 +++---- .../tests/performance/pageload.client.test.ts | 12 +++++----- .../performance/performance.server.test.ts | 24 +++++++++---------- .../performance/navigation.client.test.ts | 8 +++---- .../tests/performance/pageload.client.test.ts | 12 +++++----- .../performance/performance.server.test.ts | 24 +++++++++---------- .../performance/navigation.client.test.ts | 4 ++-- .../tests/performance/pageload.client.test.ts | 8 +++---- .../performance/navigation.client.test.ts | 4 ++-- .../tests/performance/pageload.client.test.ts | 8 +++---- .../performance/navigation.client.test.ts | 8 +++---- .../tests/performance/pageload.client.test.ts | 12 +++++----- .../performance/performance.server.test.ts | 16 ++++++------- .../react-router/src/client/hydratedRouter.ts | 6 ++--- .../src/server/instrumentation/reactRouter.ts | 4 ++-- .../src/server/wrapSentryHandleRequest.ts | 2 +- .../src/server/wrapServerAction.ts | 4 ++-- .../src/server/wrapServerLoader.ts | 4 ++-- .../server/wrapSentryHandleRequest.test.ts | 2 +- .../test/server/wrapServerAction.test.ts | 4 ++-- .../test/server/wrapServerLoader.test.ts | 4 ++-- 21 files changed, 89 insertions(+), 89 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/navigation.client.test.ts index 24e27e89539e..9e9891bd9306 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/navigation.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/navigation.client.test.ts @@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.navigation.react-router', + 'sentry.origin': 'auto.navigation.react_router', 'sentry.op': 'navigation', 'sentry.source': 'route', }, op: 'navigation', - origin: 'auto.navigation.react-router', + origin: 'auto.navigation.react_router', }, }, spans: expect.any(Array), @@ -71,12 +71,12 @@ test.describe('client - navigation performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.navigation.react-router', + 'sentry.origin': 'auto.navigation.react_router', 'sentry.op': 'navigation', 'sentry.source': 'route', }, op: 'navigation', - origin: 'auto.navigation.react-router', + origin: 'auto.navigation.react_router', }, }, spans: expect.any(Array), diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/pageload.client.test.ts index 465d000dcd31..b374c0ce4642 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/pageload.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/pageload.client.test.ts @@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), @@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), @@ -119,12 +119,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, }); diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts index a53b85228f00..80f858f25f2d 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts @@ -19,11 +19,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.request-handler', + 'sentry.origin': 'auto.http.react_router.request-handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react-router.request-handler', + origin: 'auto.http.react_router.request-handler', }, }, spans: expect.any(Array), @@ -70,11 +70,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.request-handler', + 'sentry.origin': 'auto.http.react_router.request-handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react-router.request-handler', + origin: 'auto.http.react_router.request-handler', }, }, spans: expect.any(Array), @@ -122,7 +122,7 @@ test.describe('server - performance', () => { span_id: expect.any(String), trace_id: expect.any(String), op: 'http.server', - origin: 'auto.http.react-router.loader', + origin: 'auto.http.react_router.loader', parent_span_id: expect.any(String), status: 'ok', data: expect.objectContaining({ @@ -133,7 +133,7 @@ test.describe('server - performance', () => { 'http.target': '/performance/server-loader.data', 'http.url': 'http://localhost:3030/performance/server-loader.data', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.loader', + 'sentry.origin': 'auto.http.react_router.loader', 'sentry.source': 'url', url: 'http://localhost:3030/performance/server-loader.data', }), @@ -152,7 +152,7 @@ test.describe('server - performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.http.react-router.loader', + 'sentry.origin': 'auto.http.react_router.loader', 'sentry.op': 'function.react-router.loader', }, description: 'Executing Server Loader', @@ -161,7 +161,7 @@ test.describe('server - performance', () => { timestamp: expect.any(Number), status: 'ok', op: 'function.react-router.loader', - origin: 'auto.http.react-router.loader', + origin: 'auto.http.react_router.loader', }); }); @@ -182,7 +182,7 @@ test.describe('server - performance', () => { span_id: expect.any(String), trace_id: expect.any(String), op: 'http.server', - origin: 'auto.http.react-router.action', + origin: 'auto.http.react_router.action', parent_span_id: expect.any(String), status: 'ok', data: expect.objectContaining({ @@ -193,7 +193,7 @@ test.describe('server - performance', () => { 'http.target': '/performance/server-action.data', 'http.url': 'http://localhost:3030/performance/server-action.data', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.action', + 'sentry.origin': 'auto.http.react_router.action', 'sentry.source': 'url', url: 'http://localhost:3030/performance/server-action.data', }), @@ -212,7 +212,7 @@ test.describe('server - performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.http.react-router.action', + 'sentry.origin': 'auto.http.react_router.action', 'sentry.op': 'function.react-router.action', }, description: 'Executing Server Action', @@ -221,7 +221,7 @@ test.describe('server - performance', () => { timestamp: expect.any(Number), status: 'ok', op: 'function.react-router.action', - origin: 'auto.http.react-router.action', + origin: 'auto.http.react_router.action', }); }); }); diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/navigation.client.test.ts index 24e27e89539e..9e9891bd9306 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/navigation.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/navigation.client.test.ts @@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.navigation.react-router', + 'sentry.origin': 'auto.navigation.react_router', 'sentry.op': 'navigation', 'sentry.source': 'route', }, op: 'navigation', - origin: 'auto.navigation.react-router', + origin: 'auto.navigation.react_router', }, }, spans: expect.any(Array), @@ -71,12 +71,12 @@ test.describe('client - navigation performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.navigation.react-router', + 'sentry.origin': 'auto.navigation.react_router', 'sentry.op': 'navigation', 'sentry.source': 'route', }, op: 'navigation', - origin: 'auto.navigation.react-router', + origin: 'auto.navigation.react_router', }, }, spans: expect.any(Array), diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/pageload.client.test.ts index 465d000dcd31..b374c0ce4642 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/pageload.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/pageload.client.test.ts @@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), @@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), @@ -119,12 +119,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, }); diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts index dd55a2ed6625..8c2261c131c6 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts @@ -19,11 +19,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.request-handler', + 'sentry.origin': 'auto.http.react_router.request-handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react-router.request-handler', + origin: 'auto.http.react_router.request-handler', }, }, spans: expect.any(Array), @@ -70,11 +70,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.request-handler', + 'sentry.origin': 'auto.http.react_router.request-handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react-router.request-handler', + origin: 'auto.http.react_router.request-handler', }, }, spans: expect.any(Array), @@ -122,7 +122,7 @@ test.describe('server - performance', () => { span_id: expect.any(String), trace_id: expect.any(String), op: 'http.server', - origin: 'auto.http.react-router.server', + origin: 'auto.http.react_router.server', parent_span_id: expect.any(String), status: 'ok', data: expect.objectContaining({ @@ -133,7 +133,7 @@ test.describe('server - performance', () => { 'http.target': '/performance/server-loader.data', 'http.url': 'http://localhost:3030/performance/server-loader.data', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.server', + 'sentry.origin': 'auto.http.react_router.server', 'sentry.source': 'url', url: 'http://localhost:3030/performance/server-loader.data', }), @@ -154,11 +154,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'function.react-router.loader', - 'sentry.origin': 'auto.http.react-router.server', + 'sentry.origin': 'auto.http.react_router.server', }, description: 'Executing Server Loader', op: 'function.react-router.loader', - origin: 'auto.http.react-router.server', + origin: 'auto.http.react_router.server', parent_span_id: expect.any(String), start_timestamp: expect.any(Number), status: 'ok', @@ -183,7 +183,7 @@ test.describe('server - performance', () => { span_id: expect.any(String), trace_id: expect.any(String), op: 'http.server', - origin: 'auto.http.react-router.server', + origin: 'auto.http.react_router.server', parent_span_id: expect.any(String), status: 'ok', data: expect.objectContaining({ @@ -194,7 +194,7 @@ test.describe('server - performance', () => { 'http.target': '/performance/server-action.data', 'http.url': 'http://localhost:3030/performance/server-action.data', 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.server', + 'sentry.origin': 'auto.http.react_router.server', 'sentry.source': 'url', url: 'http://localhost:3030/performance/server-action.data', }), @@ -214,11 +214,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'function.react-router.action', - 'sentry.origin': 'auto.http.react-router.server', + 'sentry.origin': 'auto.http.react_router.server', }, description: 'Executing Server Action', op: 'function.react-router.action', - origin: 'auto.http.react-router.server', + origin: 'auto.http.react_router.server', parent_span_id: expect.any(String), start_timestamp: expect.any(Number), status: 'ok', diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/navigation.client.test.ts index d2257de0cdfa..c30be5a32564 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/navigation.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/navigation.client.test.ts @@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.navigation.react-router', + 'sentry.origin': 'auto.navigation.react_router', 'sentry.op': 'navigation', 'sentry.source': 'route', }, op: 'navigation', - origin: 'auto.navigation.react-router', + origin: 'auto.navigation.react_router', }, }, spans: expect.any(Array), diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/pageload.client.test.ts index 1118bde2669c..224a466ece66 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/pageload.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/pageload.client.test.ts @@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), @@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/navigation.client.test.ts index d2257de0cdfa..c30be5a32564 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/navigation.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/navigation.client.test.ts @@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.navigation.react-router', + 'sentry.origin': 'auto.navigation.react_router', 'sentry.op': 'navigation', 'sentry.source': 'route', }, op: 'navigation', - origin: 'auto.navigation.react-router', + origin: 'auto.navigation.react_router', }, }, spans: expect.any(Array), diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/pageload.client.test.ts index 1118bde2669c..224a466ece66 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/pageload.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/pageload.client.test.ts @@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), @@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/navigation.client.test.ts index 24e27e89539e..9e9891bd9306 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/navigation.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/navigation.client.test.ts @@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.navigation.react-router', + 'sentry.origin': 'auto.navigation.react_router', 'sentry.op': 'navigation', 'sentry.source': 'route', }, op: 'navigation', - origin: 'auto.navigation.react-router', + origin: 'auto.navigation.react_router', }, }, spans: expect.any(Array), @@ -71,12 +71,12 @@ test.describe('client - navigation performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.navigation.react-router', + 'sentry.origin': 'auto.navigation.react_router', 'sentry.op': 'navigation', 'sentry.source': 'route', }, op: 'navigation', - origin: 'auto.navigation.react-router', + origin: 'auto.navigation.react_router', }, }, spans: expect.any(Array), diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/pageload.client.test.ts index 465d000dcd31..b374c0ce4642 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/pageload.client.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/pageload.client.test.ts @@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), @@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, spans: expect.any(Array), @@ -119,12 +119,12 @@ test.describe('client - pageload performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.pageload.react-router', + 'sentry.origin': 'auto.pageload.react_router', 'sentry.op': 'pageload', 'sentry.source': 'route', }, op: 'pageload', - origin: 'auto.pageload.react-router', + origin: 'auto.pageload.react_router', }, }, }); diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts index f3f5e26a6154..0560252e6ded 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts @@ -19,11 +19,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.request-handler', + 'sentry.origin': 'auto.http.react_router.request-handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react-router.request-handler', + origin: 'auto.http.react_router.request-handler', }, }, spans: expect.any(Array), @@ -70,11 +70,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react-router.request-handler', + 'sentry.origin': 'auto.http.react_router.request-handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react-router.request-handler', + origin: 'auto.http.react_router.request-handler', }, }, spans: expect.any(Array), @@ -121,7 +121,7 @@ test.describe('server - performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.http.react-router', + 'sentry.origin': 'auto.http.react_router', 'sentry.op': 'function.react-router.loader', }, description: 'Executing Server Loader', @@ -130,7 +130,7 @@ test.describe('server - performance', () => { timestamp: expect.any(Number), status: 'ok', op: 'function.react-router.loader', - origin: 'auto.http.react-router', + origin: 'auto.http.react_router', }); }); @@ -149,7 +149,7 @@ test.describe('server - performance', () => { span_id: expect.any(String), trace_id: expect.any(String), data: { - 'sentry.origin': 'auto.http.react-router', + 'sentry.origin': 'auto.http.react_router', 'sentry.op': 'function.react-router.action', }, description: 'Executing Server Action', @@ -158,7 +158,7 @@ test.describe('server - performance', () => { timestamp: expect.any(Number), status: 'ok', op: 'function.react-router.action', - origin: 'auto.http.react-router', + origin: 'auto.http.react_router', }); }); }); diff --git a/packages/react-router/src/client/hydratedRouter.ts b/packages/react-router/src/client/hydratedRouter.ts index 7cb53d87487b..14cdf07a33c9 100644 --- a/packages/react-router/src/client/hydratedRouter.ts +++ b/packages/react-router/src/client/hydratedRouter.ts @@ -48,7 +48,7 @@ export function instrumentHydratedRouter(): void { pageloadSpan.updateName(parameterizePageloadRoute); pageloadSpan.setAttributes({ [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react-router', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react_router', }); } @@ -84,7 +84,7 @@ export function instrumentHydratedRouter(): void { navigationSpan.updateName(parameterizedNavRoute); navigationSpan.setAttributes({ [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react-router', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router', }); } }); @@ -125,7 +125,7 @@ function maybeCreateNavigationTransaction(name: string, source: 'url' | 'route') attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source, [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react-router', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router', }, }); } diff --git a/packages/react-router/src/server/instrumentation/reactRouter.ts b/packages/react-router/src/server/instrumentation/reactRouter.ts index 5b7b001e4de5..708b9857015b 100644 --- a/packages/react-router/src/server/instrumentation/reactRouter.ts +++ b/packages/react-router/src/server/instrumentation/reactRouter.ts @@ -93,14 +93,14 @@ export class ReactRouterInstrumentation extends InstrumentationBase(options: SpanOptions = {}, actionFn: (args: updateSpanName(root, `${args.request.method} ${target}`); root.setAttributes({ [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.action', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action', }); } } @@ -66,7 +66,7 @@ export function wrapServerAction(options: SpanOptions = {}, actionFn: (args: name, ...options, attributes: { - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.action', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action', [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.action', ...options.attributes, }, diff --git a/packages/react-router/src/server/wrapServerLoader.ts b/packages/react-router/src/server/wrapServerLoader.ts index 981b2085d4b7..7e5083d4d5c8 100644 --- a/packages/react-router/src/server/wrapServerLoader.ts +++ b/packages/react-router/src/server/wrapServerLoader.ts @@ -55,7 +55,7 @@ export function wrapServerLoader(options: SpanOptions = {}, loaderFn: (args: updateSpanName(root, `${args.request.method} ${target}`); root.setAttributes({ [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.loader', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader', }); } } @@ -66,7 +66,7 @@ export function wrapServerLoader(options: SpanOptions = {}, loaderFn: (args: name, ...options, attributes: { - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.loader', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader', [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.loader', ...options.attributes, }, diff --git a/packages/react-router/test/server/wrapSentryHandleRequest.test.ts b/packages/react-router/test/server/wrapSentryHandleRequest.test.ts index e76a7f6c1dae..293d5c0f5ea8 100644 --- a/packages/react-router/test/server/wrapSentryHandleRequest.test.ts +++ b/packages/react-router/test/server/wrapSentryHandleRequest.test.ts @@ -78,7 +78,7 @@ describe('wrapSentryHandleRequest', () => { expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({ [ATTR_HTTP_ROUTE]: '/some-path', [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.request-handler', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request-handler', }); expect(mockRpcMetadata.route).toBe('/some-path'); }); diff --git a/packages/react-router/test/server/wrapServerAction.test.ts b/packages/react-router/test/server/wrapServerAction.test.ts index 5b707eb33547..5eb92ef53b3b 100644 --- a/packages/react-router/test/server/wrapServerAction.test.ts +++ b/packages/react-router/test/server/wrapServerAction.test.ts @@ -30,7 +30,7 @@ describe('wrapServerAction', () => { { name: 'Executing Server Action', attributes: { - [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.action', + [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action', [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.action', }, }, @@ -60,7 +60,7 @@ describe('wrapServerAction', () => { { name: 'Custom Action', attributes: { - [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.action', + [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action', [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.action', 'sentry.custom': 'value', }, diff --git a/packages/react-router/test/server/wrapServerLoader.test.ts b/packages/react-router/test/server/wrapServerLoader.test.ts index 0838643ff7de..b375d9b4da51 100644 --- a/packages/react-router/test/server/wrapServerLoader.test.ts +++ b/packages/react-router/test/server/wrapServerLoader.test.ts @@ -30,7 +30,7 @@ describe('wrapServerLoader', () => { { name: 'Executing Server Loader', attributes: { - [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.loader', + [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader', [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.loader', }, }, @@ -60,7 +60,7 @@ describe('wrapServerLoader', () => { { name: 'Custom Loader', attributes: { - [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.loader', + [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader', [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.loader', 'sentry.custom': 'value', }, From ea8819147b438aeb80d8a2285736b6d71c992ff2 Mon Sep 17 00:00:00 2001 From: Onur Temizkan Date: Fri, 28 Nov 2025 14:49:43 +0000 Subject: [PATCH 2/3] Update dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts Co-authored-by: Lukas Stracke --- .../tests/performance/performance.server.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts index 80f858f25f2d..26f368797838 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts @@ -19,7 +19,7 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react_router.request-handler', + 'sentry.origin': 'auto.http.react_router.request_handler', 'sentry.source': 'route', }, op: 'http.server', From d728d60720edc25d0a90b60ac9a0bdc300cc5fc8 Mon Sep 17 00:00:00 2001 From: Onur Temizkan Date: Fri, 28 Nov 2025 14:55:29 +0000 Subject: [PATCH 3/3] Switch to underscores in `request-handler` as well --- .../tests/performance/performance.server.test.ts | 6 +++--- .../tests/performance/performance.server.test.ts | 8 ++++---- .../tests/performance/performance.server.test.ts | 8 ++++---- .../react-router/src/server/wrapSentryHandleRequest.ts | 2 +- .../test/server/wrapSentryHandleRequest.test.ts | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts index 26f368797838..5244ec499d33 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts @@ -23,7 +23,7 @@ test.describe('server - performance', () => { 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react_router.request-handler', + origin: 'auto.http.react_router.request_handler', }, }, spans: expect.any(Array), @@ -70,11 +70,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react_router.request-handler', + 'sentry.origin': 'auto.http.react_router.request_handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react_router.request-handler', + origin: 'auto.http.react_router.request_handler', }, }, spans: expect.any(Array), diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts index 8c2261c131c6..6058403bb81e 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts @@ -19,11 +19,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react_router.request-handler', + 'sentry.origin': 'auto.http.react_router.request_handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react_router.request-handler', + origin: 'auto.http.react_router.request_handler', }, }, spans: expect.any(Array), @@ -70,11 +70,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react_router.request-handler', + 'sentry.origin': 'auto.http.react_router.request_handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react_router.request-handler', + origin: 'auto.http.react_router.request_handler', }, }, spans: expect.any(Array), diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts index 0560252e6ded..bc7b44591f30 100644 --- a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts +++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts @@ -19,11 +19,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react_router.request-handler', + 'sentry.origin': 'auto.http.react_router.request_handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react_router.request-handler', + origin: 'auto.http.react_router.request_handler', }, }, spans: expect.any(Array), @@ -70,11 +70,11 @@ test.describe('server - performance', () => { trace_id: expect.any(String), data: { 'sentry.op': 'http.server', - 'sentry.origin': 'auto.http.react_router.request-handler', + 'sentry.origin': 'auto.http.react_router.request_handler', 'sentry.source': 'route', }, op: 'http.server', - origin: 'auto.http.react_router.request-handler', + origin: 'auto.http.react_router.request_handler', }, }, spans: expect.any(Array), diff --git a/packages/react-router/src/server/wrapSentryHandleRequest.ts b/packages/react-router/src/server/wrapSentryHandleRequest.ts index bd9071ffb8f1..2e788637988f 100644 --- a/packages/react-router/src/server/wrapSentryHandleRequest.ts +++ b/packages/react-router/src/server/wrapSentryHandleRequest.ts @@ -80,7 +80,7 @@ export function wrapSentryHandleRequest( rootSpan.setAttributes({ [ATTR_HTTP_ROUTE]: routeName, [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request-handler', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler', }); } diff --git a/packages/react-router/test/server/wrapSentryHandleRequest.test.ts b/packages/react-router/test/server/wrapSentryHandleRequest.test.ts index 293d5c0f5ea8..45b4ca1062df 100644 --- a/packages/react-router/test/server/wrapSentryHandleRequest.test.ts +++ b/packages/react-router/test/server/wrapSentryHandleRequest.test.ts @@ -78,7 +78,7 @@ describe('wrapSentryHandleRequest', () => { expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({ [ATTR_HTTP_ROUTE]: '/some-path', [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route', - [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request-handler', + [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler', }); expect(mockRpcMetadata.route).toBe('/some-path'); });