From 3a15746e7c143cb1cba68e1019aa8578d3e6d608 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Mon, 27 May 2024 11:56:25 -0400
Subject: [PATCH 1/2] chore: Remove express integration comment from e2e tests

---
 .../multiple-routers/common-infix-parameterized/server.ts      | 3 ---
 .../suites/express/multiple-routers/common-infix/server.ts     | 3 ---
 .../common-prefix-parameterized-reverse/server.ts              | 3 ---
 .../common-prefix-same-length-parameterized copy/server.ts     | 3 ---
 .../common-prefix-same-length-parameterized/server.ts          | 3 ---
 .../suites/express/multiple-routers/common-prefix/server.ts    | 3 ---
 6 files changed, 18 deletions(-)

diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts
index c41ce7e3ae1a..673c146e9d8c 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts
@@ -4,9 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  integrations: [
-    // TODO: This used to have the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts
index 0e97e7fe4718..eff1564d3f0a 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts
@@ -4,9 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  integrations: [
-    // TODO: This used to have the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts
index 31f41de294d5..755a32bf4389 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts
@@ -4,9 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  integrations: [
-    // TODO: This used to have the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts
index a006358edc25..654afa3b8c8d 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts	
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts	
@@ -4,9 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  integrations: [
-    // TODO: This used to have the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts
index a85ef02682d6..017c810ed842 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts
@@ -4,9 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  integrations: [
-    // TODO: This used to have the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts
index 4c03905d5d2a..497cbf2efffb 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts
@@ -4,9 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  integrations: [
-    // TODO: This used to have the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });

From 77c4b49e588b53f3e3b133cc602c823224d8ef6c Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Mon, 27 May 2024 11:58:52 -0400
Subject: [PATCH 2/2] more todo removed

---
 .../multiple-routers/common-prefix-parameterized/server.ts     | 3 ---
 .../suites/express/multiple-routers/complex-router/server.ts   | 3 ---
 .../multiple-routers/middle-layer-parameterized/server.ts      | 3 ---
 .../suites/express/sentry-trace/baggage-header-out/server.ts   | 3 ---
 .../baggage-other-vendors-with-sentry-entries/server.ts        | 3 ---
 .../express/sentry-trace/baggage-other-vendors/server.ts       | 3 ---
 .../express/sentry-trace/baggage-transaction-name/server.ts    | 3 ---
 .../suites/express/sentry-trace/server.ts                      | 3 ---
 .../suites/express/sentry-trace/trace-header-assign/server.ts  | 3 ---
 9 files changed, 27 deletions(-)

diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts
index f24e8754cb89..7db74e8e3dea 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts
@@ -4,9 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  integrations: [
-    // TODO: This used to use the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/server.ts
index bdc8c03d176e..b7ffeeba937a 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/server.ts
@@ -4,9 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  integrations: [
-    // TODO: This used to use the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/server.ts
index 0d005f1c55d7..12a00ce4e1db 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/server.ts
@@ -4,9 +4,6 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
-  integrations: [
-    // TODO: This used to use the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts
index a4a9bf108a95..07c21c8d21ea 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts
@@ -8,9 +8,6 @@ Sentry.init({
   release: '1.0',
   environment: 'prod',
   tracePropagationTargets: [/^(?!.*express).*$/],
-  integrations: [
-    // TODO: This used to use the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
index 92abb2444294..260fb34af5c2 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
@@ -9,9 +9,6 @@ Sentry.init({
   environment: 'prod',
   // disable requests to /express
   tracePropagationTargets: [/^(?!.*express).*$/],
-  integrations: [
-    // TODO: This used to use the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts
index effc44c2b248..1c00fbd72bde 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts
@@ -9,9 +9,6 @@ Sentry.init({
   environment: 'prod',
   // disable requests to /express
   tracePropagationTargets: [/^(?!.*express).*$/],
-  integrations: [
-    // TODO: This used to use the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts
index ed8f7487a9c3..80bb7b38a39a 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts
@@ -9,9 +9,6 @@ Sentry.init({
   environment: 'prod',
   // disable requests to /express
   tracePropagationTargets: [/^(?!.*express).*$/],
-  integrations: [
-    // TODO: This used to use the Express integration
-  ],
   tracesSampleRate: 1.0,
   // TODO: We're rethinking the mechanism for including Pii data in DSC, hence commenting out sendDefaultPii for now
   // sendDefaultPii: true,
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/server.ts
index b9218b905e9e..6ebc2d4cac95 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/server.ts
@@ -8,9 +8,6 @@ Sentry.init({
   release: '1.0',
   environment: 'prod',
   tracePropagationTargets: [/^(?!.*express).*$/],
-  integrations: [
-    // TODO: This used to use the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/server.ts
index f1393c3cfc5b..1cc4a0dcc639 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/server.ts
@@ -7,9 +7,6 @@ Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   environment: 'prod',
-  integrations: [
-    // TODO: This used to use the Express integration
-  ],
   tracesSampleRate: 1.0,
   transport: loggingTransport,
 });