From 325d434b519198020c32a081d992113dd573f575 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Fri, 18 Oct 2024 11:12:25 +0200
Subject: [PATCH 1/2] test(node): Fix test runner

---
 dev-packages/node-integration-tests/utils/server.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-packages/node-integration-tests/utils/server.ts b/dev-packages/node-integration-tests/utils/server.ts
index 71a7adf9798f..5f9afeeb556d 100644
--- a/dev-packages/node-integration-tests/utils/server.ts
+++ b/dev-packages/node-integration-tests/utils/server.ts
@@ -70,9 +70,9 @@ export function createTestServer(done: (error?: unknown) => void) {
           const address = server.address() as AddressInfo;
           resolve([
             `http://localhost:${address.port}`,
-            () => {
+            (error?: unknown) => {
               server.close();
-              done();
+              done(error);
             },
           ]);
         });

From f2284713b164739dd8161117bd548e7b9b51f2a1 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Fri, 18 Oct 2024 11:38:18 +0200
Subject: [PATCH 2/2] Fix broken tests

---
 .../tracing/requests/fetch-breadcrumbs/scenario.ts       | 1 +
 .../suites/tracing/requests/http-no-tracing/scenario.ts  | 9 +++++++++
 .../suites/tracing/requests/http-no-tracing/test.ts      | 8 ++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-breadcrumbs/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-breadcrumbs/scenario.ts
index eff91b2cd3e4..8d704042a8ce 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-breadcrumbs/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-breadcrumbs/scenario.ts
@@ -7,6 +7,7 @@ Sentry.init({
   tracePropagationTargets: [/\/v0/, 'v1'],
   integrations: [],
   transport: loggingTransport,
+  tracesSampleRate: 0.0,
   // Ensure this gets a correct hint
   beforeBreadcrumb(breadcrumb, hint) {
     breadcrumb.data = breadcrumb.data || {};
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts
index 1eb618d97dcc..3ae59e5ee6b7 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts
@@ -7,11 +7,20 @@ Sentry.init({
   tracePropagationTargets: [/\/v0/, 'v1'],
   integrations: [],
   transport: loggingTransport,
+  // Ensure this gets a correct hint
+  beforeBreadcrumb(breadcrumb, hint) {
+    breadcrumb.data = breadcrumb.data || {};
+    const req = hint?.request as { path?: string };
+    breadcrumb.data.ADDED_PATH = req?.path;
+    return breadcrumb;
+  },
 });
 
 import * as http from 'http';
 
 async function run(): Promise<void> {
+  Sentry.addBreadcrumb({ message: 'manual breadcrumb' });
+
   await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
   await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
   await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
index e65278c3efd5..3ab1090806cb 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
@@ -48,7 +48,7 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
                 data: {
                   'http.method': 'GET',
                   url: `${SERVER_URL}/api/v0`,
-                  status_code: 404,
+                  status_code: 200,
                   ADDED_PATH: '/api/v0',
                 },
                 timestamp: expect.any(Number),
@@ -59,7 +59,7 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
                 data: {
                   'http.method': 'GET',
                   url: `${SERVER_URL}/api/v1`,
-                  status_code: 404,
+                  status_code: 200,
                   ADDED_PATH: '/api/v1',
                 },
                 timestamp: expect.any(Number),
@@ -70,7 +70,7 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
                 data: {
                   'http.method': 'GET',
                   url: `${SERVER_URL}/api/v2`,
-                  status_code: 404,
+                  status_code: 200,
                   ADDED_PATH: '/api/v2',
                 },
                 timestamp: expect.any(Number),
@@ -81,7 +81,7 @@ test('outgoing http requests are correctly instrumented with tracing disabled',
                 data: {
                   'http.method': 'GET',
                   url: `${SERVER_URL}/api/v3`,
-                  status_code: 404,
+                  status_code: 200,
                   ADDED_PATH: '/api/v3',
                 },
                 timestamp: expect.any(Number),