From 77db35bf981b628f37c3897ae03c6c999465a2a6 Mon Sep 17 00:00:00 2001
From: Janeene Beeforth <dawnmist@users.noreply.github.com>
Date: Thu, 1 Jun 2023 20:20:42 +1000
Subject: [PATCH] Pass loadContext through wrapped document request function

Fixes issue #8265.
---
 packages/remix/src/utils/instrumentServer.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/remix/src/utils/instrumentServer.ts b/packages/remix/src/utils/instrumentServer.ts
index 96acde1db2aa..dccef4c1ddd5 100644
--- a/packages/remix/src/utils/instrumentServer.ts
+++ b/packages/remix/src/utils/instrumentServer.ts
@@ -113,6 +113,7 @@ function makeWrappedDocumentRequestFunction(
     responseStatusCode: number,
     responseHeaders: Headers,
     context: Record<symbol, unknown>,
+    loadContext: Record<string, unknown>,
   ): Promise<Response> {
     let res: Response;
 
@@ -120,7 +121,7 @@ function makeWrappedDocumentRequestFunction(
     const currentScope = getCurrentHub().getScope();
 
     if (!currentScope) {
-      return origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context);
+      return origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context, loadContext);
     }
 
     try {
@@ -133,7 +134,7 @@ function makeWrappedDocumentRequestFunction(
         },
       });
 
-      res = await origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context);
+      res = await origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context, loadContext);
 
       span?.finish();
     } catch (err) {