crashed and errored

Author: Luca Forstner

packages/core/src/server-runtime-client.ts

@@ -79,8 +79,7 @@ export class ServerRuntimeClient<
    * @inheritDoc
    */
   public captureException(exception: unknown, hint?: EventHint, scope?: Scope): string {
-    // TODO: Check if mechanism === unhandled
-    setCurrentRequestSessionCrashed();
+    setCurrentRequestSessionErroredOrCrashed(hint);
     return super.captureException(exception, hint, scope);
   }
 
@@ -91,8 +90,7 @@ export class ServerRuntimeClient<
     // If the event is of type Exception, then a request session should be captured
     const isException = !event.type && event.exception && event.exception.values && event.exception.values.length > 0;
     if (isException) {
-      // TODO: Check if mechanism === unhandled
-      setCurrentRequestSessionCrashed();
+      setCurrentRequestSessionErroredOrCrashed(hint);
     }
 
     return super.captureEvent(event, hint, scope);
@@ -207,17 +205,25 @@ export class ServerRuntimeClient<
   }
 }
 
-function setCurrentRequestSessionCrashed(): void {
+function setCurrentRequestSessionErroredOrCrashed(eventHint?: EventHint): void {
+  const isHandledException = eventHint?.mechanism?.handled ?? true;
+
   const requestSession = getIsolationScope().getScopeData().sdkProcessingMetadata.requestSession as
-    | { status: 'ok' | 'crashed' }
+    | { status: 'ok' | 'errored' | 'crashed' }
     | undefined;
 
   if (requestSession) {
     // We mutate instead of doing `setSdkProcessingMetadata` because the http integration stores away a particular
     // isolationScope. If that isolation scope is forked, setting the processing metadata here will not mutate the
     // original isolation scope that the http integration stored away.
-    requestSession.status = 'crashed';
-
-    // TODO maybe send 'errored' when handled exception?
+    if (isHandledException) {
+      // A request session can go from "errored" -> "crashed" but not "crashed" -> "errored".
+      // Crashed (unhandled exception) is worse than errored (handled exception).
+      if (requestSession.status !== 'crashed') {
+        requestSession.status = 'errored';
+      }
+    } else {
+      requestSession.status = 'crashed';
+    }
   }
 }

packages/node/src/integrations/http/SentryHttpInstrumentation.ts

@@ -24,11 +24,11 @@ import { getRequestInfo } from './vendor/getRequestInfo';
 
 const clientToAggregatesMap = new Map<
   Client,
-  { [timestampRoundedToSeconds: string]: { exited: number; crashed: number } }
+  { [timestampRoundedToSeconds: string]: { exited: number; crashed: number; errored: number } }
 >();
 
 interface RequestSession {
-  status: 'ok' | 'crashed';
+  status: 'ok' | 'errored' | 'crashed';
 }
 
 type Http = typeof http;
@@ -186,20 +186,20 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
               | undefined;
 
             if (client && requestSession) {
+              DEBUG_BUILD && logger.debug(`Recorded request session with status: ${requestSession.status}`);
+
               const roundedDate = new Date();
               roundedDate.setSeconds(0, 0);
               const dateBucketKey = roundedDate.toISOString();
 
               const existingClientAggregate = clientToAggregatesMap.get(client);
+              const bucket = existingClientAggregate?.[dateBucketKey] || { exited: 0, crashed: 0, errored: 0 };
+              bucket[({ ok: 'exited', crashed: 'crashed', errored: 'errored' } as const)[requestSession.status]]++;
+
               if (existingClientAggregate) {
-                DEBUG_BUILD && logger.debug(`Recorded request session with status: ${requestSession.status}`);
-                const bucket = existingClientAggregate[dateBucketKey] || { crashed: 0, exited: 0 };
-                bucket[requestSession.status === 'ok' ? 'exited' : 'crashed']++;
                 existingClientAggregate[dateBucketKey] = bucket;
               } else {
                 DEBUG_BUILD && logger.debug('Opened new request session aggregate.');
-                const bucket = { crashed: 0, exited: 0 };
-                bucket[requestSession.status === 'ok' ? 'exited' : 'crashed']++;
                 const newClientAggregate = { [dateBucketKey]: bucket };
                 clientToAggregatesMap.set(client, newClientAggregate);
 
@@ -225,8 +225,7 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
                 const timeout = setTimeout(() => {
                   DEBUG_BUILD && logger.debug('Sending request session aggregate due to flushing schedule');
                   flushPendingClientAggregates();
-                  // TODO: Increase to 60s
-                }, 5_000).unref();
+                }, 60_000).unref();
               }
             }
           });