feat(nextjs): Mark errors caught from NextJS wrappers as unhandled (#…

…8893) Mark errors caught in * `captureUnderscoreException` * `wrapApiHandlerWithSentry` * `callDataFetcherTraced` * `withErrorInstrumentation` * `wrapServerComponentWithSentry` as unhandled. For more details, see #8890, #6073 Co-authored-by: Luca Forstner <luca.forstner@sentry.io>
getsentry · Sep 4, 2023 · b102817 · b102817
1 parent 3d8b444
commit b102817
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/packages/nextjs/src/common/_error.ts b/packages/nextjs/src/common/_error.ts
@@ -45,7 +45,7 @@ export async function captureUnderscoreErrorException(contextOrProps: ContextOrP
     scope.addEventProcessor(event => {
       addExceptionMechanism(event, {
         type: 'instrument',
-        handled: true,
+        handled: false,
         data: {
           function: '_error.getInitialProps',
         },

diff --git a/packages/nextjs/src/common/utils/wrapperUtils.ts b/packages/nextjs/src/common/utils/wrapperUtils.ts
@@ -6,7 +6,7 @@ import {
   startTransaction,
 } from '@sentry/core';
 import type { Span, Transaction } from '@sentry/types';
-import { isString, tracingContextFromHeaders } from '@sentry/utils';
+import { addExceptionMechanism, isString, tracingContextFromHeaders } from '@sentry/utils';
 import type { IncomingMessage, ServerResponse } from 'http';
 
 import { platformSupportsStreaming } from './platformSupportsStreaming';
@@ -47,7 +47,17 @@ export function withErrorInstrumentation<F extends (...args: any[]) => any>(
       return await origFunction.apply(this, origFunctionArguments);
     } catch (e) {
       // TODO: Extract error logic from `withSentry` in here or create a new wrapper with said logic or something like that.
-      captureException(e);
+      captureException(e, scope => {
+        scope.addEventProcessor(event => {
+          addExceptionMechanism(event, {
+            handled: false,
+          });
+          return event;
+        });
+
+        return scope;
+      });
+
       throw e;
     }
   };
@@ -221,7 +231,17 @@ export async function callDataFetcherTraced<F extends (...args: any[]) => Promis
     span.finish();
 
     // TODO Copy more robust error handling over from `withSentry`
-    captureException(err);
+    captureException(err, scope => {
+      scope.addEventProcessor(event => {
+        addExceptionMechanism(event, {
+          handled: false,
+        });
+        return event;
+      });
+
+      return scope;
+    });
+
     throw err;
   }
 }
diff --git a/packages/nextjs/src/common/wrapApiHandlerWithSentry.ts b/packages/nextjs/src/common/wrapApiHandlerWithSentry.ts
@@ -191,7 +191,7 @@ export function withSentry(apiHandler: NextApiHandler, parameterizedRoute?: stri
               currentScope.addEventProcessor(event => {
                 addExceptionMechanism(event, {
                   type: 'instrument',
-                  handled: true,
+                  handled: false,
                   data: {
                     wrapped_handler: wrappingTarget.name,
                     function: 'withSentry',

diff --git a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
@@ -5,7 +5,7 @@ import {
   runWithAsyncContext,
   startTransaction,
 } from '@sentry/core';
-import { tracingContextFromHeaders } from '@sentry/utils';
+import { addExceptionMechanism, tracingContextFromHeaders } from '@sentry/utils';
 
 import { isNotFoundNavigationError, isRedirectNavigationError } from '../common/nextNavigationErrorUtils';
 import type { ServerComponentContext } from '../common/types';
@@ -63,7 +63,17 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
             // We don't want to report redirects
           } else {
             transaction.setStatus('internal_error');
-            captureException(e);
+
+            captureException(e, scope => {
+              scope.addEventProcessor(event => {
+                addExceptionMechanism(event, {
+                  handled: false,
+                });
+                return event;
+              });
+
+              return scope;
+            });
           }
 
           transaction.finish();