fix(hint): Missing original exception in beforeSend for events from react native error handler (#2706)

Author: krystofwoldrich

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Missing `originalException` in `beforeSend` for events from react native error handler ([#2706](https://github.com/getsentry/sentry-react-native/pull/2706))
+
 ### Dependencies
 
 - Bump Cocoa SDK from v7.31.3 to v7.31.4 ([#2699](https://github.com/getsentry/sentry-react-native/pull/2699))

src/js/integrations/reactnativeerrorhandlers.ts

@@ -1,5 +1,5 @@
 import { getCurrentHub } from '@sentry/core';
-import { Integration, SeverityLevel } from '@sentry/types';
+import { EventHint, Integration, SeverityLevel } from '@sentry/types';
 import { addExceptionMechanism, logger } from '@sentry/utils';
 
 import { ReactNativeClient } from '../client';
@@ -200,10 +200,11 @@ export class ReactNativeErrorHandlers implements Integration {
 
         const options = client.getOptions();
 
-        const event = await client.eventFromException(error, {
+        const hint: EventHint = {
           originalException: error,
           attachments: scope?.getAttachments(),
-        });
+        };
+        const event = await client.eventFromException(error, hint);
 
         if (isFatal) {
           event.level = 'fatal' as SeverityLevel;
@@ -214,7 +215,7 @@ export class ReactNativeErrorHandlers implements Integration {
           });
         }
 
-        currentHub.captureEvent(event);
+        currentHub.captureEvent(event, hint);
 
         if (!__DEV__) {
           void client.flush(options.shutdownTimeout || 2000).then(() => {

test/integrations/reactnativeerrorhandlers.test.ts

@@ -59,62 +59,58 @@ afterEach(() => {
 
 describe('ReactNativeErrorHandlers', () => {
   describe('onError', () => {
-    test('Sets handled:false on a fatal error', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-empty-function
-      let callback: (error: Error, isFatal: boolean) => Promise<void> = () =>
-        Promise.resolve();
+    let errorHandlerCallback: (error: Error, isFatal: boolean) => Promise<void>;
+
+    beforeEach(() => {
+      errorHandlerCallback = () => Promise.resolve();
 
       ErrorUtils.setGlobalHandler = jest.fn((_callback) => {
-        callback = _callback as typeof callback;
+        errorHandlerCallback = _callback as typeof errorHandlerCallback;
       });
 
       const integration = new ReactNativeErrorHandlers();
 
       integration.setupOnce();
 
-      expect(ErrorUtils.setGlobalHandler).toHaveBeenCalledWith(callback);
+      expect(ErrorUtils.setGlobalHandler).toHaveBeenCalledWith(errorHandlerCallback);
+    });
 
-      await callback(new Error('Test Error'), true);
+    test('Sets handled:false on a fatal error', async () => {
+      await errorHandlerCallback(new Error('Test Error'), true);
 
-      const hub = getCurrentHub();
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      const mockCall = (hub.captureEvent as jest.MockedFunction<
-        typeof hub.captureEvent
-      >).mock.calls[0];
-      const event = mockCall[0];
+      const [event] = getActualCaptureEventArgs();
 
       expect(event.level).toBe('fatal' as SeverityLevel);
       expect(event.exception?.values?.[0].mechanism?.handled).toBe(false);
       expect(event.exception?.values?.[0].mechanism?.type).toBe('onerror');
     });
 
     test('Does not set handled:false on a non-fatal error', async () => {
-      // eslint-disable-next-line @typescript-eslint/no-empty-function
-      let callback: (error: Error, isFatal: boolean) => Promise<void> = () =>
-        Promise.resolve();
-
-      ErrorUtils.setGlobalHandler = jest.fn((_callback) => {
-        callback = _callback as typeof callback;
-      });
+      await errorHandlerCallback(new Error('Test Error'), false);
 
-      const integration = new ReactNativeErrorHandlers();
-
-      integration.setupOnce();
-
-      expect(ErrorUtils.setGlobalHandler).toHaveBeenCalledWith(callback);
-
-      await callback(new Error('Test Error'), false);
-
-      const hub = getCurrentHub();
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      const mockCall = (hub.captureEvent as jest.MockedFunction<
-        typeof hub.captureEvent
-      >).mock.calls[0];
-      const event = mockCall[0];
+      const [event] = getActualCaptureEventArgs();
 
       expect(event.level).toBe('error' as SeverityLevel);
       expect(event.exception?.values?.[0].mechanism?.handled).toBe(true);
       expect(event.exception?.values?.[0].mechanism?.type).toBe('generic');
     });
+
+    test('Includes original exception in hint', async () => {
+      await errorHandlerCallback(new Error('Test Error'), false);
+
+      const [, hint] = getActualCaptureEventArgs();
+
+      expect(hint).toEqual(expect.objectContaining({ originalException: new Error('Test Error') }));
+    });
   });
 });
+
+function getActualCaptureEventArgs() {
+  const hub = getCurrentHub();
+  // eslint-disable-next-line @typescript-eslint/unbound-method
+  const mockCall = (hub.captureEvent as jest.MockedFunction<
+    typeof hub.captureEvent
+  >).mock.calls[0];
+
+  return mockCall;
+}