From 0a772c1188196f156180b44b7afaaf00b00073eb Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 17 Jan 2025 17:12:49 +0100 Subject: [PATCH 1/2] test(node): Use https version of example.com in Node integration tests --- .../httpIntegration/server-ignoreOutgoingRequests.js | 10 +++++----- .../suites/tracing/httpIntegration/test.ts | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js index b42fa97fab08..73784862a7fa 100644 --- a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js +++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js @@ -11,7 +11,7 @@ Sentry.init({ integrations: [ Sentry.httpIntegration({ ignoreOutgoingRequests: (url, request) => { - if (url === 'http://example.com/blockUrl') { + if (url === 'https://example.com/blockUrl') { return true; } @@ -34,16 +34,16 @@ const app = express(); app.use(cors()); app.get('/testUrl', (_req, response) => { - makeHttpRequest('http://example.com/blockUrl').then(() => { - makeHttpRequest('http://example.com/pass').then(() => { + makeHttpRequest('https://example.com/blockUrl').then(() => { + makeHttpRequest('https://example.com/pass').then(() => { response.send({ response: 'done' }); }); }); }); app.get('/testRequest', (_req, response) => { - makeHttpRequest('http://example.com/blockRequest').then(() => { - makeHttpRequest('http://example.com/pass').then(() => { + makeHttpRequest('https://example.com/blockRequest').then(() => { + makeHttpRequest('https://example.com/pass').then(() => { response.send({ response: 'done' }); }); }); diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts index 7fc6a5f05efa..c3d72d4708c9 100644 --- a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts +++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts @@ -137,11 +137,11 @@ describe('httpIntegration', () => { const requestSpans = event.spans?.filter(span => span.op === 'http.client'); expect(requestSpans).toHaveLength(1); - expect(requestSpans![0]?.description).toBe('GET http://example.com/pass'); + 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('http://example.com/pass'); + expect(breadcrumbs![0]?.data?.url).toEqual('https://example.com/pass'); }, }) .start(done); @@ -157,11 +157,11 @@ describe('httpIntegration', () => { const requestSpans = event.spans?.filter(span => span.op === 'http.client'); expect(requestSpans).toHaveLength(1); - expect(requestSpans![0]?.description).toBe('GET http://example.com/pass'); + 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('http://example.com/pass'); + expect(breadcrumbs![0]?.data?.url).toEqual('https://example.com/pass'); }, }) .start(done); From b599b46796ecf5cc71436a261caccae90fb6a462 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 17 Jan 2025 18:03:15 +0100 Subject: [PATCH 2/2] fix test --- .../tracing/httpIntegration/server-ignoreOutgoingRequests.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js index 73784862a7fa..8c5c1472dcfa 100644 --- a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js +++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/server-ignoreOutgoingRequests.js @@ -1,6 +1,5 @@ const { loggingTransport } = require('@sentry-internal/node-integration-tests'); const Sentry = require('@sentry/node'); -const http = require('http'); Sentry.init({ dsn: 'https://public@dsn.ingest.sentry.io/1337', @@ -24,6 +23,8 @@ Sentry.init({ ], }); +const https = require('https'); + // express must be required after Sentry is initialized const express = require('express'); const cors = require('cors'); @@ -55,7 +56,7 @@ startExpressServerAndSendPortToRunner(app); function makeHttpRequest(url) { return new Promise((resolve, reject) => { - http + https .get(url, res => { res.on('data', () => {}); res.on('end', () => {