test(node): Remove last example.com requests in node integration tests

dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js

@@ -1,6 +1,8 @@
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
 const Sentry = require('@sentry/node');
 
+const url = process.env.SERVER_URL;
+
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
@@ -10,11 +12,11 @@ Sentry.init({
   integrations: [
     Sentry.httpIntegration({
       ignoreOutgoingRequests: (url, request) => {
-        if (url === 'https://example.com/blockUrl') {
+        if (url.endsWith('/blockUrl')) {
           return true;
         }
 
-        if (request.hostname === 'example.com' && request.path === '/blockRequest') {
+        if (request.path === '/blockRequest') {
           return true;
         }
         return false;
@@ -23,7 +25,7 @@ Sentry.init({
   ],
 });
 
-const https = require('https');
+const http = require('http');
 
 // express must be required after Sentry is initialized
 const express = require('express');
@@ -35,16 +37,16 @@ const app = express();
 app.use(cors());
 
 app.get('/testUrl', (_req, response) => {
-  makeHttpRequest('https://example.com/blockUrl').then(() => {
-    makeHttpRequest('https://example.com/pass').then(() => {
+  makeHttpRequest(`${url}/blockUrl`).then(() => {
+    makeHttpRequest(`${url}/pass`).then(() => {
       response.send({ response: 'done' });
     });
   });
 });
 
 app.get('/testRequest', (_req, response) => {
-  makeHttpRequest('https://example.com/blockRequest').then(() => {
-    makeHttpRequest('https://example.com/pass').then(() => {
+  makeHttpRequest(`${url}/blockRequest`).then(() => {
+    makeHttpRequest(`${url}/pass`).then(() => {
       response.send({ response: 'done' });
     });
   });
@@ -56,7 +58,7 @@ startExpressServerAndSendPortToRunner(app);
 
 function makeHttpRequest(url) {
   return new Promise((resolve, reject) => {
-    https
+    http
       .get(url, res => {
         res.on('data', () => {});
         res.on('end', () => {

dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts

@@ -1,4 +1,5 @@
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+import { createTestServer } from '../../../utils/server';
 
 describe('httpIntegration', () => {
   afterAll(() => {
@@ -130,43 +131,55 @@ describe('httpIntegration', () => {
 
   describe("doesn't create child spans or breadcrumbs for outgoing requests ignored via `ignoreOutgoingRequests`", () => {
     test('via the url param', done => {
-      const runner = createRunner(__dirname, 'server-ignoreOutgoingRequests.js')
-        .expect({
-          transaction: event => {
-            expect(event.transaction).toBe('GET /testUrl');
-
-            const requestSpans = event.spans?.filter(span => span.op === 'http.client');
-            expect(requestSpans).toHaveLength(1);
-            expect(requestSpans![0]?.description).toBe('GET https://example.com/pass');
-
-            const breadcrumbs = event.breadcrumbs?.filter(b => b.category === 'http');
-            expect(breadcrumbs).toHaveLength(1);
-            expect(breadcrumbs![0]?.data?.url).toEqual('https://example.com/pass');
-          },
-        })
-        .start(done);
-
-      runner.makeRequest('get', '/testUrl');
+      createTestServer(done)
+        .get('/blockUrl', () => {}, 200)
+        .get('/pass', () => {}, 200)
+        .start()
+        .then(([SERVER_URL, closeTestServer]) => {
+          createRunner(__dirname, 'server-ignoreOutgoingRequests.js')
+            .withEnv({ SERVER_URL })
+            .expect({
+              transaction: event => {
+                expect(event.transaction).toBe('GET /testUrl');
+
+                const requestSpans = event.spans?.filter(span => span.op === 'http.client');
+                expect(requestSpans).toHaveLength(1);
+                expect(requestSpans![0]?.description).toBe(`GET ${SERVER_URL}/pass`);
+
+                const breadcrumbs = event.breadcrumbs?.filter(b => b.category === 'http');
+                expect(breadcrumbs).toHaveLength(1);
+                expect(breadcrumbs![0]?.data?.url).toEqual(`${SERVER_URL}/pass`);
+              },
+            })
+            .start(closeTestServer)
+            .makeRequest('get', '/testUrl');
+        });
     });
 
     test('via the request param', done => {
-      const runner = createRunner(__dirname, 'server-ignoreOutgoingRequests.js')
-        .expect({
-          transaction: event => {
-            expect(event.transaction).toBe('GET /testRequest');
-
-            const requestSpans = event.spans?.filter(span => span.op === 'http.client');
-            expect(requestSpans).toHaveLength(1);
-            expect(requestSpans![0]?.description).toBe('GET https://example.com/pass');
-
-            const breadcrumbs = event.breadcrumbs?.filter(b => b.category === 'http');
-            expect(breadcrumbs).toHaveLength(1);
-            expect(breadcrumbs![0]?.data?.url).toEqual('https://example.com/pass');
-          },
-        })
-        .start(done);
-
-      runner.makeRequest('get', '/testRequest');
+      createTestServer(done)
+        .get('/blockUrl', () => {}, 200)
+        .get('/pass', () => {}, 200)
+        .start()
+        .then(([SERVER_URL, closeTestServer]) => {
+          createRunner(__dirname, 'server-ignoreOutgoingRequests.js')
+            .withEnv({ SERVER_URL })
+            .expect({
+              transaction: event => {
+                expect(event.transaction).toBe('GET /testRequest');
+
+                const requestSpans = event.spans?.filter(span => span.op === 'http.client');
+                expect(requestSpans).toHaveLength(1);
+                expect(requestSpans![0]?.description).toBe(`GET ${SERVER_URL}/pass`);
+
+                const breadcrumbs = event.breadcrumbs?.filter(b => b.category === 'http');
+                expect(breadcrumbs).toHaveLength(1);
+                expect(breadcrumbs![0]?.data?.url).toEqual(`${SERVER_URL}/pass`);
+              },
+            })
+            .start(closeTestServer)
+            .makeRequest('get', '/testRequest');
+        });
     });
   });
 });