add flush function

s1gr1d · s1gr1d · commit 9526eeb4aa72 · 2024-10-24T11:17:26.000+02:00
diff --git a/packages/astro/debug-build.ts b/packages/astro/debug-build.ts
@@ -0,0 +1,8 @@
+declare const __DEBUG_BUILD__: boolean;
+
+/**
+ * This serves as a build time flag that will be true by default, but false in non-debug builds or if users replace `__SENTRY_DEBUG__` in their generated code.
+ *
+ * ATTENTION: This constant must never cross package boundaries (i.e. be exported) to guarantee that it can be used for tree shaking.
+ */
+export const DEBUG_BUILD = __DEBUG_BUILD__;
diff --git a/packages/astro/src/server/middleware.ts b/packages/astro/src/server/middleware.ts
@@ -3,6 +3,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   captureException,
   continueTrace,
+  flush,
   getActiveSpan,
   getClient,
   getCurrentScope,
@@ -14,11 +15,14 @@ import {
 import type { Scope, SpanAttributes } from '@sentry/types';
 import {
   addNonEnumerableProperty,
+  logger,
   objectify,
   stripUrlQueryAndFragment,
+  vercelWaitUntil,
   winterCGRequestToRequestData,
 } from '@sentry/utils';
 import type { APIContext, MiddlewareResponseHandler } from 'astro';
+import { DEBUG_BUILD } from '../../debug-build';
 
 type MiddlewareOptions = {
   /**
@@ -188,6 +192,8 @@ async function instrumentRequest(
       } catch (e) {
         sendErrorToSentry(e);
         throw e;
+      } finally {
+        vercelWaitUntil(flushSafelyWithTimeout());
       }
       // TODO: flush if serverless (first extract function)
     },
@@ -213,6 +219,19 @@ function addMetaTagToHead(htmlChunk: string): string {
   return htmlChunk.replace('<head>', content);
 }
 
+/**
+ * Flushes pending Sentry events with a 2-second timeout and in a way that cannot create unhandled promise rejections.
+ */
+export async function flushSafelyWithTimeout(): Promise<void> {
+  try {
+    DEBUG_BUILD && logger.log('Flushing events...');
+    await flush(2000);
+    DEBUG_BUILD && logger.log('Done flushing events');
+  } catch (e) {
+    DEBUG_BUILD && logger.log('Error while flushing events:\n', e);
+  }
+}
+
 /**
  * Interpolates the route from the URL and the passed params.
  * Best we can do to get a route name instead of a raw URL.
