create domain for datafunction

Author: AbhiPrasad

packages/remix/src/utils/instrumentServer.ts

@@ -128,38 +128,41 @@ function makeWrappedDocumentRequestFunction(
 
 function makeWrappedDataFunction(origFn: DataFunction, id: string, name: 'action' | 'loader'): DataFunction {
   return async function (this: unknown, args: DataFunctionArgs): Promise<Response | AppData> {
-    let res: Response | AppData;
-    const activeTransaction = getActiveTransaction();
-    const currentScope = getCurrentHub().getScope();
-
-    if (!activeTransaction || !currentScope) {
-      return origFn.call(this, args);
-    }
-
-    try {
-      const span = activeTransaction.startChild({
-        op: `remix.server.${name}`,
-        description: id,
-        tags: {
-          name,
-        },
-      });
+    const local = domain.create();
+    return local.bind(async () => {
+      let res: Response | AppData;
+      const activeTransaction = getActiveTransaction();
+      const currentScope = getCurrentHub().getScope();
 
-      if (span) {
-        // Assign data function to hub to be able to see `db` transactions (if any) as children.
-        currentScope.setSpan(span);
+      if (!activeTransaction || !currentScope) {
+        return origFn.call(this, args);
       }
 
-      res = await origFn.call(this, args);
-
-      currentScope.setSpan(activeTransaction);
-      span.finish();
-    } catch (err) {
-      captureRemixServerException(err, name);
-      throw err;
-    }
+      try {
+        const span = activeTransaction.startChild({
+          op: `remix.server.${name}`,
+          description: id,
+          tags: {
+            name,
+          },
+        });
+
+        if (span) {
+          // Assign data function to hub to be able to see `db` transactions (if any) as children.
+          currentScope.setSpan(span);
+        }
+
+        res = await origFn.call(this, args);
+
+        currentScope.setSpan(activeTransaction);
+        span.finish();
+      } catch (err) {
+        captureRemixServerException(err, name);
+        throw err;
+      }
 
-    return res;
+      return res;
+    });
   };
 }
 

packages/remix/test/integration/app/routes/scope-bleed/$id.tsx

@@ -5,7 +5,7 @@ import * as Sentry from '@sentry/remix';
 export const loader: LoaderFunction = async ({ params: { id } }) => {
   // Set delay to simulate requests at the same time
   const randomNum = Math.floor(Math.random() * 15) + 1;
-  await new Promise(resolve => setTimeout(resolve, 4000 - (parseInt(id || '', 10) * 1000 - randomNum)));
+  await new Promise(resolve => setTimeout(resolve, 3000 - (parseInt(id || '', 10) * 1000 - randomNum)));
   Sentry.setTag(`tag${id}`, id);
   return json({ test: 'test' });
 };