Merge remote-tracking branch 'origin/lforst-mimic-native-behaviour-onuncaught-exception' into lforst-fix-nextjs-quitting-on-aborted-requests

Author: Luca Forstner

packages/node-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-additional-listener-test-script.js

@@ -6,7 +6,7 @@ Sentry.init({
     return integrations.map(integration => {
       if (integration.name === 'OnUncaughtException') {
         return new Sentry.Integrations.OnUncaughtException({
-          exitEvenWhenOtherOnUncaughtExceptionHandlersAreRegistered: false,
+          exitEvenIfOtherHandlersAreRegistered: false,
         });
       } else {
         return integration;

packages/node-integration-tests/suites/public-api/OnUncaughtException/mimic-native-behaviour-no-additional-listener-test-script.js

@@ -6,7 +6,7 @@ Sentry.init({
     return integrations.map(integration => {
       if (integration.name === 'OnUncaughtException') {
         return new Sentry.Integrations.OnUncaughtException({
-          exitEvenWhenOtherOnUncaughtExceptionHandlersAreRegistered: false,
+          exitEvenIfOtherHandlersAreRegistered: false,
         });
       } else {
         return integration;

packages/node-integration-tests/suites/public-api/OnUncaughtException/test.ts

@@ -28,7 +28,7 @@ describe('OnUncaughtException integration', () => {
     });
   });
 
-  describe('with `exitEvenWhenOtherOnUncaughtExceptionHandlersAreRegistered` set to false', () => {
+  describe('with `exitEvenIfOtherHandlersAreRegistered` set to false', () => {
     test('should close process on uncaught error with no additional listeners registered', done => {
       expect.assertions(3);
 

packages/node/src/integrations/onuncaughtexception.ts

@@ -13,11 +13,13 @@ interface OnUncaughtExceptionOptions {
   // Also, we can evaluate using https://nodejs.org/api/process.html#event-uncaughtexceptionmonitor per default, and
   // falling back to current behaviour when that's not available.
   /**
-   * Whether the SDK should mimic native behaviour when a global error occurs. Default: `true`
-   * - `false`: The SDK will exit the process on all uncaught errors.
-   * - `true`: The SDK will only exit the process when there are no other 'uncaughtException' handlers attached.
+   * Controls if the SDK should register a handler to exit the process on uncaught errors:
+   * - `true`: The SDK will exit the process on all uncaught errors.
+   * - `false`: The SDK will only exit the process when there are no other `uncaughtException` handlers attached.
+   *
+   * Default: `true`
    */
-  exitEvenWhenOtherOnUncaughtExceptionHandlersAreRegistered: boolean;
+  exitEvenIfOtherHandlersAreRegistered: boolean;
 
   /**
    * This is called when an uncaught error would cause the process to exit.
@@ -55,7 +57,7 @@ export class OnUncaughtException implements Integration {
    */
   public constructor(options: Partial<OnUncaughtExceptionOptions> = {}) {
     this._options = {
-      exitEvenWhenOtherOnUncaughtExceptionHandlersAreRegistered: true,
+      exitEvenIfOtherHandlersAreRegistered: true,
       ...options,
     };
   }
@@ -108,8 +110,7 @@ export class OnUncaughtException implements Integration {
         }, 0);
 
       const processWouldExit = userProvidedListenersCount === 0;
-      const shouldApplyFatalHandlingLogic =
-        this._options.exitEvenWhenOtherOnUncaughtExceptionHandlersAreRegistered || processWouldExit;
+      const shouldApplyFatalHandlingLogic = this._options.exitEvenIfOtherHandlersAreRegistered || processWouldExit;
 
       if (!caughtFirstError) {
         const hub = getCurrentHub();