Add error mechanism type to captureException calls across packages

cursoragent · Lms24 · cursoragent · commit 21b8e54879c6 · 2025-07-31T08:17:00.000Z
Co-authored-by: lukas.stracke &lt;lukas.stracke@sentry.io&gt;
diff --git a/packages/aws-serverless/src/sdk.ts b/packages/aws-serverless/src/sdk.ts
@@ -306,11 +306,11 @@ export function wrapHandler<TEvent, TResult>(
         if (options.captureAllSettledReasons && Array.isArray(rv) && isPromiseAllSettledResult(rv)) {
           const reasons = getRejectedReasons(rv);
           reasons.forEach(exception => {
-            captureException(exception, scope => markEventUnhandled(scope));
+            captureException(exception, scope => markEventUnhandled(scope, 'aws-serverless.promise'));
           });
         }
       } catch (e) {
-        captureException(e, scope => markEventUnhandled(scope));
+        captureException(e, scope => markEventUnhandled(scope, 'aws-serverless.handler'));
         throw e;
       } finally {
         clearTimeout(timeoutWarningTimer);
diff --git a/packages/aws-serverless/src/utils.ts b/packages/aws-serverless/src/utils.ts
@@ -26,9 +26,9 @@ const headerGetter: TextMapGetter<APIGatewayProxyEventHeaders> = {
 /**
  * Marks an event as unhandled by adding a span processor to the passed scope.
  */
-export function markEventUnhandled(scope: Scope): Scope {
+export function markEventUnhandled(scope: Scope, type = 'aws-serverless'): Scope {
   scope.addEventProcessor(event => {
-    addExceptionMechanism(event, { handled: false });
+    addExceptionMechanism(event, { handled: false, type });
     return event;
   });
 
diff --git a/packages/browser/src/helpers.ts b/packages/browser/src/helpers.ts
@@ -133,7 +133,12 @@ export function wrap<T extends WrappableFunction, NonFunction>(
           return event;
         });
 
-        captureException(ex);
+        captureException(ex, {
+          mechanism: {
+            handled: false,
+            type: 'browser',
+          },
+        });
       });
 
       throw ex;
diff --git a/packages/core/src/integrations/supabase.ts b/packages/core/src/integrations/supabase.ts
@@ -236,6 +236,7 @@ function instrumentAuthOperation(operation: AuthOperationFn, isAdmin = false): A
                 captureException(res.error, {
                   mechanism: {
                     handled: false,
+                    type: 'supabase',
                   },
                 });
               } else {
@@ -252,6 +253,7 @@ function instrumentAuthOperation(operation: AuthOperationFn, isAdmin = false): A
               captureException(err, {
                 mechanism: {
                   handled: false,
+                  type: 'supabase',
                 },
               });
 
@@ -417,6 +419,10 @@ function instrumentPostgRESTFilterBuilder(PostgRESTFilterBuilder: PostgRESTFilte
                     }
 
                     captureException(err, {
+                      mechanism: {
+                        handled: false,
+                        type: 'supabase',
+                      },
                       contexts: {
                         supabase: supabaseContext,
                       },
diff --git a/packages/core/src/trpc.ts b/packages/core/src/trpc.ts
@@ -19,7 +19,7 @@ export interface SentryTrpcMiddlewareArguments<T> {
   getRawInput?: () => Promise<unknown>;
 }
 
-const trpcCaptureContext = { mechanism: { handled: false, data: { function: 'trpcMiddleware' } } };
+const trpcCaptureContext = { mechanism: { handled: false, type: 'trpc', data: { function: 'trpcMiddleware' } } };
 
 function captureIfError(nextResult: unknown): void {
   // TODO: Set span status based on what TRPCError was encountered
diff --git a/packages/core/src/utils/openai/index.ts b/packages/core/src/utils/openai/index.ts
@@ -205,6 +205,7 @@ function instrumentMethod<T extends unknown[], R>(
             captureException(error, {
               mechanism: {
                 handled: false,
+                type: 'openai',
               },
             });
             span.end();
@@ -230,7 +231,12 @@ function instrumentMethod<T extends unknown[], R>(
             addResponseAttributes(span, result, finalOptions.recordOutputs);
             return result;
           } catch (error) {
-            captureException(error);
+            captureException(error, {
+              mechanism: {
+                handled: false,
+                type: 'openai',
+              },
+            });
             throw error;
           }
         },
diff --git a/packages/core/src/utils/openai/streaming.ts b/packages/core/src/utils/openai/streaming.ts
@@ -96,6 +96,7 @@ function processResponsesApiEvent(
     captureException(streamEvent, {
       mechanism: {
         handled: false,
+        type: 'openai',
       },
     });
     return;
diff --git a/packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts b/packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts
@@ -49,7 +49,7 @@ function _wrapCloudEventFunction(
 
         const newCallback = domainify((...args: unknown[]) => {
           if (args[0] !== null && args[0] !== undefined) {
-            captureException(args[0], scope => markEventUnhandled(scope));
+            captureException(args[0], scope => markEventUnhandled(scope, 'google-cloud-serverless.cloud_event'));
           }
           span.end();
 
@@ -69,7 +69,7 @@ function _wrapCloudEventFunction(
           return handleCallbackErrors(
             () => (fn as CloudEventFunctionWithCallback)(context, newCallback),
             err => {
-              captureException(err, scope => markEventUnhandled(scope));
+              captureException(err, scope => markEventUnhandled(scope, 'google-cloud-serverless.cloud_event'));
             },
           );
         }
diff --git a/packages/google-cloud-serverless/src/gcpfunction/events.ts b/packages/google-cloud-serverless/src/gcpfunction/events.ts
@@ -52,7 +52,7 @@ function _wrapEventFunction<F extends EventFunction | EventFunctionWithCallback>
 
         const newCallback = domainify((...args: unknown[]) => {
           if (args[0] !== null && args[0] !== undefined) {
-            captureException(args[0], scope => markEventUnhandled(scope));
+            captureException(args[0], scope => markEventUnhandled(scope, 'google-cloud-serverless.event'));
           }
           span.end();
 
@@ -72,7 +72,7 @@ function _wrapEventFunction<F extends EventFunction | EventFunctionWithCallback>
           return handleCallbackErrors(
             () => (fn as EventFunctionWithCallback)(data, context, newCallback),
             err => {
-              captureException(err, scope => markEventUnhandled(scope));
+              captureException(err, scope => markEventUnhandled(scope, 'google-cloud-serverless.event'));
             },
           );
         }
diff --git a/packages/google-cloud-serverless/src/gcpfunction/http.ts b/packages/google-cloud-serverless/src/gcpfunction/http.ts
@@ -78,7 +78,7 @@ function _wrapHttpFunction(fn: HttpFunction, options: Partial<WrapperOptions>):
           return handleCallbackErrors(
             () => fn(req, res),
             err => {
-              captureException(err, scope => markEventUnhandled(scope));
+              captureException(err, scope => markEventUnhandled(scope, 'google-cloud-serverless.http'));
             },
           );
         },
diff --git a/packages/google-cloud-serverless/src/utils.ts b/packages/google-cloud-serverless/src/utils.ts
@@ -43,9 +43,9 @@ export function proxyFunction<A extends any[], R, F extends (...args: A) => R>(
 /**
  * Marks an event as unhandled by adding a span processor to the passed scope.
  */
-export function markEventUnhandled(scope: Scope): Scope {
+export function markEventUnhandled(scope: Scope, type = 'google-cloud-serverless'): Scope {
   scope.addEventProcessor(event => {
-    addExceptionMechanism(event, { handled: false });
+    addExceptionMechanism(event, { handled: false, type });
     return event;
   });
 
diff --git a/packages/nestjs/src/decorators.ts b/packages/nestjs/src/decorators.ts
@@ -19,12 +19,22 @@ export const SentryCron = (monitorSlug: string, monitorConfig?: MonitorConfig):
           try {
             result = originalMethod.apply(this, args);
           } catch (e) {
-            captureException(e);
+            captureException(e, {
+              mechanism: {
+                handled: false,
+                type: 'nestjs.cron',
+              },
+            });
             throw e;
           }
           if (isThenable(result)) {
             return result.then(undefined, e => {
-              captureException(e);
+              captureException(e, {
+                mechanism: {
+                  handled: false,
+                  type: 'nestjs.cron',
+                },
+              });
               throw e;
             });
           }
@@ -77,7 +87,12 @@ export function SentryExceptionCaptured() {
         return originalCatch.apply(this, [exception, host, ...args]);
       }
 
-      captureException(exception);
+      captureException(exception, {
+        mechanism: {
+          handled: true, // User provided exception filter to handle the error
+          type: 'nestjs.exception-filter',
+        },
+      });
       return originalCatch.apply(this, [exception, host, ...args]);
     };
 
diff --git a/packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts b/packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts
@@ -109,7 +109,12 @@ export class SentryNestEventInstrumentation extends InstrumentationBase {
                 return result;
               } catch (error) {
                 // exceptions from event handlers are not caught by global error filter
-                captureException(error);
+                captureException(error, {
+                  mechanism: {
+                    handled: false,
+                    type: 'nestjs.event',
+                  },
+                });
                 throw error;
               }
             });
diff --git a/packages/nestjs/src/setup.ts b/packages/nestjs/src/setup.ts
@@ -101,7 +101,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
         this._logger.error(exception.message, exception.stack);
       }
 
-      captureException(exception);
+      captureException(exception, {
+        mechanism: {
+          handled: false,
+          type: 'nestjs.graphql',
+        },
+      });
       throw exception;
     }
 
@@ -117,15 +122,25 @@ class SentryGlobalFilter extends BaseExceptionFilter {
       // Handle any other kind of error
       if (!(exception instanceof Error)) {
         if (!isExpectedError(exception)) {
-          captureException(exception);
+          captureException(exception, {
+            mechanism: {
+              handled: false,
+              type: 'nestjs.rpc',
+            },
+          });
         }
         throw exception;
       }
 
       // In this case we're likely running into an RpcException, which the user should handle with a dedicated filter
       // https://github.com/nestjs/nest/blob/master/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
       if (!isExpectedError(exception)) {
-        captureException(exception);
+        captureException(exception, {
+          mechanism: {
+            handled: false,
+            type: 'nestjs.rpc',
+          },
+        });
       }
 
       this._logger.warn(
@@ -139,7 +154,12 @@ class SentryGlobalFilter extends BaseExceptionFilter {
 
     // HTTP exceptions
     if (!isExpectedError(exception)) {
-      captureException(exception);
+      captureException(exception, {
+        mechanism: {
+          handled: false,
+          type: 'nestjs.http',
+        },
+      });
     }
 
     return super.catch(exception, host);
diff --git a/packages/nextjs/src/common/captureRequestError.ts b/packages/nextjs/src/common/captureRequestError.ts
@@ -38,6 +38,7 @@ export function captureRequestError(error: unknown, request: RequestInfo, errorC
     captureException(error, {
       mechanism: {
         handled: false,
+        type: 'nextjs.request',
       },
     });
 
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapPageComponentWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapPageComponentWithSentry.ts
@@ -48,6 +48,7 @@ export function wrapPageComponentWithSentry(pageComponent: FunctionComponent | C
             captureException(e, {
               mechanism: {
                 handled: false,
+                type: 'nextjs.page',
               },
             });
             throw e;
@@ -77,6 +78,7 @@ export function wrapPageComponentWithSentry(pageComponent: FunctionComponent | C
             captureException(e, {
               mechanism: {
                 handled: false,
+                type: 'nextjs.page',
               },
             });
             throw e;
diff --git a/packages/nextjs/src/common/utils/wrapperUtils.ts b/packages/nextjs/src/common/utils/wrapperUtils.ts
@@ -25,7 +25,7 @@ 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, { mechanism: { handled: false } });
+      captureException(e, { mechanism: { handled: false, type: 'nextjs' } });
       throw e;
     }
   };
@@ -99,7 +99,7 @@ export async function callDataFetcherTraced<F extends (...args: any[]) => Promis
   try {
     return await origFunction(...origFunctionArgs);
   } catch (e) {
-    captureException(e, { mechanism: { handled: false } });
+    captureException(e, { mechanism: { handled: false, type: 'nextjs' } });
     throw e;
   }
 }
diff --git a/packages/nextjs/src/common/withServerActionInstrumentation.ts b/packages/nextjs/src/common/withServerActionInstrumentation.ts
@@ -130,6 +130,7 @@ async function withServerActionInstrumentationImplementation<A extends (...args:
                   captureException(error, {
                     mechanism: {
                       handled: false,
+                      type: 'nextjs.server-action',
                     },
                   });
                 }
diff --git a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
@@ -138,6 +138,7 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
                     captureException(err, {
                       mechanism: {
                         handled: false,
+                        type: 'nextjs.generation-function',
                       },
                     });
                   }
diff --git a/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts b/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts
@@ -90,6 +90,7 @@ export function wrapRouteHandlerWithSentry<F extends (...args: any[]) => any>(
                   captureException(error, {
                     mechanism: {
                       handled: false,
+                      type: 'nextjs.route',
                     },
                   });
                 }
diff --git a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
@@ -130,6 +130,7 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
                     captureException(error, {
                       mechanism: {
                         handled: false,
+                        type: 'nextjs.server-component',
                       },
                     });
                   }
diff --git a/packages/node-core/src/cron/cron.ts b/packages/node-core/src/cron/cron.ts
@@ -99,7 +99,12 @@ export function instrumentCron<T>(lib: T & CronJobConstructor, monitorSlug: stri
             try {
               await onTick(context, onComplete);
             } catch (e) {
-              captureException(e);
+              captureException(e, {
+                mechanism: {
+                  handled: false,
+                  type: 'cron',
+                },
+              });
               throw e;
             }
           },
@@ -136,7 +141,12 @@ export function instrumentCron<T>(lib: T & CronJobConstructor, monitorSlug: stri
                 try {
                   await onTick(context, onComplete);
                 } catch (e) {
-                  captureException(e);
+                  captureException(e, {
+                    mechanism: {
+                      handled: false,
+                      type: 'cron',
+                    },
+                  });
                   throw e;
                 }
               },
diff --git a/packages/node-core/src/cron/node-cron.ts b/packages/node-core/src/cron/node-cron.ts
@@ -53,7 +53,12 @@ export function instrumentNodeCron<T>(lib: Partial<NodeCron> & T): T {
                   try {
                     return await callback();
                   } catch (e) {
-                    captureException(e);
+                    captureException(e, {
+                      mechanism: {
+                        handled: false,
+                        type: 'cron',
+                      },
+                    });
                     throw e;
                   }
                 },
diff --git a/packages/node/src/integrations/tracing/connect.ts b/packages/node/src/integrations/tracing/connect.ts
diff --git a/packages/node/src/integrations/tracing/koa.ts b/packages/node/src/integrations/tracing/koa.ts
diff --git a/packages/nuxt/src/runtime/hooks/captureErrorHook.ts b/packages/nuxt/src/runtime/hooks/captureErrorHook.ts
diff --git a/packages/nuxt/src/runtime/utils.ts b/packages/nuxt/src/runtime/utils.ts
diff --git a/packages/replay-internal/src/util/logger.ts b/packages/replay-internal/src/util/logger.ts
diff --git a/packages/solid/src/errorboundary.ts b/packages/solid/src/errorboundary.ts
diff --git a/packages/vue/src/router.ts b/packages/vue/src/router.ts

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export interface SentryTrpcMiddlewareArguments<T> {`
`19`	`19`	`getRawInput?: () => Promise<unknown>;`
`20`	`20`	`}`
`21`	`21`
`22`		`-const trpcCaptureContext = { mechanism: { handled: false, data: { function: 'trpcMiddleware' } } };`
	`22`	`+const trpcCaptureContext = { mechanism: { handled: false, type: 'trpc', data: { function: 'trpcMiddleware' } } };`
`23`	`23`
`24`	`24`	`function captureIfError(nextResult: unknown): void {`
`25`	`25`	`// TODO: Set span status based on what TRPCError was encountered`