ref(react-router): Use @sentry/conventions#21496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mydea merged 1 commit into from
Jun 18, 2026
Merged

ref(react-router): Use @sentry/conventions#21496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-router/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@
"@opentelemetry/api": "^1.9.1",
"@opentelemetry/core": "^2.6.1",
"@opentelemetry/instrumentation": "^0.214.0",
"@opentelemetry/semantic-conventions": "^1.40.0",
"@sentry/browser": "10.58.0",
"@sentry/cli": "^2.58.6",
"@sentry/conventions": "^0.12.0",
"@sentry/core": "10.58.0",
"@sentry/node": "10.58.0",
"@sentry/react": "10.58.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-router/src/server/createServerInstrumentation.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { context, createContextKey } from '@opentelemetry/api';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
debug,
flushIfServerless,
Expand DownExpand Up@@ -199,7 +199,7 @@ export function createSentryServerInstrumentation(
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.middleware',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
'react_router.route.id': routeId,
[ATTR_HTTP_ROUTE]: routePattern,
[HTTP_ROUTE]: routePattern,
...(middlewareName && { 'react_router.middleware.name': middlewareName }),
'react_router.middleware.index': middlewareIndex,
},
Expand DownExpand Up@@ -258,7 +258,7 @@ function updateRootSpanWithRoute(method: string, pattern: string | undefined, ur
const transactionName = `${method} ${routeName}`;
updateSpanName(rootSpan, transactionName);
rootSpan.setAttributes({
[ATTR_HTTP_ROUTE]: routeName,
[HTTP_ROUTE]: routeName,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',
});

Expand Down
4 changes: 2 additions & 2 deletions packages/react-router/src/server/instrumentation/reactRouter.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import {
debug,
getActiveSpan,
Expand DownExpand Up@@ -113,7 +113,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase<Instrumentat
// TODO: try to set derived parameterized route from build here (args[0])
const spanData = spanToJSON(rootSpan);
// eslint-disable-next-line typescript/no-deprecated
const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;
const target = spanData.data[HTTP_TARGET] || url.pathname;
updateSpanName(rootSpan, `${request.method} ${target}`);
rootSpan.setAttributes({
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
Expand Down
10 changes: 5 additions & 5 deletions packages/react-router/src/server/integration/reactRouterServer.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
import { ReactRouterInstrumentation } from '../instrumentation/reactRouter';
Expand DownExpand Up@@ -45,7 +45,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
if (
event.type === 'transaction' &&
event.contexts?.trace?.data &&
event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'
event.contexts.trace.data[HTTP_ROUTE] === '*'
) {
const origin = event.contexts.trace.origin;
const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');
Expand All@@ -54,7 +54,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
// For legacy, only clean up if the name has been adjusted (not METHOD *)
if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
delete event.contexts.trace.data[HTTP_ROUTE];
}
}

Expand All@@ -64,7 +64,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
// Express generates bogus `*` routes for data loaders, which we want to remove here
// we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point
const attributes = span.attributes;
if (attributes?.[ATTR_HTTP_ROUTE] !== '*') {
if (attributes?.[HTTP_ROUTE] !== '*') {
return;
}

Expand All@@ -75,7 +75,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
// For legacy, only clean up if the name has been adjusted (not METHOD *)
if (isInstrumentationApiOrigin || !span.name?.endsWith(' *')) {
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
delete attributes[ATTR_HTTP_ROUTE];
delete attributes[HTTP_ROUTE];
}
},
};
Expand Down
6 changes: 3 additions & 3 deletions packages/react-router/src/server/wrapSentryHandleRequest.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
flushIfServerless,
getActiveSpan,
Expand DownExpand Up@@ -80,12 +80,12 @@ export function wrapSentryHandleRequest(
// Don't override origin when instrumentation API is used (preserve instrumentation_api origin)
if (isInstrumentationApiUsed()) {
rootSpan.setAttributes({
[ATTR_HTTP_ROUTE]: routeName,
[HTTP_ROUTE]: routeName,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
});
} else {
rootSpan.setAttributes({
[ATTR_HTTP_ROUTE]: routeName,
[HTTP_ROUTE]: routeName,
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
});
Expand Down
4 changes: 2 additions & 2 deletions packages/react-router/src/server/wrapServerAction.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
debug,
Expand DownExpand Up@@ -73,7 +73,7 @@ export function wrapServerAction<T>(
const spanData = spanToJSON(root);
if (spanData.origin === 'auto.http.otel.http') {
// eslint-disable-next-line typescript/no-deprecated
const target = spanData.data[SEMATTRS_HTTP_TARGET];
const target = spanData.data[HTTP_TARGET];

if (target) {
// We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down
4 changes: 2 additions & 2 deletions packages/react-router/src/server/wrapServerLoader.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
debug,
Expand DownExpand Up@@ -74,7 +74,7 @@ export function wrapServerLoader<T>(
const spanData = spanToJSON(root);
if (spanData.origin === 'auto.http.otel.http') {
// eslint-disable-next-line typescript/no-deprecated
const target = spanData.data[SEMATTRS_HTTP_TARGET];
const target = spanData.data[HTTP_TARGET];

if (target) {
// We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down
34 changes: 17 additions & 17 deletions packages/react-router/test/server/integration/reactRouterServer.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import type { Client, Event, EventType, StreamedSpanJSON } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ReactRouterInstrumentation } from '../../../src/server/instrumentation/reactRouter';
Expand DownExpand Up@@ -112,15 +112,15 @@ describe('reactRouterServerIntegration', () => {
transaction: 'GET /users/:id',
contexts: {
trace: {
data: { [ATTR_HTTP_ROUTE]: '/users/:id' },
data: { [HTTP_ROUTE]: '/users/:id' },
origin: 'auto.http.otel.http',
},
},
} as unknown as Event;

integration.processEvent!(event, hint, client);

expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('/users/:id');
});

it('deletes bogus "*" route when origin is instrumentation_api', () => {
Expand All@@ -130,15 +130,15 @@ describe('reactRouterServerIntegration', () => {
transaction: 'GET *',
contexts: {
trace: {
data: { [ATTR_HTTP_ROUTE]: '*' },
data: { [HTTP_ROUTE]: '*' },
origin: 'auto.http.otel.instrumentation_api',
},
},
} as unknown as Event;

integration.processEvent!(event, hint, client);

expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
});

it('deletes bogus "*" route when legacy origin and transaction name was renamed', () => {
Expand All@@ -148,15 +148,15 @@ describe('reactRouterServerIntegration', () => {
transaction: 'GET /api/users',
contexts: {
trace: {
data: { [ATTR_HTTP_ROUTE]: '*' },
data: { [HTTP_ROUTE]: '*' },
origin: 'auto.http.otel.http',
},
},
} as unknown as Event;

integration.processEvent!(event, hint, client);

expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
});

it('keeps "*" when legacy origin and transaction name still ends with " *"', () => {
Expand All@@ -166,15 +166,15 @@ describe('reactRouterServerIntegration', () => {
transaction: 'GET *',
contexts: {
trace: {
data: { [ATTR_HTTP_ROUTE]: '*' },
data: { [HTTP_ROUTE]: '*' },
origin: 'auto.http.otel.http',
},
},
} as unknown as Event;

integration.processEvent!(event, hint, client);

expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('*');
expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('*');
});
});

Expand All@@ -185,48 +185,48 @@ describe('reactRouterServerIntegration', () => {
const integration = reactRouterServerIntegration();
const span = {
name: 'GET /users/:id',
attributes: { [ATTR_HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
attributes: { [HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
} as unknown as StreamedSpanJSON;

integration.processSegmentSpan!(span, client);

expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
expect(span.attributes?.[HTTP_ROUTE]).toBe('/users/:id');
});

it('deletes bogus "*" route when origin is instrumentation_api', () => {
const integration = reactRouterServerIntegration();
const span = {
name: 'GET *',
attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
} as unknown as StreamedSpanJSON;

integration.processSegmentSpan!(span, client);

expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
});

it('deletes bogus "*" route when legacy origin and span name was renamed', () => {
const integration = reactRouterServerIntegration();
const span = {
name: 'GET /api/users',
attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
} as unknown as StreamedSpanJSON;

integration.processSegmentSpan!(span, client);

expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
});

it('keeps "*" when legacy origin and span name still ends with " *"', () => {
const integration = reactRouterServerIntegration();
const span = {
name: 'GET *',
attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
} as unknown as StreamedSpanJSON;

integration.processSegmentSpan!(span, client);

expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('*');
expect(span.attributes?.[HTTP_ROUTE]).toBe('*');
});
});
});
6 changes: 3 additions & 3 deletions packages/react-router/test/server/wrapSentryHandleRequest.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { PassThrough } from 'node:stream';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
flushIfServerless,
getActiveSpan,
Expand DownExpand Up@@ -72,7 +72,7 @@ describe('wrapSentryHandleRequest', () => {
await wrappedHandler(new Request('https://nacho.queso'), 200, new Headers(), routerContext, {} as any);

expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
[ATTR_HTTP_ROUTE]: '/some-path',
[HTTP_ROUTE]: '/some-path',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
});
Expand DownExpand Up@@ -191,7 +191,7 @@ describe('wrapSentryHandleRequest', () => {

// Should set route attributes without origin (to preserve instrumentation_api origin)
expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
[ATTR_HTTP_ROUTE]: '/some-path',
[HTTP_ROUTE]: '/some-path',
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
});
});
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ref(react-router): Use @sentry/conventions#21496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Jun 18, 2026
 Merged


ref(react-router): Use @sentry/conventions#21496
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
packages/react-router/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@
 "@opentelemetry/api": "^1.9.1",
 "@opentelemetry/core": "^2.6.1",
 "@opentelemetry/instrumentation": "^0.214.0",
 "@opentelemetry/semantic-conventions": "^1.40.0",
 "@sentry/browser": "10.58.0",
 "@sentry/cli": "^2.58.6",
 "@sentry/conventions": "^0.12.0",
 "@sentry/core": "10.58.0",
 "@sentry/node": "10.58.0",
 "@sentry/react": "10.58.0",
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/createServerInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { context, createContextKey } from '@opentelemetry/api';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 debug,
 flushIfServerless,
Expand DownExpand Up@@ -199,7 +199,7 @@ export function createSentryServerInstrumentation(
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.middleware',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
 'react_router.route.id': routeId,
 [ATTR_HTTP_ROUTE]: routePattern,
 [HTTP_ROUTE]: routePattern,
 ...(middlewareName && { 'react_router.middleware.name': middlewareName }),
 'react_router.middleware.index': middlewareIndex,
 },
Expand DownExpand Up@@ -258,7 +258,7 @@ function updateRootSpanWithRoute(method: string, pattern: string | undefined, ur
 const transactionName = `${method} ${routeName}`;
 updateSpanName(rootSpan, transactionName);
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',
 });

Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/instrumentation/reactRouter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import {
 debug,
 getActiveSpan,
Expand DownExpand Up@@ -113,7 +113,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase<Instrumentat
 // TODO: try to set derived parameterized route from build here (args[0])
 const spanData = spanToJSON(rootSpan);
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;
 const target = spanData.data[HTTP_TARGET] || url.pathname;
 updateSpanName(rootSpan, `${request.method} ${target}`);
 rootSpan.setAttributes({
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-router/src/server/integration/reactRouterServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
import { ReactRouterInstrumentation } from '../instrumentation/reactRouter';
Expand DownExpand Up@@ -45,7 +45,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 if (
 event.type === 'transaction' &&
 event.contexts?.trace?.data &&
 event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'
 event.contexts.trace.data[HTTP_ROUTE] === '*'
 ) {
 const origin = event.contexts.trace.origin;
 const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');
Expand All@@ -54,7 +54,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
 delete event.contexts.trace.data[HTTP_ROUTE];
 }
 }

Expand All@@ -64,7 +64,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // Express generates bogus `*` routes for data loaders, which we want to remove here
 // we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point
 const attributes = span.attributes;
 if (attributes?.[ATTR_HTTP_ROUTE] !== '*') {
 if (attributes?.[HTTP_ROUTE] !== '*') {
 return;
 }

Expand All@@ -75,7 +75,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !span.name?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete attributes[ATTR_HTTP_ROUTE];
 delete attributes[HTTP_ROUTE];
 }
 },
 };
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/wrapSentryHandleRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -80,12 +80,12 @@ export function wrapSentryHandleRequest(
 // Don't override origin when instrumentation API is used (preserve instrumentation_api origin)
 if (isInstrumentationApiUsed()) {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 } else {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerAction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -73,7 +73,7 @@ export function wrapServerAction<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerLoader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -74,7 +74,7 @@ export function wrapServerLoader<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

34 changes: 17 additions & 17 deletions
packages/react-router/test/server/integration/reactRouterServer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import type { Client, Event, EventType, StreamedSpanJSON } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ReactRouterInstrumentation } from '../../../src/server/instrumentation/reactRouter';
Expand DownExpand Up@@ -112,15 +112,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /users/:id',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '/users/:id' },
 data: { [HTTP_ROUTE]: '/users/:id' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
Expand All@@ -130,15 +130,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.instrumentation_api',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and transaction name was renamed', () => {
Expand All@@ -148,15 +148,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /api/users',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and transaction name still ends with " *"', () => {
Expand All@@ -166,15 +166,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('*');
 });
 });

Expand All@@ -185,48 +185,48 @@ describe('reactRouterServerIntegration', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /users/:id',
 attributes: { [ATTR_HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and span name was renamed', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /api/users',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and span name still ends with " *"', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('*');
 });
 });
});

6 changes: 3 additions & 3 deletions
packages/react-router/test/server/wrapSentryHandleRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { PassThrough } from 'node:stream';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -72,7 +72,7 @@ describe('wrapSentryHandleRequest', () => {
 await wrappedHandler(new Request('https://nacho.queso'), 200, new Headers(), routerContext, {} as any);

 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand DownExpand Up@@ -191,7 +191,7 @@ describe('wrapSentryHandleRequest', () => {

 // Should set route attributes without origin (to preserve instrumentation_api origin)
 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 });
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(react-router): Use @sentry/conventions#21496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Jun 18, 2026
 Merged


ref(react-router): Use @sentry/conventions#21496
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
packages/react-router/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@
 "@opentelemetry/api": "^1.9.1",
 "@opentelemetry/core": "^2.6.1",
 "@opentelemetry/instrumentation": "^0.214.0",
 "@opentelemetry/semantic-conventions": "^1.40.0",
 "@sentry/browser": "10.58.0",
 "@sentry/cli": "^2.58.6",
 "@sentry/conventions": "^0.12.0",
 "@sentry/core": "10.58.0",
 "@sentry/node": "10.58.0",
 "@sentry/react": "10.58.0",
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/createServerInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { context, createContextKey } from '@opentelemetry/api';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 debug,
 flushIfServerless,
Expand DownExpand Up@@ -199,7 +199,7 @@ export function createSentryServerInstrumentation(
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.middleware',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
 'react_router.route.id': routeId,
 [ATTR_HTTP_ROUTE]: routePattern,
 [HTTP_ROUTE]: routePattern,
 ...(middlewareName && { 'react_router.middleware.name': middlewareName }),
 'react_router.middleware.index': middlewareIndex,
 },
Expand DownExpand Up@@ -258,7 +258,7 @@ function updateRootSpanWithRoute(method: string, pattern: string | undefined, ur
 const transactionName = `${method} ${routeName}`;
 updateSpanName(rootSpan, transactionName);
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',
 });

Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/instrumentation/reactRouter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import {
 debug,
 getActiveSpan,
Expand DownExpand Up@@ -113,7 +113,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase<Instrumentat
 // TODO: try to set derived parameterized route from build here (args[0])
 const spanData = spanToJSON(rootSpan);
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;
 const target = spanData.data[HTTP_TARGET] || url.pathname;
 updateSpanName(rootSpan, `${request.method} ${target}`);
 rootSpan.setAttributes({
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-router/src/server/integration/reactRouterServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
import { ReactRouterInstrumentation } from '../instrumentation/reactRouter';
Expand DownExpand Up@@ -45,7 +45,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 if (
 event.type === 'transaction' &&
 event.contexts?.trace?.data &&
 event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'
 event.contexts.trace.data[HTTP_ROUTE] === '*'
 ) {
 const origin = event.contexts.trace.origin;
 const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');
Expand All@@ -54,7 +54,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
 delete event.contexts.trace.data[HTTP_ROUTE];
 }
 }

Expand All@@ -64,7 +64,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // Express generates bogus `*` routes for data loaders, which we want to remove here
 // we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point
 const attributes = span.attributes;
 if (attributes?.[ATTR_HTTP_ROUTE] !== '*') {
 if (attributes?.[HTTP_ROUTE] !== '*') {
 return;
 }

Expand All@@ -75,7 +75,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !span.name?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete attributes[ATTR_HTTP_ROUTE];
 delete attributes[HTTP_ROUTE];
 }
 },
 };
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/wrapSentryHandleRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -80,12 +80,12 @@ export function wrapSentryHandleRequest(
 // Don't override origin when instrumentation API is used (preserve instrumentation_api origin)
 if (isInstrumentationApiUsed()) {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 } else {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerAction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -73,7 +73,7 @@ export function wrapServerAction<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerLoader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -74,7 +74,7 @@ export function wrapServerLoader<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

34 changes: 17 additions & 17 deletions
packages/react-router/test/server/integration/reactRouterServer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import type { Client, Event, EventType, StreamedSpanJSON } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ReactRouterInstrumentation } from '../../../src/server/instrumentation/reactRouter';
Expand DownExpand Up@@ -112,15 +112,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /users/:id',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '/users/:id' },
 data: { [HTTP_ROUTE]: '/users/:id' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
Expand All@@ -130,15 +130,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.instrumentation_api',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and transaction name was renamed', () => {
Expand All@@ -148,15 +148,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /api/users',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and transaction name still ends with " *"', () => {
Expand All@@ -166,15 +166,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('*');
 });
 });

Expand All@@ -185,48 +185,48 @@ describe('reactRouterServerIntegration', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /users/:id',
 attributes: { [ATTR_HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and span name was renamed', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /api/users',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and span name still ends with " *"', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('*');
 });
 });
});

6 changes: 3 additions & 3 deletions
packages/react-router/test/server/wrapSentryHandleRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { PassThrough } from 'node:stream';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -72,7 +72,7 @@ describe('wrapSentryHandleRequest', () => {
 await wrappedHandler(new Request('https://nacho.queso'), 200, new Headers(), routerContext, {} as any);

 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand DownExpand Up@@ -191,7 +191,7 @@ describe('wrapSentryHandleRequest', () => {

 // Should set route attributes without origin (to preserve instrumentation_api origin)
 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 });
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(react-router): Use @sentry/conventions#21496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Jun 18, 2026
 Merged


ref(react-router): Use @sentry/conventions#21496
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
packages/react-router/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@
 "@opentelemetry/api": "^1.9.1",
 "@opentelemetry/core": "^2.6.1",
 "@opentelemetry/instrumentation": "^0.214.0",
 "@opentelemetry/semantic-conventions": "^1.40.0",
 "@sentry/browser": "10.58.0",
 "@sentry/cli": "^2.58.6",
 "@sentry/conventions": "^0.12.0",
 "@sentry/core": "10.58.0",
 "@sentry/node": "10.58.0",
 "@sentry/react": "10.58.0",
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/createServerInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { context, createContextKey } from '@opentelemetry/api';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 debug,
 flushIfServerless,
Expand DownExpand Up@@ -199,7 +199,7 @@ export function createSentryServerInstrumentation(
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.middleware',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
 'react_router.route.id': routeId,
 [ATTR_HTTP_ROUTE]: routePattern,
 [HTTP_ROUTE]: routePattern,
 ...(middlewareName && { 'react_router.middleware.name': middlewareName }),
 'react_router.middleware.index': middlewareIndex,
 },
Expand DownExpand Up@@ -258,7 +258,7 @@ function updateRootSpanWithRoute(method: string, pattern: string | undefined, ur
 const transactionName = `${method} ${routeName}`;
 updateSpanName(rootSpan, transactionName);
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',
 });

Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/instrumentation/reactRouter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import {
 debug,
 getActiveSpan,
Expand DownExpand Up@@ -113,7 +113,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase<Instrumentat
 // TODO: try to set derived parameterized route from build here (args[0])
 const spanData = spanToJSON(rootSpan);
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;
 const target = spanData.data[HTTP_TARGET] || url.pathname;
 updateSpanName(rootSpan, `${request.method} ${target}`);
 rootSpan.setAttributes({
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-router/src/server/integration/reactRouterServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
import { ReactRouterInstrumentation } from '../instrumentation/reactRouter';
Expand DownExpand Up@@ -45,7 +45,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 if (
 event.type === 'transaction' &&
 event.contexts?.trace?.data &&
 event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'
 event.contexts.trace.data[HTTP_ROUTE] === '*'
 ) {
 const origin = event.contexts.trace.origin;
 const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');
Expand All@@ -54,7 +54,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
 delete event.contexts.trace.data[HTTP_ROUTE];
 }
 }

Expand All@@ -64,7 +64,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // Express generates bogus `*` routes for data loaders, which we want to remove here
 // we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point
 const attributes = span.attributes;
 if (attributes?.[ATTR_HTTP_ROUTE] !== '*') {
 if (attributes?.[HTTP_ROUTE] !== '*') {
 return;
 }

Expand All@@ -75,7 +75,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !span.name?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete attributes[ATTR_HTTP_ROUTE];
 delete attributes[HTTP_ROUTE];
 }
 },
 };
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/wrapSentryHandleRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -80,12 +80,12 @@ export function wrapSentryHandleRequest(
 // Don't override origin when instrumentation API is used (preserve instrumentation_api origin)
 if (isInstrumentationApiUsed()) {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 } else {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerAction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -73,7 +73,7 @@ export function wrapServerAction<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerLoader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -74,7 +74,7 @@ export function wrapServerLoader<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

34 changes: 17 additions & 17 deletions
packages/react-router/test/server/integration/reactRouterServer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import type { Client, Event, EventType, StreamedSpanJSON } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ReactRouterInstrumentation } from '../../../src/server/instrumentation/reactRouter';
Expand DownExpand Up@@ -112,15 +112,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /users/:id',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '/users/:id' },
 data: { [HTTP_ROUTE]: '/users/:id' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
Expand All@@ -130,15 +130,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.instrumentation_api',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and transaction name was renamed', () => {
Expand All@@ -148,15 +148,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /api/users',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and transaction name still ends with " *"', () => {
Expand All@@ -166,15 +166,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('*');
 });
 });

Expand All@@ -185,48 +185,48 @@ describe('reactRouterServerIntegration', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /users/:id',
 attributes: { [ATTR_HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and span name was renamed', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /api/users',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and span name still ends with " *"', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('*');
 });
 });
});

