Skip to content

Commit 6435604

Browse files
committed
Use root wrapper after loader wrapper to prevent multiple loader spans.
1 parent 1846cef commit 6435604

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

packages/remix/src/utils/instrumentServer.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,10 @@ function makeWrappedCreateRequestHandler(
307307
fill(wrappedRoute.module, 'action', makeWrappedAction);
308308
}
309309

310+
if (wrappedRoute.module.loader) {
311+
fill(wrappedRoute.module, 'loader', makeWrappedLoader);
312+
}
313+
310314
// Entry module should have a loader function to provide `sentry-trace` and `baggage`
311315
// They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
312316
if (!wrappedRoute.parentId) {
@@ -317,10 +321,6 @@ function makeWrappedCreateRequestHandler(
317321
fill(wrappedRoute.module, 'loader', makeWrappedRootLoader);
318322
}
319323

320-
if (wrappedRoute.module.loader) {
321-
fill(wrappedRoute.module, 'loader', makeWrappedLoader);
322-
}
323-
324324
routes[id] = wrappedRoute;
325325
}
326326

0 commit comments

Comments
 (0)