Merge branch 'sig/flush-util' into sig/astro-waitUntil

Author: s1gr1d

packages/nextjs/src/common/_error.ts

@@ -1,7 +1,6 @@
 import { captureException, withScope } from '@sentry/core';
-import { vercelWaitUntil } from '@sentry/utils';
+import { flushSafelyWithTimeout, vercelWaitUntil } from '@sentry/utils';
 import type { NextPageContext } from 'next';
-import { flushSafelyWithTimeout } from './utils/responseEnd';
 
 type ContextOrProps = {
   req?: NextPageContext['req'];

packages/nextjs/src/common/utils/edgeWrapperUtils.ts

@@ -9,10 +9,9 @@ import {
   startSpan,
   withIsolationScope,
 } from '@sentry/core';
-import { vercelWaitUntil, winterCGRequestToRequestData } from '@sentry/utils';
+import { flushSafelyWithTimeout, vercelWaitUntil, winterCGRequestToRequestData } from '@sentry/utils';
 
 import type { EdgeRouteHandler } from '../../edge/types';
-import { flushSafelyWithTimeout } from './responseEnd';
 import { commonObjectToIsolationScope, escapeNextjsTracing } from './tracingUtils';
 
 /**

packages/nextjs/src/common/utils/responseEnd.ts

@@ -1,9 +1,7 @@
 import type { ServerResponse } from 'http';
-import { flush, setHttpStatus } from '@sentry/core';
+import { setHttpStatus } from '@sentry/core';
 import type { Span } from '@sentry/types';
-import { fill, logger } from '@sentry/utils';
-
-import { DEBUG_BUILD } from '../debug-build';
+import { fill } from '@sentry/utils';
 import type { ResponseEndMethod, WrappedResponseEndMethod } from '../types';
 
 /**
@@ -43,16 +41,3 @@ export function finishSpan(span: Span, res: ServerResponse): void {
   setHttpStatus(span, res.statusCode);
   span.end();
 }
-
-/**
- * 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);
-  }
-}

packages/nextjs/src/common/utils/wrapperUtils.ts

@@ -14,9 +14,9 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import type { Span } from '@sentry/types';
-import { isString, vercelWaitUntil } from '@sentry/utils';
+import { flushSafelyWithTimeout, isString, vercelWaitUntil } from '@sentry/utils';
 
-import { autoEndSpanOnResponseEnd, flushSafelyWithTimeout } from './responseEnd';
+import { autoEndSpanOnResponseEnd } from './responseEnd';
 import { commonObjectToIsolationScope, escapeNextjsTracing } from './tracingUtils';
 
 declare module 'http' {

packages/nextjs/src/common/withServerActionInstrumentation.ts

@@ -5,11 +5,11 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import { captureException, continueTrace, getClient, handleCallbackErrors, startSpan } from '@sentry/core';
-import { logger, vercelWaitUntil } from '@sentry/utils';
+import { flushSafelyWithTimeout, logger, vercelWaitUntil } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
-import { flushSafelyWithTimeout } from './utils/responseEnd';
+
 import { escapeNextjsTracing } from './utils/tracingUtils';
 
 interface Options {

packages/nextjs/src/common/wrapApiHandlerWithSentry.ts

@@ -7,10 +7,9 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
-import { isString, logger, objectify, vercelWaitUntil } from '@sentry/utils';
+import { flushSafelyWithTimeout, isString, logger, objectify, vercelWaitUntil } from '@sentry/utils';
 import type { NextApiRequest } from 'next';
 import type { AugmentedNextApiResponse, NextApiHandler } from './types';
-import { flushSafelyWithTimeout } from './utils/responseEnd';
 import { escapeNextjsTracing } from './utils/tracingUtils';
 
 export type AugmentedNextApiRequest = NextApiRequest & {

packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts

@@ -10,10 +10,14 @@ import {
   withIsolationScope,
   withScope,
 } from '@sentry/core';
-import { propagationContextFromHeaders, vercelWaitUntil, winterCGHeadersToDict } from '@sentry/utils';
+import {
+  flushSafelyWithTimeout,
+  propagationContextFromHeaders,
+  vercelWaitUntil,
+  winterCGHeadersToDict,
+} from '@sentry/utils';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
 import type { RouteHandlerContext } from './types';
-import { flushSafelyWithTimeout } from './utils/responseEnd';
 import {
   commonObjectToIsolationScope,
   commonObjectToPropagationContext,

packages/nextjs/src/common/wrapServerComponentWithSentry.ts

@@ -13,12 +13,17 @@ import {
   withIsolationScope,
   withScope,
 } from '@sentry/core';
-import { propagationContextFromHeaders, uuid4, vercelWaitUntil, winterCGHeadersToDict } from '@sentry/utils';
+import {
+  flushSafelyWithTimeout,
+  propagationContextFromHeaders,
+  uuid4,
+  vercelWaitUntil,
+  winterCGHeadersToDict,
+} from '@sentry/utils';
 
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { isNotFoundNavigationError, isRedirectNavigationError } from '../common/nextNavigationErrorUtils';
 import type { ServerComponentContext } from '../common/types';
-import { flushSafelyWithTimeout } from './utils/responseEnd';
 import { commonObjectToIsolationScope, commonObjectToPropagationContext } from './utils/tracingUtils';
 
 /**

packages/nuxt/src/server/sdk.ts

@@ -1,12 +1,12 @@
-import { applySdkMetadata, flush, getGlobalScope } from '@sentry/core';
+import { applySdkMetadata, getGlobalScope } from '@sentry/core';
 import {
   type NodeOptions,
   getDefaultIntegrations as getDefaultNodeIntegrations,
   httpIntegration,
   init as initNode,
 } from '@sentry/node';
 import type { Client, EventProcessor, Integration } from '@sentry/types';
-import { logger, vercelWaitUntil } from '@sentry/utils';
+import { flushSafelyWithTimeout, logger, vercelWaitUntil } from '@sentry/utils';
 import { DEBUG_BUILD } from '../common/debug-build';
 import type { SentryNuxtServerOptions } from '../common/types';
 
@@ -85,16 +85,3 @@ export function mergeRegisterEsmLoaderHooks(
   }
   return options.registerEsmLoaderHooks ?? { exclude: [/vue/] };
 }
-
-/**
- * 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);
-  }
-}

packages/solidstart/src/server/utils.ts

@@ -1,20 +1,13 @@
-import { flush, getGlobalScope } from '@sentry/node';
+import { getGlobalScope } from '@sentry/node';
 import type { EventProcessor, Options } from '@sentry/types';
-import { logger } from '@sentry/utils';
-import { DEBUG_BUILD } from '../common/debug-build';
+import { flushSafelyWithTimeout, logger } from '@sentry/utils';
 
 /** Flush the event queue to ensure that events get sent to Sentry before the response is finished and the lambda ends */
 export async function flushIfServerless(): Promise<void> {
   const isServerless = !!process.env.LAMBDA_TASK_ROOT || !!process.env.VERCEL;
 
   if (isServerless) {
-    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);
-    }
+    await flushSafelyWithTimeout();
   }
 }