6 changes: 3 additions & 3 deletions
packages/react-router/test/server/wrapSentryHandleRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { PassThrough } from 'node:stream';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -72,7 +72,7 @@ describe('wrapSentryHandleRequest', () => {
 await wrappedHandler(new Request('https://nacho.queso'), 200, new Headers(), routerContext, {} as any);

 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand DownExpand Up@@ -191,7 +191,7 @@ describe('wrapSentryHandleRequest', () => {

 // Should set route attributes without origin (to preserve instrumentation_api origin)
 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 });
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ref(react-router): Use @sentry/conventions#21496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Jun 18, 2026
 Merged


ref(react-router): Use @sentry/conventions#21496
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
packages/react-router/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@
 "@opentelemetry/api": "^1.9.1",
 "@opentelemetry/core": "^2.6.1",
 "@opentelemetry/instrumentation": "^0.214.0",
 "@opentelemetry/semantic-conventions": "^1.40.0",
 "@sentry/browser": "10.58.0",
 "@sentry/cli": "^2.58.6",
 "@sentry/conventions": "^0.12.0",
 "@sentry/core": "10.58.0",
 "@sentry/node": "10.58.0",
 "@sentry/react": "10.58.0",
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/createServerInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { context, createContextKey } from '@opentelemetry/api';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 debug,
 flushIfServerless,
Expand DownExpand Up@@ -199,7 +199,7 @@ export function createSentryServerInstrumentation(
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.middleware',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
 'react_router.route.id': routeId,
 [ATTR_HTTP_ROUTE]: routePattern,
 [HTTP_ROUTE]: routePattern,
 ...(middlewareName && { 'react_router.middleware.name': middlewareName }),
 'react_router.middleware.index': middlewareIndex,
 },
Expand DownExpand Up@@ -258,7 +258,7 @@ function updateRootSpanWithRoute(method: string, pattern: string | undefined, ur
 const transactionName = `${method} ${routeName}`;
 updateSpanName(rootSpan, transactionName);
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',
 });

Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/instrumentation/reactRouter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import {
 debug,
 getActiveSpan,
Expand DownExpand Up@@ -113,7 +113,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase<Instrumentat
 // TODO: try to set derived parameterized route from build here (args[0])
 const spanData = spanToJSON(rootSpan);
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;
 const target = spanData.data[HTTP_TARGET] || url.pathname;
 updateSpanName(rootSpan, `${request.method} ${target}`);
 rootSpan.setAttributes({
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-router/src/server/integration/reactRouterServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
import { ReactRouterInstrumentation } from '../instrumentation/reactRouter';
Expand DownExpand Up@@ -45,7 +45,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 if (
 event.type === 'transaction' &&
 event.contexts?.trace?.data &&
 event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'
 event.contexts.trace.data[HTTP_ROUTE] === '*'
 ) {
 const origin = event.contexts.trace.origin;
 const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');
Expand All@@ -54,7 +54,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
 delete event.contexts.trace.data[HTTP_ROUTE];
 }
 }

Expand All@@ -64,7 +64,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // Express generates bogus `*` routes for data loaders, which we want to remove here
 // we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point
 const attributes = span.attributes;
 if (attributes?.[ATTR_HTTP_ROUTE] !== '*') {
 if (attributes?.[HTTP_ROUTE] !== '*') {
 return;
 }

Expand All@@ -75,7 +75,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !span.name?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete attributes[ATTR_HTTP_ROUTE];
 delete attributes[HTTP_ROUTE];
 }
 },
 };
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/wrapSentryHandleRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -80,12 +80,12 @@ export function wrapSentryHandleRequest(
 // Don't override origin when instrumentation API is used (preserve instrumentation_api origin)
 if (isInstrumentationApiUsed()) {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 } else {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerAction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -73,7 +73,7 @@ export function wrapServerAction<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerLoader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -74,7 +74,7 @@ export function wrapServerLoader<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

34 changes: 17 additions & 17 deletions
packages/react-router/test/server/integration/reactRouterServer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import type { Client, Event, EventType, StreamedSpanJSON } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ReactRouterInstrumentation } from '../../../src/server/instrumentation/reactRouter';
Expand DownExpand Up@@ -112,15 +112,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /users/:id',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '/users/:id' },
 data: { [HTTP_ROUTE]: '/users/:id' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
Expand All@@ -130,15 +130,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.instrumentation_api',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and transaction name was renamed', () => {
Expand All@@ -148,15 +148,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /api/users',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and transaction name still ends with " *"', () => {
Expand All@@ -166,15 +166,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('*');
 });
 });

Expand All@@ -185,48 +185,48 @@ describe('reactRouterServerIntegration', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /users/:id',
 attributes: { [ATTR_HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and span name was renamed', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /api/users',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and span name still ends with " *"', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('*');
 });
 });
});

