Skip to content

Commit

Permalink
test(node): Remove last example.com requests in node integration tests (
Browse files Browse the repository at this point in the history
#15333)

Refactors two flaky Node integration tests that made requests to
example.com. Now we just spin up our own test server instead.
  • Loading branch information
Lms24 authored Feb 7, 2025
1 parent cbc9da9 commit dd55860
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 42 deletions.
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -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;
Expand All @@ -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');
Expand All @@ -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' });
});
});
Expand All @@ -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', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { createTestServer } from '../../../utils/server';

describe('httpIntegration', () => {
afterAll(() => {
Expand Down Expand Up @@ -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');
});
});
});
});

0 comments on commit dd55860

Please sign in to comment.