Commit 75f0e20
feat(react-router): Add support for React Router instrumentation API (#18580)
Adds support for React Router's `unstable_instrumentations` API for
automatic performance monitoring.
Resolves: #18127
Resolves: #18121
Ref: remix-run/react-router#13749
Ref: remix-run/react-router#14412
React Router 7.9.5 introduced the [`unstable_instrumentations`
API](https://reactrouter.com/how-to/instrumentation), which provides
hooks for instrumenting request handlers, loaders, actions, middleware,
and lazy routes. This enables automatic span creation without requiring
manual wrapper functions.
### Server-side
Added `createSentryServerInstrumentation()`:
- `handler.request` - Creates root HTTP server span with parameterized
route names
- `route.loader` - Automatic loader span creation
- `route.action` - Automatic action span creation
- `route.middleware` - Automatic middleware span creation
- `route.lazy` - Lazy route loading spans
```typescript
// entry.server.tsx
import * as Sentry from '@sentry/react-router';
export default Sentry.createSentryHandleRequest({ /* ... */ });
export const handleError = Sentry.createSentryHandleError();
export const unstable_instrumentations = [Sentry.createSentryServerInstrumentation()];
```
### Client-side
Added client instrumentation via `reactRouterTracingIntegration({
useInstrumentationAPI: true })`:
- `router.navigate` - Navigation transaction creation
- `router.fetch` - Fetcher span creation
- `route.loader/action/middleware/lazy` - Client-side route handler
spans
```typescript
// entry.client.tsx
const tracing = Sentry.reactRouterTracingIntegration({ useInstrumentationAPI: true });
Sentry.init({
integrations: [tracing],
});
<HydratedRouter unstable_instrumentations={[tracing.clientInstrumentation]} />
```
### Backward compatibility
When the instrumentation API is used:
- `wrapServerLoader` and `wrapServerAction` skip creating spans and emit
a warning in debug mode
- Legacy navigation patching in `instrumentHydratedRouter` checks if
instrumentation API handled it
- Server-side OTEL instrumentation for loaders/actions is skipped
### Also:
- Created `serverGlobals.ts` to isolate flag handling (avoids pulling
OpenTelemetry deps in Cloudflare builds)
- Updated `wrapSentryHandleRequest` to explicitly set parameterized
transaction names (improves Hydrogen parameterization)
- Added E2E test application `react-router-7-framework-instrumentation`
### Notes
- Client-side limitation: As of React Router 7.x, HydratedRouter does
not invoke client instrumentation hooks in Framework Mode. Client-side
navigation is handled by existing instrumentHydratedRouter(). The client
instrumentation is prepared for when React Router adds support. See
remix-run/react-router#13749.
- Lazy routes limitation: In Framework Mode, `route.lazy` hooks are not
triggered because the bundler handles code-splitting.
_Needs docs PR_
---------
Co-authored-by: Charly Gomez <charly.gomez@sentry.io>1 parent f915139 commit 75f0e20
59 files changed
Lines changed: 3971 additions & 42 deletions
File tree
- dev-packages/e2e-tests/test-applications
- hydrogen-react-router-7/tests
- react-router-7-framework-instrumentation
- app
- routes
- performance
- tests
- errors
- performance
- packages/react-router
- src
- client
- common
- server
- instrumentation
- integration
- test
- client
- common
- server
- instrumentation
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/tests/server-transactions.test.ts
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
| 17 | + | |
17 | 18 | | |
18 | 19 | | |
19 | 20 | | |
| |||
Lines changed: 32 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 33 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
Lines changed: 22 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
Lines changed: 69 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
Lines changed: 19 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
Lines changed: 10 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
0 commit comments