await flush in api handlers

Author: chargome

packages/nextjs/src/common/wrapApiHandlerWithSentry.ts

@@ -7,7 +7,7 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
-import { isString, logger, objectify, vercelWaitUntil } from '@sentry/utils';
+import { isString, logger, objectify } from '@sentry/utils';
 import type { NextApiRequest } from 'next';
 import type { AugmentedNextApiResponse, NextApiHandler } from './types';
 import { flushSafelyWithTimeout } from './utils/responseEnd';
@@ -77,16 +77,6 @@ export function wrapApiHandlerWithSentry(apiHandler: NextApiHandler, parameteriz
                   },
                 },
                 async span => {
-                  // eslint-disable-next-line @typescript-eslint/unbound-method
-                  res.end = new Proxy(res.end, {
-                    apply(target, thisArg, argArray) {
-                      setHttpStatus(span, res.statusCode);
-                      span.end();
-                      vercelWaitUntil(flushSafelyWithTimeout());
-                      return target.apply(thisArg, argArray);
-                    },
-                  });
-
                   try {
                     return await wrappingTarget.apply(thisArg, args);
                   } catch (e) {
@@ -110,7 +100,9 @@ export function wrapApiHandlerWithSentry(apiHandler: NextApiHandler, parameteriz
                     setHttpStatus(span, 500);
                     span.end();
 
-                    vercelWaitUntil(flushSafelyWithTimeout());
+                    // we need to await the flush here to ensure that the error is captured
+                    // as the runtime freezes as soon as the error is thrown below
+                    await flushSafelyWithTimeout();
 
                     // We rethrow here so that nextjs can do with the error whatever it would normally do. (Sometimes "whatever it
                     // would normally do" is to allow the error to bubble up to the global handlers - another reason we need to mark