add standard flush in cloudflare again

Author: s1gr1d

packages/cloudflare/src/handler.ts

@@ -1,6 +1,6 @@
 import {
   captureException,
-  flushIfServerless,
+  flush,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
@@ -74,6 +74,7 @@ export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostM
           const [event, env, context] = args;
           return withIsolationScope(isolationScope => {
             const options = getFinalOptions(optionsCallback(env), env);
+            const waitUntil = context.waitUntil.bind(context);
 
             const client = init({ ...options, ctx: context });
             isolationScope.setClient(client);
@@ -99,7 +100,7 @@ export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostM
                   captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
                   throw e;
                 } finally {
-                  await flushIfServerless({ cloudflareCtx: context });
+                  waitUntil(flush(2000));
                 }
               },
             );
@@ -116,6 +117,7 @@ export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostM
           const [emailMessage, env, context] = args;
           return withIsolationScope(isolationScope => {
             const options = getFinalOptions(optionsCallback(env), env);
+            const waitUntil = context.waitUntil.bind(context);
 
             const client = init({ ...options, ctx: context });
             isolationScope.setClient(client);
@@ -139,7 +141,7 @@ export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostM
                   captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
                   throw e;
                 } finally {
-                  await flushIfServerless({ cloudflareCtx: context });
+                  waitUntil(flush(2000));
                 }
               },
             );
@@ -157,6 +159,7 @@ export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostM
 
           return withIsolationScope(isolationScope => {
             const options = getFinalOptions(optionsCallback(env), env);
+            const waitUntil = context.waitUntil.bind(context);
 
             const client = init({ ...options, ctx: context });
             isolationScope.setClient(client);
@@ -188,7 +191,7 @@ export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostM
                   captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
                   throw e;
                 } finally {
-                  await flushIfServerless({ cloudflareCtx: context });
+                  waitUntil(flush(2000));
                 }
               },
             );
@@ -207,6 +210,8 @@ export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostM
           return withIsolationScope(async isolationScope => {
             const options = getFinalOptions(optionsCallback(env), env);
 
+            const waitUntil = context.waitUntil.bind(context);
+
             const client = init({ ...options, ctx: context });
             isolationScope.setClient(client);
 
@@ -218,7 +223,7 @@ export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostM
               captureException(e, { mechanism: { handled: false, type: 'cloudflare' } });
               throw e;
             } finally {
-              await flushIfServerless({ cloudflareCtx: context });
+              waitUntil(flush(2000));
             }
           });
         },