6 changes: 3 additions & 3 deletions
packages/react-router/test/server/wrapSentryHandleRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { PassThrough } from 'node:stream';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -72,7 +72,7 @@ describe('wrapSentryHandleRequest', () => {
 await wrappedHandler(new Request('https://nacho.queso'), 200, new Headers(), routerContext, {} as any);

 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand DownExpand Up@@ -191,7 +191,7 @@ describe('wrapSentryHandleRequest', () => {

 // Should set route attributes without origin (to preserve instrumentation_api origin)
 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 });
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(react-router): Use @sentry/conventions#21496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Jun 18, 2026
 Merged


ref(react-router): Use @sentry/conventions#21496
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
packages/react-router/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@
 "@opentelemetry/api": "^1.9.1",
 "@opentelemetry/core": "^2.6.1",
 "@opentelemetry/instrumentation": "^0.214.0",
 "@opentelemetry/semantic-conventions": "^1.40.0",
 "@sentry/browser": "10.58.0",
 "@sentry/cli": "^2.58.6",
 "@sentry/conventions": "^0.12.0",
 "@sentry/core": "10.58.0",
 "@sentry/node": "10.58.0",
 "@sentry/react": "10.58.0",
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/createServerInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { context, createContextKey } from '@opentelemetry/api';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 debug,
 flushIfServerless,
Expand DownExpand Up@@ -199,7 +199,7 @@ export function createSentryServerInstrumentation(
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.middleware',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
 'react_router.route.id': routeId,
 [ATTR_HTTP_ROUTE]: routePattern,
 [HTTP_ROUTE]: routePattern,
 ...(middlewareName && { 'react_router.middleware.name': middlewareName }),
 'react_router.middleware.index': middlewareIndex,
 },
Expand DownExpand Up@@ -258,7 +258,7 @@ function updateRootSpanWithRoute(method: string, pattern: string | undefined, ur
 const transactionName = `${method} ${routeName}`;
 updateSpanName(rootSpan, transactionName);
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',
 });

Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/instrumentation/reactRouter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import {
 debug,
 getActiveSpan,
Expand DownExpand Up@@ -113,7 +113,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase<Instrumentat
 // TODO: try to set derived parameterized route from build here (args[0])
 const spanData = spanToJSON(rootSpan);
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;
 const target = spanData.data[HTTP_TARGET] || url.pathname;
 updateSpanName(rootSpan, `${request.method} ${target}`);
 rootSpan.setAttributes({
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-router/src/server/integration/reactRouterServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
import { ReactRouterInstrumentation } from '../instrumentation/reactRouter';
Expand DownExpand Up@@ -45,7 +45,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 if (
 event.type === 'transaction' &&
 event.contexts?.trace?.data &&
 event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'
 event.contexts.trace.data[HTTP_ROUTE] === '*'
 ) {
 const origin = event.contexts.trace.origin;
 const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');
Expand All@@ -54,7 +54,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
 delete event.contexts.trace.data[HTTP_ROUTE];
 }
 }

Expand All@@ -64,7 +64,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // Express generates bogus `*` routes for data loaders, which we want to remove here
 // we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point
 const attributes = span.attributes;
 if (attributes?.[ATTR_HTTP_ROUTE] !== '*') {
 if (attributes?.[HTTP_ROUTE] !== '*') {
 return;
 }

Expand All@@ -75,7 +75,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !span.name?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete attributes[ATTR_HTTP_ROUTE];
 delete attributes[HTTP_ROUTE];
 }
 },
 };
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/wrapSentryHandleRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -80,12 +80,12 @@ export function wrapSentryHandleRequest(
 // Don't override origin when instrumentation API is used (preserve instrumentation_api origin)
 if (isInstrumentationApiUsed()) {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 } else {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerAction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -73,7 +73,7 @@ export function wrapServerAction<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerLoader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -74,7 +74,7 @@ export function wrapServerLoader<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

34 changes: 17 additions & 17 deletions
packages/react-router/test/server/integration/reactRouterServer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import type { Client, Event, EventType, StreamedSpanJSON } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ReactRouterInstrumentation } from '../../../src/server/instrumentation/reactRouter';
Expand DownExpand Up@@ -112,15 +112,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /users/:id',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '/users/:id' },
 data: { [HTTP_ROUTE]: '/users/:id' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
Expand All@@ -130,15 +130,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.instrumentation_api',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and transaction name was renamed', () => {
Expand All@@ -148,15 +148,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /api/users',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and transaction name still ends with " *"', () => {
Expand All@@ -166,15 +166,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('*');
 });
 });

Expand All@@ -185,48 +185,48 @@ describe('reactRouterServerIntegration', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /users/:id',
 attributes: { [ATTR_HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and span name was renamed', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /api/users',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and span name still ends with " *"', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('*');
 });
 });
});

