Hmm

Author: Luca Forstner

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

@@ -76,6 +76,8 @@ export class ServerRuntimeClient<
    * @inheritDoc
    */
   public captureException(exception: unknown, hint?: EventHint, scope?: Scope): string {
+    // TODO: Check if mechanism === unhandled
+    setCurrentRequestSessionCrashed();
     return super.captureException(exception, hint, scope);
   }
 
@@ -87,15 +89,7 @@ export class ServerRuntimeClient<
     const isException = !event.type && event.exception && event.exception.values && event.exception.values.length > 0;
     if (isException) {
       // TODO: Check if mechanism === unhandled
-      const isolationScope = getIsolationScope();
-      const requestSession = isolationScope.getScopeData().sdkProcessingMetadata.requestSession;
-      if (requestSession) {
-        isolationScope.setSDKProcessingMetadata({
-          requestSession: {
-            status: 'errored',
-          },
-        });
-      }
+      setCurrentRequestSessionCrashed();
     }
 
     return super.captureEvent(event, hint, scope);
@@ -209,3 +203,18 @@ export class ServerRuntimeClient<
     return [dynamicSamplingContext, traceContext];
   }
 }
+
+function setCurrentRequestSessionCrashed(): void {
+  const requestSession = getIsolationScope().getScopeData().sdkProcessingMetadata.requestSession as
+    | { status: 'ok' | '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?
+  }
+}

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

@@ -9,6 +9,7 @@ import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData,
 import {
   addBreadcrumb,
   getBreadcrumbLogLevelFromHttpStatusCode,
+  getClient,
   getIsolationScope,
   getSanitizedUrlString,
   httpRequestToRequestData,
@@ -23,11 +24,11 @@ import { getRequestInfo } from './vendor/getRequestInfo';
 
 const clientToAggregatesMap = new Map<
   Client,
-  { [timestampRoundedToSeconds: string]: { exited: number; errored: number } }
+  { [timestampRoundedToSeconds: string]: { exited: number; crashed: number } }
 >();
 
 interface RequestSession {
-  status: 'ok' | 'errored';
+  status: 'ok' | 'crashed';
 }
 
 type Http = typeof http;
@@ -178,7 +179,8 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
             requestSession: { status: 'ok' },
           });
           response.once('close', () => {
-            const client = isolationScope.getClient();
+            // We need to grab the client off the current scope instead of the isolation scope because the isolation scope doesn't hold any client out of the box.
+            const client = getClient();
             const requestSession = isolationScope.getScopeData().sdkProcessingMetadata.requestSession as
               | RequestSession
               | undefined;
@@ -191,13 +193,13 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
               const existingClientAggregate = clientToAggregatesMap.get(client);
               if (existingClientAggregate) {
                 DEBUG_BUILD && logger.debug(`Recorded request session with status: ${requestSession.status}`);
-                const bucket = existingClientAggregate[dateBucketKey] || { errored: 0, exited: 0 };
-                bucket[requestSession.status === 'ok' ? 'exited' : 'errored']++;
+                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 = { errored: 0, exited: 0 };
-                bucket[requestSession.status === 'ok' ? 'exited' : 'errored']++;
+                const bucket = { crashed: 0, exited: 0 };
+                bucket[requestSession.status === 'ok' ? 'exited' : 'crashed']++;
                 const newClientAggregate = { [dateBucketKey]: bucket };
                 clientToAggregatesMap.set(client, newClientAggregate);
 
@@ -210,7 +212,7 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
                     ([timestamp, value]) => ({
                       started: timestamp,
                       exited: value.exited,
-                      errored: value.errored,
+                      crashed: value.crashed,
                     }),
                   );
                   client.sendSession({ aggregates: aggregatePayload });
@@ -223,7 +225,8 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
                 const timeout = setTimeout(() => {
                   DEBUG_BUILD && logger.debug('Sending request session aggregate due to flushing schedule');
                   flushPendingClientAggregates();
-                }, 60_000).unref();
+                  // TODO: Increase to 60s
+                }, 5_000).unref();
               }
             }
           });

packages/node/src/sdk/index.ts

@@ -2,20 +2,16 @@ import type { Integration, Options } from '@sentry/core';
 import {
   consoleSandbox,
   dropUndefinedKeys,
-  endSession,
   functionToStringIntegration,
-  getClient,
   getCurrentScope,
   getIntegrationsToSetup,
-  getIsolationScope,
   hasTracingEnabled,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
   logger,
   propagationContextFromHeaders,
   requestDataIntegration,
   stackParserFromStackParserOptions,
-  startSession,
 } from '@sentry/core';
 import {
   enhanceDscWithOpenTelemetryRootSpanName,
@@ -155,13 +151,6 @@ function _init(
   client.init();
 
   logger.log(`Running in ${isCjs() ? 'CommonJS' : 'ESM'} mode.`);
-
-  // TODO(V9): Remove this code since all of the logic should be in an integration
-  // eslint-disable-next-line deprecation/deprecation
-  if (options.autoSessionTracking) {
-    startSessionTracking();
-  }
-
   client.startClientReportTracking();
 
   updateScopeFromEnvVariables();
@@ -312,32 +301,3 @@ function updateScopeFromEnvVariables(): void {
     getCurrentScope().setPropagationContext(propagationContext);
   }
 }
-
-/**
- * Enable automatic Session Tracking for the node process.
- */
-function startSessionTracking(): void {
-  const client = getClient<NodeClient>();
-  // eslint-disable-next-line deprecation/deprecation
-  if (client && client.getOptions().autoSessionTracking) {
-    client.initSessionFlusher();
-  }
-
-  startSession();
-
-  // Emitted in the case of healthy sessions, error of `mechanism.handled: true` and unhandledrejections because
-  // The 'beforeExit' event is not emitted for conditions causing explicit termination,
-  // such as calling process.exit() or uncaught exceptions.
-  // Ref: https://nodejs.org/api/process.html#process_event_beforeexit
-  process.on('beforeExit', () => {
-    const session = getIsolationScope().getSession();
-
-    // Only call endSession, if the Session exists on Scope and SessionStatus is not a
-    // Terminal Status i.e. Exited or Crashed because
-    // "When a session is moved away from ok it must not be updated anymore."
-    // Ref: https://develop.sentry.dev/sdk/sessions/
-    if (session && session.status !== 'ok') {
-      endSession();
-    }
-  });
-}