From 2f601fa46b4b2d832b6cfdd23e8a524003bad247 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Tue, 6 Aug 2024 12:21:40 +0000
Subject: [PATCH 1/2] test: Fix flakey integration test

https://github.com/getsentry/sentry-javascript/actions/runs/10263576392/job/28396005694
---
 .../suites/express/multiple-init/server.ts                 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts
index aade87fe3bcf..a1579d0ba63f 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts
@@ -52,7 +52,12 @@ app.get('/test/error/:id', (req, res) => {
 
   Sentry.captureException(new Error(`This is an exception ${id}`));
 
-  res.send({});
+  setTimeout(() => {
+    // We flush to ensure we are sending exceptions in a certain order
+    Sentry.flush(3000).finally(() => {
+      res.send({});
+    });
+  }, 1000);
 });
 
 Sentry.setupExpressErrorHandler(app);

From 60819066dcfa5b6c06d0ba85a41f505eb696e995 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Tue, 6 Aug 2024 14:06:25 +0000
Subject: [PATCH 2/2] .

---
 .../suites/express/multiple-init/server.ts            | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts
index a1579d0ba63f..4d1625035ebf 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts
@@ -54,9 +54,14 @@ app.get('/test/error/:id', (req, res) => {
 
   setTimeout(() => {
     // We flush to ensure we are sending exceptions in a certain order
-    Sentry.flush(3000).finally(() => {
-      res.send({});
-    });
+    Sentry.flush(3000).then(
+      () => {
+        res.send({});
+      },
+      () => {
+        res.send({});
+      },
+    );
   }, 1000);
 });