revert and fix

Author: mydea

packages/node/src/integrations/tracing/vercelai/instrumentation.ts

@@ -211,47 +211,49 @@ export class SentryVercelAiInstrumentation extends InstrumentationBase {
     this._callbacks.forEach(callback => callback());
     this._callbacks = [];
 
-    const generatePatch = (originalMethod: (...args: MethodArgs) => unknown) => {
-      return (...args: MethodArgs) => {
-        const existingExperimentalTelemetry = args[0].experimental_telemetry || {};
-        const isEnabled = existingExperimentalTelemetry.isEnabled;
-
-        const client = getCurrentScope().getClient();
-        const integration = client?.getIntegrationByName<VercelAiIntegration>(INTEGRATION_NAME);
-        const integrationOptions = integration?.options;
-        const shouldRecordInputsAndOutputs = integration ? Boolean(client?.getOptions().sendDefaultPii) : false;
-
-        const { recordInputs, recordOutputs } = determineRecordingSettings(
-          integrationOptions,
-          existingExperimentalTelemetry,
-          isEnabled,
-          shouldRecordInputsAndOutputs,
-        );
-
-        args[0].experimental_telemetry = {
-          ...existingExperimentalTelemetry,
-          isEnabled: isEnabled !== undefined ? isEnabled : true,
-          recordInputs,
-          recordOutputs,
-        };
-
-        return handleCallbackErrors(
-          () => originalMethod.apply(this, args),
-          error => {
-            // This error bubbles up to unhandledrejection handler (if not handled before),
-            // where we do not know the active span anymore
-            // So to circumvent this, we set the active span on the error object
-            // which is picked up by the unhandledrejection handler
-            if (error && typeof error === 'object') {
-              addNonEnumerableProperty(error, '_sentry_active_span', getActiveSpan());
-            }
-          },
-          () => {},
-          result => {
-            checkResultForToolErrors(result);
-          },
-        );
-      };
+    const generatePatch = <T extends (...args: MethodArgs) => unknown>(originalMethod: T): T => {
+      return new Proxy(originalMethod, {
+        apply: (target, thisArg, args: MethodArgs) => {
+          const existingExperimentalTelemetry = args[0].experimental_telemetry || {};
+          const isEnabled = existingExperimentalTelemetry.isEnabled;
+
+          const client = getCurrentScope().getClient();
+          const integration = client?.getIntegrationByName<VercelAiIntegration>(INTEGRATION_NAME);
+          const integrationOptions = integration?.options;
+          const shouldRecordInputsAndOutputs = integration ? Boolean(client?.getOptions().sendDefaultPii) : false;
+
+          const { recordInputs, recordOutputs } = determineRecordingSettings(
+            integrationOptions,
+            existingExperimentalTelemetry,
+            isEnabled,
+            shouldRecordInputsAndOutputs,
+          );
+
+          args[0].experimental_telemetry = {
+            ...existingExperimentalTelemetry,
+            isEnabled: isEnabled !== undefined ? isEnabled : true,
+            recordInputs,
+            recordOutputs,
+          };
+
+          return handleCallbackErrors(
+            () => originalMethod.apply(this, args),
+            error => {
+              // This error bubbles up to unhandledrejection handler (if not handled before),
+              // where we do not know the active span anymore
+              // So to circumvent this, we set the active span on the error object
+              // which is picked up by the unhandledrejection handler
+              if (error && typeof error === 'object') {
+                addNonEnumerableProperty(error, '_sentry_active_span', getActiveSpan());
+              }
+            },
+            () => {},
+            result => {
+              checkResultForToolErrors(result);
+            },
+          );
+        },
+      });
     };
 
     // Is this an ESM module?

packages/remix/src/server/errors.ts

@@ -101,10 +101,11 @@ export function errorHandleDocumentRequestFunction(
   const { request, responseStatusCode, responseHeaders, context, loadContext } = requestContext;
 
   return handleCallbackErrors(
-    () => origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context, loadContext),
+    () => {
+      return origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context, loadContext);
+    },
     err => {
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      captureRemixServerException(err, 'HandleDocumentRequestFunction', request);
+      throw err;
     },
   );
 }