stuff

Author: Luca Forstner

dev-packages/node-integration-tests/suites/sessions/server.ts

@@ -5,6 +5,12 @@ Sentry.init({
   dsn: 'https://[email protected]/1337',
   release: '1.0',
   transport: loggingTransport,
+  integrations: [
+    Sentry.httpIntegration({
+      // Flush after 2 seconds (to avoid waiting for the default 60s)
+      sessionFlushingDelayMS: 2_000,
+    }),
+  ],
 });
 
 import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';

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

@@ -59,6 +59,13 @@ type SentryHttpInstrumentationOptions = InstrumentationConfig & {
    * Defaults to `true`.
    */
   trackIncomingRequestsAsSessions?: boolean;
+
+  /**
+   * Number of milliseconds until sessions tracked with `trackIncomingRequestsAsSessions` will be flushed as a session aggregate.
+   *
+   * Defaults to `60000` (60s).
+   */
+  sessionFlushingDelayMS?: number;
 };
 
 // We only want to capture request bodies up to 1mb.
@@ -212,6 +219,7 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
                     ([timestamp, value]) => ({
                       started: timestamp,
                       exited: value.exited,
+                      errored: value.errored,
                       crashed: value.crashed,
                     }),
                   );
@@ -222,10 +230,13 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
                   DEBUG_BUILD && logger.debug('Sending request session aggregate due to client flush');
                   flushPendingClientAggregates();
                 });
-                const timeout = setTimeout(() => {
-                  DEBUG_BUILD && logger.debug('Sending request session aggregate due to flushing schedule');
-                  flushPendingClientAggregates();
-                }, 60_000).unref();
+                const timeout = setTimeout(
+                  () => {
+                    DEBUG_BUILD && logger.debug('Sending request session aggregate due to flushing schedule');
+                    flushPendingClientAggregates();
+                  },
+                  instrumentation.getConfig().sessionFlushingDelayMS ?? 60_000,
+                ).unref();
               }
             }
           });

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

@@ -38,9 +38,15 @@ interface HttpOptions {
    *
    * Defaults to `true`.
    */
-  // TODO(v9): Remove the note above.
   trackIncomingRequestsAsSessions?: boolean;
 
+  /**
+   * Number of milliseconds until sessions tracked with `trackIncomingRequestsAsSessions` will be flushed as a session aggregate.
+   *
+   * Defaults to `60000` (60s).
+   */
+  sessionFlushingDelayMS?: number;
+
   /**
    * Do not capture spans or breadcrumbs for outgoing HTTP requests to URLs where the given callback returns `true`.
    * This controls both span & breadcrumb creation - spans will be non recording if tracing is disabled.
@@ -95,11 +101,13 @@ const instrumentSentryHttp = generateInstrumentOnce<{
   breadcrumbs?: HttpOptions['breadcrumbs'];
   ignoreOutgoingRequests?: HttpOptions['ignoreOutgoingRequests'];
   trackIncomingRequestsAsSessions?: HttpOptions['trackIncomingRequestsAsSessions'];
+  sessionFlushingDelayMS?: HttpOptions['sessionFlushingDelayMS'];
 }>(`${INTEGRATION_NAME}.sentry`, options => {
   return new SentryHttpInstrumentation({
     breadcrumbs: options?.breadcrumbs,
     ignoreOutgoingRequests: options?.ignoreOutgoingRequests,
     trackIncomingRequestsAsSessions: options?.trackIncomingRequestsAsSessions,
+    sessionFlushingDelayMS: options?.sessionFlushingDelayMS,
   });
 });