ref(remix): Avoid unnecessary error wrapping HandleDocumentRequestFunction

packages/remix/src/server/errors.ts

@@ -1,11 +1,4 @@
-import type {
-  ActionFunction,
-  ActionFunctionArgs,
-  EntryContext,
-  HandleDocumentRequestFunction,
-  LoaderFunction,
-  LoaderFunctionArgs,
-} from '@remix-run/node';
+import type { ActionFunction, ActionFunctionArgs, LoaderFunction, LoaderFunctionArgs } from '@remix-run/node';
 import { isRouteErrorResponse } from '@remix-run/router';
 import type { RequestEventData, Span } from '@sentry/core';
 import {
@@ -79,37 +72,6 @@ export async function captureRemixServerException(err: unknown, name: string, re
   });
 }
 
-/**
- * Wraps the original `HandleDocumentRequestFunction` with error handling.
- *
- * @param origDocumentRequestFunction The original `HandleDocumentRequestFunction`.
- * @param requestContext The request context.
- *
- * @returns The wrapped `HandleDocumentRequestFunction`.
- */
-export function errorHandleDocumentRequestFunction(
-  this: unknown,
-  origDocumentRequestFunction: HandleDocumentRequestFunction,
-  requestContext: {
-    request: Request;
-    responseStatusCode: number;
-    responseHeaders: Headers;
-    context: EntryContext;
-    loadContext?: Record<string, unknown>;
-  },
-): HandleDocumentRequestFunction {
-  const { request, responseStatusCode, responseHeaders, context, loadContext } = requestContext;
-
-  return handleCallbackErrors(
-    () => {
-      return origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context, loadContext);
-    },
-    err => {
-      throw err;
-    },
-  );
-}
-
 /**
  * Wraps the original `DataFunction` with error handling.
  * This function also stores the form data keys if the action is being called.

packages/remix/src/server/instrumentServer.ts

@@ -6,7 +6,6 @@ import type {
   ActionFunctionArgs,
   AppLoadContext,
   CreateRequestHandlerFunction,
-  EntryContext,
   HandleDocumentRequestFunction,
   LoaderFunction,
   LoaderFunctionArgs,
@@ -39,7 +38,7 @@ import {
 import { DEBUG_BUILD } from '../utils/debug-build';
 import { createRoutes, getTransactionName } from '../utils/utils';
 import { extractData, isResponse, json } from '../utils/vendor/response';
-import { captureRemixServerException, errorHandleDataFunction, errorHandleDocumentRequestFunction } from './errors';
+import { captureRemixServerException, errorHandleDataFunction } from './errors';
 
 type AppData = unknown;
 type RemixRequest = Parameters<RequestHandler>[0];
@@ -119,22 +118,7 @@ function getTraceAndBaggage(): {
 
 function makeWrappedDocumentRequestFunction(instrumentTracing?: boolean) {
   return function (origDocumentRequestFunction: HandleDocumentRequestFunction): HandleDocumentRequestFunction {
-    return async function (
-      this: unknown,
-      request: Request,
-      responseStatusCode: number,
-      responseHeaders: Headers,
-      context: EntryContext,
-      loadContext?: Record<string, unknown>,
-    ): Promise<Response> {
-      const documentRequestContext = {
-        request,
-        responseStatusCode,
-        responseHeaders,
-        context,
-        loadContext,
-      };
-
+    return async function (this: unknown, request: Request, ...args: unknown[]): Promise<Response> {
       if (instrumentTracing) {
         const activeSpan = getActiveSpan();
         const rootSpan = activeSpan && getRootSpan(activeSpan);
@@ -155,11 +139,11 @@ function makeWrappedDocumentRequestFunction(instrumentTracing?: boolean) {
             },
           },
           () => {
-            return errorHandleDocumentRequestFunction.call(this, origDocumentRequestFunction, documentRequestContext);
+            return origDocumentRequestFunction.call(this, request, ...args);
           },
         );
       } else {
-        return errorHandleDocumentRequestFunction.call(this, origDocumentRequestFunction, documentRequestContext);
+        return origDocumentRequestFunction.call(this, request, ...args);
       }
     };
   };