Use root wrapper after loader wrapper to prevent multiple loader …

…spans.
getsentry · Aug 3, 2022 · 019d791 · 019d791
1 parent c5d2c95
commit 019d791
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/remix/src/utils/instrumentServer.ts b/packages/remix/src/utils/instrumentServer.ts
@@ -381,6 +381,10 @@ function makeWrappedCreateRequestHandler(
         fill(wrappedRoute.module, 'action', makeWrappedAction);
       }
 
+      if (wrappedRoute.module.loader) {
+        fill(wrappedRoute.module, 'loader', makeWrappedLoader);
+      }
+
       // Entry module should have a loader function to provide `sentry-trace` and `baggage`
       // They will be available for the root `meta` function as `data.sentryTrace` and `data.sentryBaggage`
       if (!wrappedRoute.parentId) {
@@ -391,10 +395,6 @@ function makeWrappedCreateRequestHandler(
         fill(wrappedRoute.module, 'loader', makeWrappedRootLoader);
       }
 
-      if (wrappedRoute.module.loader) {
-        fill(wrappedRoute.module, 'loader', makeWrappedLoader);
-      }
-
       routes[id] = wrappedRoute;
     }