6 changes: 3 additions & 3 deletions
packages/react-router/test/server/wrapSentryHandleRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { PassThrough } from 'node:stream';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -72,7 +72,7 @@ describe('wrapSentryHandleRequest', () => {
 await wrappedHandler(new Request('https://nacho.queso'), 200, new Headers(), routerContext, {} as any);

 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand DownExpand Up@@ -191,7 +191,7 @@ describe('wrapSentryHandleRequest', () => {

 // Should set route attributes without origin (to preserve instrumentation_api origin)
 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 });
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref(react-router): Use @sentry/conventions#21496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Jun 18, 2026
 Merged


ref(react-router): Use @sentry/conventions#21496
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
packages/react-router/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@
 "@opentelemetry/api": "^1.9.1",
 "@opentelemetry/core": "^2.6.1",
 "@opentelemetry/instrumentation": "^0.214.0",
 "@opentelemetry/semantic-conventions": "^1.40.0",
 "@sentry/browser": "10.58.0",
 "@sentry/cli": "^2.58.6",
 "@sentry/conventions": "^0.12.0",
 "@sentry/core": "10.58.0",
 "@sentry/node": "10.58.0",
 "@sentry/react": "10.58.0",
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/createServerInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { context, createContextKey } from '@opentelemetry/api';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 debug,
 flushIfServerless,
Expand DownExpand Up@@ -199,7 +199,7 @@ export function createSentryServerInstrumentation(
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.middleware',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
 'react_router.route.id': routeId,
 [ATTR_HTTP_ROUTE]: routePattern,
 [HTTP_ROUTE]: routePattern,
 ...(middlewareName && { 'react_router.middleware.name': middlewareName }),
 'react_router.middleware.index': middlewareIndex,
 },
Expand DownExpand Up@@ -258,7 +258,7 @@ function updateRootSpanWithRoute(method: string, pattern: string | undefined, ur
 const transactionName = `${method} ${routeName}`;
 updateSpanName(rootSpan, transactionName);
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',
 });

Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/instrumentation/reactRouter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import {
 debug,
 getActiveSpan,
Expand DownExpand Up@@ -113,7 +113,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase<Instrumentat
 // TODO: try to set derived parameterized route from build here (args[0])
 const spanData = spanToJSON(rootSpan);
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;
 const target = spanData.data[HTTP_TARGET] || url.pathname;
 updateSpanName(rootSpan, `${request.method} ${target}`);
 rootSpan.setAttributes({
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-router/src/server/integration/reactRouterServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
import { ReactRouterInstrumentation } from '../instrumentation/reactRouter';
Expand DownExpand Up@@ -45,7 +45,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 if (
 event.type === 'transaction' &&
 event.contexts?.trace?.data &&
 event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'
 event.contexts.trace.data[HTTP_ROUTE] === '*'
 ) {
 const origin = event.contexts.trace.origin;
 const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');
Expand All@@ -54,7 +54,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
 delete event.contexts.trace.data[HTTP_ROUTE];
 }
 }

Expand All@@ -64,7 +64,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // Express generates bogus `*` routes for data loaders, which we want to remove here
 // we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point
 const attributes = span.attributes;
 if (attributes?.[ATTR_HTTP_ROUTE] !== '*') {
 if (attributes?.[HTTP_ROUTE] !== '*') {
 return;
 }

Expand All@@ -75,7 +75,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !span.name?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete attributes[ATTR_HTTP_ROUTE];
 delete attributes[HTTP_ROUTE];
 }
 },
 };
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/wrapSentryHandleRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -80,12 +80,12 @@ export function wrapSentryHandleRequest(
 // Don't override origin when instrumentation API is used (preserve instrumentation_api origin)
 if (isInstrumentationApiUsed()) {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 } else {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerAction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -73,7 +73,7 @@ export function wrapServerAction<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerLoader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -74,7 +74,7 @@ export function wrapServerLoader<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

34 changes: 17 additions & 17 deletions
packages/react-router/test/server/integration/reactRouterServer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import type { Client, Event, EventType, StreamedSpanJSON } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ReactRouterInstrumentation } from '../../../src/server/instrumentation/reactRouter';
Expand DownExpand Up@@ -112,15 +112,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /users/:id',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '/users/:id' },
 data: { [HTTP_ROUTE]: '/users/:id' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
Expand All@@ -130,15 +130,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.instrumentation_api',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and transaction name was renamed', () => {
Expand All@@ -148,15 +148,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /api/users',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and transaction name still ends with " *"', () => {
Expand All@@ -166,15 +166,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('*');
 });
 });

Expand All@@ -185,48 +185,48 @@ describe('reactRouterServerIntegration', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /users/:id',
 attributes: { [ATTR_HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and span name was renamed', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /api/users',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and span name still ends with " *"', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('*');
 });
 });
});

6 changes: 3 additions & 3 deletions
packages/react-router/test/server/wrapSentryHandleRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { PassThrough } from 'node:stream';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -72,7 +72,7 @@ describe('wrapSentryHandleRequest', () => {
 await wrappedHandler(new Request('https://nacho.queso'), 200, new Headers(), routerContext, {} as any);

 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand DownExpand Up@@ -191,7 +191,7 @@ describe('wrapSentryHandleRequest', () => {

 // Should set route attributes without origin (to preserve instrumentation_api origin)
 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 });
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ref(react-router): Use @sentry/conventions#21496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 1 commit into

from

Jun 18, 2026
 Merged


ref(react-router): Use @sentry/conventions#21496
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
packages/react-router/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,9 +48,9 @@
 "@opentelemetry/api": "^1.9.1",
 "@opentelemetry/core": "^2.6.1",
 "@opentelemetry/instrumentation": "^0.214.0",
 "@opentelemetry/semantic-conventions": "^1.40.0",
 "@sentry/browser": "10.58.0",
 "@sentry/cli": "^2.58.6",
 "@sentry/conventions": "^0.12.0",
 "@sentry/core": "10.58.0",
 "@sentry/node": "10.58.0",
 "@sentry/react": "10.58.0",
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/createServerInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { context, createContextKey } from '@opentelemetry/api';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 debug,
 flushIfServerless,
Expand DownExpand Up@@ -199,7 +199,7 @@ export function createSentryServerInstrumentation(
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.middleware',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
 'react_router.route.id': routeId,
 [ATTR_HTTP_ROUTE]: routePattern,
 [HTTP_ROUTE]: routePattern,
 ...(middlewareName && { 'react_router.middleware.name': middlewareName }),
 'react_router.middleware.index': middlewareIndex,
 },
Expand DownExpand Up@@ -258,7 +258,7 @@ function updateRootSpanWithRoute(method: string, pattern: string | undefined, ur
 const transactionName = `${method} ${routeName}`;
 updateSpanName(rootSpan, transactionName);
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',
 });

Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/instrumentation/reactRouter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import {
 debug,
 getActiveSpan,
Expand DownExpand Up@@ -113,7 +113,7 @@ export class ReactRouterInstrumentation extends InstrumentationBase<Instrumentat
 // TODO: try to set derived parameterized route from build here (args[0])
 const spanData = spanToJSON(rootSpan);
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;
 const target = spanData.data[HTTP_TARGET] || url.pathname;
 updateSpanName(rootSpan, `${request.method} ${target}`);
 rootSpan.setAttributes({
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-router/src/server/integration/reactRouterServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
import { ReactRouterInstrumentation } from '../instrumentation/reactRouter';
Expand DownExpand Up@@ -45,7 +45,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 if (
 event.type === 'transaction' &&
 event.contexts?.trace?.data &&
 event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'
 event.contexts.trace.data[HTTP_ROUTE] === '*'
 ) {
 const origin = event.contexts.trace.origin;
 const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');
Expand All@@ -54,7 +54,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
 delete event.contexts.trace.data[HTTP_ROUTE];
 }
 }

Expand All@@ -64,7 +64,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // Express generates bogus `*` routes for data loaders, which we want to remove here
 // we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point
 const attributes = span.attributes;
 if (attributes?.[ATTR_HTTP_ROUTE] !== '*') {
 if (attributes?.[HTTP_ROUTE] !== '*') {
 return;
 }

Expand All@@ -75,7 +75,7 @@ export const reactRouterServerIntegration = defineIntegration(() => {
 // For legacy, only clean up if the name has been adjusted (not METHOD *)
 if (isInstrumentationApiOrigin || !span.name?.endsWith(' *')) {
 // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
 delete attributes[ATTR_HTTP_ROUTE];
 delete attributes[HTTP_ROUTE];
 }
 },
 };
Expand Down

6 changes: 3 additions & 3 deletions
packages/react-router/src/server/wrapSentryHandleRequest.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -80,12 +80,12 @@ export function wrapSentryHandleRequest(
 // Don't override origin when instrumentation API is used (preserve instrumentation_api origin)
 if (isInstrumentationApiUsed()) {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 } else {
 rootSpan.setAttributes({
 [ATTR_HTTP_ROUTE]: routeName,
 [HTTP_ROUTE]: routeName,
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerAction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -73,7 +73,7 @@ export function wrapServerAction<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

4 changes: 2 additions & 2 deletions
packages/react-router/src/server/wrapServerLoader.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
import { HTTP_TARGET } from '@sentry/conventions/attributes';
import type { SpanAttributes } from '@sentry/core';
import {
 debug,
Expand DownExpand Up@@ -74,7 +74,7 @@ export function wrapServerLoader<T>(
 const spanData = spanToJSON(root);
 if (spanData.origin === 'auto.http.otel.http') {
 // eslint-disable-next-line typescript/no-deprecated
 const target = spanData.data[SEMATTRS_HTTP_TARGET];
 const target = spanData.data[HTTP_TARGET];

 if (target) {
 // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route
Expand Down

34 changes: 17 additions & 17 deletions
packages/react-router/test/server/integration/reactRouterServer.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import type { Client, Event, EventType, StreamedSpanJSON } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { ReactRouterInstrumentation } from '../../../src/server/instrumentation/reactRouter';
Expand DownExpand Up@@ -112,15 +112,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /users/:id',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '/users/:id' },
 data: { [HTTP_ROUTE]: '/users/:id' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
Expand All@@ -130,15 +130,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.instrumentation_api',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and transaction name was renamed', () => {
Expand All@@ -148,15 +148,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET /api/users',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and transaction name still ends with " *"', () => {
Expand All@@ -166,15 +166,15 @@ describe('reactRouterServerIntegration', () => {
 transaction: 'GET *',
 contexts: {
 trace: {
 data: { [ATTR_HTTP_ROUTE]: '*' },
 data: { [HTTP_ROUTE]: '*' },
 origin: 'auto.http.otel.http',
 },
 },
 } as unknown as Event;

 integration.processEvent!(event, hint, client);

 expect(event.contexts?.trace?.data?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(event.contexts?.trace?.data?.[HTTP_ROUTE]).toBe('*');
 });
 });

Expand All@@ -185,48 +185,48 @@ describe('reactRouterServerIntegration', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /users/:id',
 attributes: { [ATTR_HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '/users/:id', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('/users/:id');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('/users/:id');
 });

 it('deletes bogus "*" route when origin is instrumentation_api', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.instrumentation_api' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('deletes bogus "*" route when legacy origin and span name was renamed', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET /api/users',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBeUndefined();
 expect(span.attributes?.[HTTP_ROUTE]).toBeUndefined();
 });

 it('keeps "*" when legacy origin and span name still ends with " *"', () => {
 const integration = reactRouterServerIntegration();
 const span = {
 name: 'GET *',
 attributes: { [ATTR_HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 attributes: { [HTTP_ROUTE]: '*', 'sentry.origin': 'auto.http.otel.http' },
 } as unknown as StreamedSpanJSON;

 integration.processSegmentSpan!(span, client);

 expect(span.attributes?.[ATTR_HTTP_ROUTE]).toBe('*');
 expect(span.attributes?.[HTTP_ROUTE]).toBe('*');
 });
 });
});

6 changes: 3 additions & 3 deletions
packages/react-router/test/server/wrapSentryHandleRequest.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { PassThrough } from 'node:stream';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { HTTP_ROUTE } from '@sentry/conventions/attributes';
import {
 flushIfServerless,
 getActiveSpan,
Expand DownExpand Up@@ -72,7 +72,7 @@ describe('wrapSentryHandleRequest', () => {
 await wrappedHandler(new Request('https://nacho.queso'), 200, new Headers(), routerContext, {} as any);

 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
 });
Expand DownExpand Up@@ -191,7 +191,7 @@ describe('wrapSentryHandleRequest', () => {

 // Should set route attributes without origin (to preserve instrumentation_api origin)
 expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
 [ATTR_HTTP_ROUTE]: '/some-path',
 [HTTP_ROUTE]: '/some-path',
 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
 });
 });
Expand Down
Loading