test(node): Remove axios in favor of using fetch#16172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mydea merged 2 commits into from
Apr 30, 2025
Merged

test(node): Remove axios in favor of using fetch#16172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3032a21
test(node): Remove `axios` in favor of using `fetch`
mydea Apr 30, 2025
0b46cb6
remove done usages
mydea Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dev-packages/node-integration-tests/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,6 @@
"ai": "^4.0.6",
"amqplib": "^0.10.7",
"apollo-server": "^3.11.1",
"axios": "^1.7.7",
"body-parser": "^1.20.3",
"connect": "^3.7.0",
"cors": "^2.8.5",
Expand Down
29 changes: 18 additions & 11 deletions dev-packages/node-integration-tests/suites/express-v5/tracing/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,8 @@ describe('express tracing', () => {

test.each([['array1'], ['array5']])(
'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -101,9 +101,10 @@ describe('express tracing', () => {
},
},
})
.start(done)
.makeRequest('get', `/test/${segment}`);
}) as any,
.start();
await runner.makeRequest('get', `/test/${segment}`);
await runner.completed();
},
);

test.each([
Expand All@@ -113,8 +114,8 @@ describe('express tracing', () => {
['arr/requiredPath'],
['arr/required/lastParam'],
['arr55/required/lastParam'],
])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
createRunner(__dirname, 'server.js')
])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -135,9 +136,10 @@ describe('express tracing', () => {
},
},
})
.start(done)
.makeRequest('get', `/test/${segment}`);
}) as any);
.start();
await runner.makeRequest('get', `/test/${segment}`);
await runner.completed();
});

describe('request data', () => {
test('correctly captures JSON request data', async () => {
Expand All@@ -161,7 +163,12 @@ describe('express tracing', () => {
})
.start();

runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
runner.makeRequest('post', '/test-post', {
data: JSON.stringify({ foo: 'bar', other: 1 }),
headers: {
'Content-Type': 'application/json',
},
});
await runner.completed();
});

Expand Down
7 changes: 6 additions & 1 deletion dev-packages/node-integration-tests/suites/express-v5/without-tracing/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
})
.start();

runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
runner.makeRequest('post', '/test-post', {
headers: {
'Content-Type': 'application/json',
},
data: JSON.stringify({ foo: 'bar', other: 1 }),
});
await runner.completed();
});

Expand Down
29 changes: 18 additions & 11 deletions dev-packages/node-integration-tests/suites/express/tracing/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,8 @@ describe('express tracing', () => {

test.each([['array1'], ['array5']])(
'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -102,9 +102,10 @@ describe('express tracing', () => {
},
},
})
.start(done)
.makeRequest('get', `/test/${segment}`);
}) as any,
.start();
await runner.makeRequest('get', `/test/${segment}`);
await runner.completed();
},
);

test.each([
Expand All@@ -116,8 +117,8 @@ describe('express tracing', () => {
['arr55/required/lastParam'],
['arr/requiredPath/optionalPath/'],
['arr/requiredPath/optionalPath/lastParam'],
])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
createRunner(__dirname, 'server.js')
])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
.expect({
transaction: {
transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -138,9 +139,10 @@ describe('express tracing', () => {
},
},
})
.start(done)
.makeRequest('get', `/test/${segment}`);
}) as any);
.start();
await runner.makeRequest('get', `/test/${segment}`);
await runner.completed();
});

describe('request data', () => {
test('correctly captures JSON request data', async () => {
Expand All@@ -164,7 +166,12 @@ describe('express tracing', () => {
})
.start();

runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
runner.makeRequest('post', '/test-post', {
headers: {
'Content-Type': 'application/json',
},
data: JSON.stringify({ foo: 'bar', other: 1 }),
});
await runner.completed();
});

Expand Down
7 changes: 6 additions & 1 deletion dev-packages/node-integration-tests/suites/express/without-tracing/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
})
.start();

runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
runner.makeRequest('post', '/test-post', {
headers: {
'Content-Type': 'application/json',
},
data: JSON.stringify({ foo: 'bar', other: 1 }),
});
await runner.completed();
});

Expand Down
24 changes: 10 additions & 14 deletions dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,14 @@ describe('getTraceMetaTags', () => {

const runner = createRunner(__dirname, 'server.js').start();

const response = await runner.makeRequest('get', '/test', {
const response = await runner.makeRequest<{ response: string }>('get', '/test', {
headers: {
'sentry-trace': `${traceId}-${parentSpanId}-1`,
baggage: 'sentry-environment=production,sentry-sample_rand=0.42',
},
});

// @ts-ignore - response is defined, types just don't reflect it
const html = response?.response as unknown as string;
const html = response?.response;

expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
Expand All@@ -29,12 +28,11 @@ describe('getTraceMetaTags', () => {
test('injects <meta> tags with new trace if no incoming headers', async () => {
const runner = createRunner(__dirname, 'server.js').start();

const response = await runner.makeRequest('get', '/test');
const response = await runner.makeRequest<{ response: string }>('get', '/test');

// @ts-ignore - response is defined, types just don't reflect it
const html = response?.response as unknown as string;
const html = response?.response;

const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
expect(traceId).not.toBeUndefined();

expect(html).toContain('<meta name="baggage"');
Expand All@@ -44,12 +42,11 @@ describe('getTraceMetaTags', () => {
test('injects <meta> tags with negative sampling decision if tracesSampleRate is 0', async () => {
const runner = createRunner(__dirname, 'server-tracesSampleRate-zero.js').start();

const response = await runner.makeRequest('get', '/test');
const response = await runner.makeRequest<{ response: string }>('get', '/test');

// @ts-ignore - response is defined, types just don't reflect it
const html = response?.response as unknown as string;
const html = response?.response;

const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
expect(traceId).not.toBeUndefined();

expect(html).toContain('<meta name="baggage"');
Expand All@@ -63,15 +60,14 @@ describe('getTraceMetaTags', () => {

const runner = createRunner(__dirname, 'server-sdk-disabled.js').start();

const response = await runner.makeRequest('get', '/test', {
const response = await runner.makeRequest<{ response: string }>('get', '/test', {
headers: {
'sentry-trace': `${traceId}-${parentSpanId}-1`,
baggage: 'sentry-environment=production',
},
});

// @ts-ignore - response is defined, types just don't reflect it
const html = response?.response as unknown as string;
const html = response?.response;

expect(html).not.toContain('"sentry-trace"');
expect(html).not.toContain('"baggage"');
Expand Down
26 changes: 18 additions & 8 deletions dev-packages/node-integration-tests/utils/runner.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import type {
TransactionEvent,
} from '@sentry/core';
import { normalize } from '@sentry/core';
import axios from 'axios';
import { execSync, spawn, spawnSync } from 'child_process';
import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -161,7 +160,7 @@ type StartResult = {
makeRequest<T>(
method: 'get' | 'post',
path: string,
options?: { headers?: Record<string, string>; data?: unknown; expectError?: boolean },
options?: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean },
): Promise<T | undefined>;
};

Expand DownExpand Up@@ -532,7 +531,7 @@ export function createRunner(...paths: string[]) {
makeRequest: async function <T>(
method: 'get' | 'post',
path: string,
options: { headers?: Record<string, string>; data?: unknown; expectError?: boolean } = {},
options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
): Promise<T | undefined> {
try {
await waitFor(() => scenarioServerPort !== undefined, 10_000, 'Timed out waiting for server port');
Expand All@@ -542,22 +541,33 @@ export function createRunner(...paths: string[]) {
}

const url = `http://localhost:${scenarioServerPort}${path}`;
const data = options.data;
const body = options.data;
const headers = options.headers || {};
const expectError = options.expectError || false;

if (process.env.DEBUG) log('making request', method, url, headers, data);
if (process.env.DEBUG) log('making request', method, url, headers, body);

try {
const res =
method === 'post' ? await axios.post(url, data, { headers }) : await axios.get(url, { headers });
const res = await fetch(url, { headers, method, body });

if (!res.ok) {
if (!expectError) {
complete(new Error(`Expected request to "${path}" to succeed, but got a ${res.status} response`));
}

return;
}

if (expectError) {
complete(new Error(`Expected request to "${path}" to fail, but got a ${res.status} response`));
return;
}

return res.data;
if (res.headers.get('content-type')?.includes('application/json')) {
return await res.json();
}

return (await res.text()) as T;
} catch (e) {
if (expectError) {
return;
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,7 +10168,7 @@ aws-ssl-profiles@^1.1.1:
resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==

axios@1.8.2, axios@^1.0.0, axios@^1.7.7:
axios@1.8.2, axios@^1.0.0:
version "1.8.2"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
test(node): Remove axios in favor of using fetch#16172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 2 commits into

from

Apr 30, 2025
 Merged


test(node): Remove axios in favor of using fetch#16172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3032a21

test(node): Remove `axios` in favor of using `fetch`


mydea Apr 30, 2025
0b46cb6

remove done usages


mydea Apr 30, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/node-integration-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,6 @@
 "ai": "^4.0.6",
 "amqplib": "^0.10.7",
 "apollo-server": "^3.11.1",
 "axios": "^1.7.7",
 "body-parser": "^1.20.3",
 "connect": "^3.7.0",
 "cors": "^2.8.5",
Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -101,9 +101,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -113,8 +114,8 @@ describe('express tracing', () => {
 ['arr/requiredPath'],
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -135,9 +136,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -161,7 +163,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 headers: {
 'Content-Type': 'application/json',
 },
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -102,9 +102,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -116,8 +117,8 @@ describe('express tracing', () => {
 ['arr55/required/lastParam'],
 ['arr/requiredPath/optionalPath/'],
 ['arr/requiredPath/optionalPath/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -138,9 +139,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -164,7 +166,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

24 changes: 10 additions & 14 deletions
dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production,sentry-sample_rand=0.42',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
 expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
Expand All@@ -29,12 +28,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with new trace if no incoming headers', async () => {
 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -44,12 +42,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with negative sampling decision if tracesSampleRate is 0', async () => {
 const runner = createRunner(__dirname, 'server-tracesSampleRate-zero.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -63,15 +60,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server-sdk-disabled.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).not.toContain('"sentry-trace"');
 expect(html).not.toContain('"baggage"');
Expand Down

26 changes: 18 additions & 8 deletions
dev-packages/node-integration-tests/utils/runner.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import type {
 TransactionEvent,
} from '@sentry/core';
import { normalize } from '@sentry/core';
import axios from 'axios';
import { execSync, spawn, spawnSync } from 'child_process';
import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -161,7 +160,7 @@ type StartResult = {
 makeRequest<T>(
 method: 'get' | 'post',
 path: string,
 options?: { headers?: Record<string, string>; data?: unknown; expectError?: boolean },
 options?: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean },
 ): Promise<T | undefined>;
};

Expand DownExpand Up@@ -532,7 +531,7 @@ export function createRunner(...paths: string[]) {
 makeRequest: async function <T>(
 method: 'get' | 'post',
 path: string,
 options: { headers?: Record<string, string>; data?: unknown; expectError?: boolean } = {},
 options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
 ): Promise<T | undefined> {
 try {
 await waitFor(() => scenarioServerPort !== undefined, 10_000, 'Timed out waiting for server port');
Expand All@@ -542,22 +541,33 @@ export function createRunner(...paths: string[]) {
 }

 const url = `http://localhost:${scenarioServerPort}${path}`;
 const data = options.data;
 const body = options.data;
 const headers = options.headers || {};
 const expectError = options.expectError || false;

 if (process.env.DEBUG) log('making request', method, url, headers, data);
 if (process.env.DEBUG) log('making request', method, url, headers, body);

 try {
 const res =
 method === 'post' ? await axios.post(url, data, { headers }) : await axios.get(url, { headers });
 const res = await fetch(url, { headers, method, body });

 if (!res.ok) {
 if (!expectError) {
 complete(new Error(`Expected request to "${path}" to succeed, but got a ${res.status} response`));
 }

 return;
 }

 if (expectError) {
 complete(new Error(`Expected request to "${path}" to fail, but got a ${res.status} response`));
 return;
 }

 return res.data;
 if (res.headers.get('content-type')?.includes('application/json')) {
 return await res.json();
 }

 return (await res.text()) as T;
 } catch (e) {
 if (expectError) {
 return;
Expand Down

2 changes: 1 addition & 1 deletion
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,7 +10168,7 @@ aws-ssl-profiles@^1.1.1:
 resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
 integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==

axios@1.8.2, axios@^1.0.0, axios@^1.7.7:
axios@1.8.2, axios@^1.0.0:
 version "1.8.2"
 resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
 integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(node): Remove axios in favor of using fetch#16172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 2 commits into

from

Apr 30, 2025
 Merged


test(node): Remove axios in favor of using fetch#16172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3032a21

test(node): Remove `axios` in favor of using `fetch`


mydea Apr 30, 2025
0b46cb6

remove done usages


mydea Apr 30, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/node-integration-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,6 @@
 "ai": "^4.0.6",
 "amqplib": "^0.10.7",
 "apollo-server": "^3.11.1",
 "axios": "^1.7.7",
 "body-parser": "^1.20.3",
 "connect": "^3.7.0",
 "cors": "^2.8.5",
Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -101,9 +101,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -113,8 +114,8 @@ describe('express tracing', () => {
 ['arr/requiredPath'],
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -135,9 +136,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -161,7 +163,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 headers: {
 'Content-Type': 'application/json',
 },
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -102,9 +102,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -116,8 +117,8 @@ describe('express tracing', () => {
 ['arr55/required/lastParam'],
 ['arr/requiredPath/optionalPath/'],
 ['arr/requiredPath/optionalPath/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -138,9 +139,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -164,7 +166,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

24 changes: 10 additions & 14 deletions
dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production,sentry-sample_rand=0.42',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
 expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
Expand All@@ -29,12 +28,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with new trace if no incoming headers', async () => {
 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -44,12 +42,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with negative sampling decision if tracesSampleRate is 0', async () => {
 const runner = createRunner(__dirname, 'server-tracesSampleRate-zero.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -63,15 +60,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server-sdk-disabled.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).not.toContain('"sentry-trace"');
 expect(html).not.toContain('"baggage"');
Expand Down

26 changes: 18 additions & 8 deletions
dev-packages/node-integration-tests/utils/runner.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import type {
 TransactionEvent,
} from '@sentry/core';
import { normalize } from '@sentry/core';
import axios from 'axios';
import { execSync, spawn, spawnSync } from 'child_process';
import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -161,7 +160,7 @@ type StartResult = {
 makeRequest<T>(
 method: 'get' | 'post',
 path: string,
 options?: { headers?: Record<string, string>; data?: unknown; expectError?: boolean },
 options?: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean },
 ): Promise<T | undefined>;
};

Expand DownExpand Up@@ -532,7 +531,7 @@ export function createRunner(...paths: string[]) {
 makeRequest: async function <T>(
 method: 'get' | 'post',
 path: string,
 options: { headers?: Record<string, string>; data?: unknown; expectError?: boolean } = {},
 options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
 ): Promise<T | undefined> {
 try {
 await waitFor(() => scenarioServerPort !== undefined, 10_000, 'Timed out waiting for server port');
Expand All@@ -542,22 +541,33 @@ export function createRunner(...paths: string[]) {
 }

 const url = `http://localhost:${scenarioServerPort}${path}`;
 const data = options.data;
 const body = options.data;
 const headers = options.headers || {};
 const expectError = options.expectError || false;

 if (process.env.DEBUG) log('making request', method, url, headers, data);
 if (process.env.DEBUG) log('making request', method, url, headers, body);

 try {
 const res =
 method === 'post' ? await axios.post(url, data, { headers }) : await axios.get(url, { headers });
 const res = await fetch(url, { headers, method, body });

 if (!res.ok) {
 if (!expectError) {
 complete(new Error(`Expected request to "${path}" to succeed, but got a ${res.status} response`));
 }

 return;
 }

 if (expectError) {
 complete(new Error(`Expected request to "${path}" to fail, but got a ${res.status} response`));
 return;
 }

 return res.data;
 if (res.headers.get('content-type')?.includes('application/json')) {
 return await res.json();
 }

 return (await res.text()) as T;
 } catch (e) {
 if (expectError) {
 return;
Expand Down

2 changes: 1 addition & 1 deletion
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,7 +10168,7 @@ aws-ssl-profiles@^1.1.1:
 resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
 integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==

axios@1.8.2, axios@^1.0.0, axios@^1.7.7:
axios@1.8.2, axios@^1.0.0:
 version "1.8.2"
 resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
 integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(node): Remove axios in favor of using fetch#16172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 2 commits into

from

Apr 30, 2025
 Merged


test(node): Remove axios in favor of using fetch#16172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3032a21

test(node): Remove `axios` in favor of using `fetch`


mydea Apr 30, 2025
0b46cb6

remove done usages


mydea Apr 30, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/node-integration-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,6 @@
 "ai": "^4.0.6",
 "amqplib": "^0.10.7",
 "apollo-server": "^3.11.1",
 "axios": "^1.7.7",
 "body-parser": "^1.20.3",
 "connect": "^3.7.0",
 "cors": "^2.8.5",
Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -101,9 +101,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -113,8 +114,8 @@ describe('express tracing', () => {
 ['arr/requiredPath'],
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -135,9 +136,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -161,7 +163,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 headers: {
 'Content-Type': 'application/json',
 },
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -102,9 +102,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -116,8 +117,8 @@ describe('express tracing', () => {
 ['arr55/required/lastParam'],
 ['arr/requiredPath/optionalPath/'],
 ['arr/requiredPath/optionalPath/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -138,9 +139,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -164,7 +166,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

24 changes: 10 additions & 14 deletions
dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production,sentry-sample_rand=0.42',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
 expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
Expand All@@ -29,12 +28,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with new trace if no incoming headers', async () => {
 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -44,12 +42,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with negative sampling decision if tracesSampleRate is 0', async () => {
 const runner = createRunner(__dirname, 'server-tracesSampleRate-zero.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -63,15 +60,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server-sdk-disabled.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).not.toContain('"sentry-trace"');
 expect(html).not.toContain('"baggage"');
Expand Down

26 changes: 18 additions & 8 deletions
dev-packages/node-integration-tests/utils/runner.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import type {
 TransactionEvent,
} from '@sentry/core';
import { normalize } from '@sentry/core';
import axios from 'axios';
import { execSync, spawn, spawnSync } from 'child_process';
import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -161,7 +160,7 @@ type StartResult = {
 makeRequest<T>(
 method: 'get' | 'post',
 path: string,
 options?: { headers?: Record<string, string>; data?: unknown; expectError?: boolean },
 options?: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean },
 ): Promise<T | undefined>;
};

Expand DownExpand Up@@ -532,7 +531,7 @@ export function createRunner(...paths: string[]) {
 makeRequest: async function <T>(
 method: 'get' | 'post',
 path: string,
 options: { headers?: Record<string, string>; data?: unknown; expectError?: boolean } = {},
 options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
 ): Promise<T | undefined> {
 try {
 await waitFor(() => scenarioServerPort !== undefined, 10_000, 'Timed out waiting for server port');
Expand All@@ -542,22 +541,33 @@ export function createRunner(...paths: string[]) {
 }

 const url = `http://localhost:${scenarioServerPort}${path}`;
 const data = options.data;
 const body = options.data;
 const headers = options.headers || {};
 const expectError = options.expectError || false;

 if (process.env.DEBUG) log('making request', method, url, headers, data);
 if (process.env.DEBUG) log('making request', method, url, headers, body);

 try {
 const res =
 method === 'post' ? await axios.post(url, data, { headers }) : await axios.get(url, { headers });
 const res = await fetch(url, { headers, method, body });

 if (!res.ok) {
 if (!expectError) {
 complete(new Error(`Expected request to "${path}" to succeed, but got a ${res.status} response`));
 }

 return;
 }

 if (expectError) {
 complete(new Error(`Expected request to "${path}" to fail, but got a ${res.status} response`));
 return;
 }

 return res.data;
 if (res.headers.get('content-type')?.includes('application/json')) {
 return await res.json();
 }

 return (await res.text()) as T;
 } catch (e) {
 if (expectError) {
 return;
Expand Down

2 changes: 1 addition & 1 deletion
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,7 +10168,7 @@ aws-ssl-profiles@^1.1.1:
 resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
 integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==

axios@1.8.2, axios@^1.0.0, axios@^1.7.7:
axios@1.8.2, axios@^1.0.0:
 version "1.8.2"
 resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
 integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
test(node): Remove axios in favor of using fetch#16172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 2 commits into

from

Apr 30, 2025
 Merged


test(node): Remove axios in favor of using fetch#16172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3032a21

test(node): Remove `axios` in favor of using `fetch`


mydea Apr 30, 2025
0b46cb6

remove done usages


mydea Apr 30, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/node-integration-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,6 @@
 "ai": "^4.0.6",
 "amqplib": "^0.10.7",
 "apollo-server": "^3.11.1",
 "axios": "^1.7.7",
 "body-parser": "^1.20.3",
 "connect": "^3.7.0",
 "cors": "^2.8.5",
Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -101,9 +101,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -113,8 +114,8 @@ describe('express tracing', () => {
 ['arr/requiredPath'],
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -135,9 +136,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -161,7 +163,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 headers: {
 'Content-Type': 'application/json',
 },
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -102,9 +102,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -116,8 +117,8 @@ describe('express tracing', () => {
 ['arr55/required/lastParam'],
 ['arr/requiredPath/optionalPath/'],
 ['arr/requiredPath/optionalPath/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -138,9 +139,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -164,7 +166,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

24 changes: 10 additions & 14 deletions
dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production,sentry-sample_rand=0.42',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
 expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
Expand All@@ -29,12 +28,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with new trace if no incoming headers', async () => {
 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -44,12 +42,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with negative sampling decision if tracesSampleRate is 0', async () => {
 const runner = createRunner(__dirname, 'server-tracesSampleRate-zero.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -63,15 +60,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server-sdk-disabled.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).not.toContain('"sentry-trace"');
 expect(html).not.toContain('"baggage"');
Expand Down

26 changes: 18 additions & 8 deletions
dev-packages/node-integration-tests/utils/runner.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import type {
 TransactionEvent,
} from '@sentry/core';
import { normalize } from '@sentry/core';
import axios from 'axios';
import { execSync, spawn, spawnSync } from 'child_process';
import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -161,7 +160,7 @@ type StartResult = {
 makeRequest<T>(
 method: 'get' | 'post',
 path: string,
 options?: { headers?: Record<string, string>; data?: unknown; expectError?: boolean },
 options?: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean },
 ): Promise<T | undefined>;
};

Expand DownExpand Up@@ -532,7 +531,7 @@ export function createRunner(...paths: string[]) {
 makeRequest: async function <T>(
 method: 'get' | 'post',
 path: string,
 options: { headers?: Record<string, string>; data?: unknown; expectError?: boolean } = {},
 options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
 ): Promise<T | undefined> {
 try {
 await waitFor(() => scenarioServerPort !== undefined, 10_000, 'Timed out waiting for server port');
Expand All@@ -542,22 +541,33 @@ export function createRunner(...paths: string[]) {
 }

 const url = `http://localhost:${scenarioServerPort}${path}`;
 const data = options.data;
 const body = options.data;
 const headers = options.headers || {};
 const expectError = options.expectError || false;

 if (process.env.DEBUG) log('making request', method, url, headers, data);
 if (process.env.DEBUG) log('making request', method, url, headers, body);

 try {
 const res =
 method === 'post' ? await axios.post(url, data, { headers }) : await axios.get(url, { headers });
 const res = await fetch(url, { headers, method, body });

 if (!res.ok) {
 if (!expectError) {
 complete(new Error(`Expected request to "${path}" to succeed, but got a ${res.status} response`));
 }

 return;
 }

 if (expectError) {
 complete(new Error(`Expected request to "${path}" to fail, but got a ${res.status} response`));
 return;
 }

 return res.data;
 if (res.headers.get('content-type')?.includes('application/json')) {
 return await res.json();
 }

 return (await res.text()) as T;
 } catch (e) {
 if (expectError) {
 return;
Expand Down

2 changes: 1 addition & 1 deletion
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,7 +10168,7 @@ aws-ssl-profiles@^1.1.1:
 resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
 integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==

axios@1.8.2, axios@^1.0.0, axios@^1.7.7:
axios@1.8.2, axios@^1.0.0:
 version "1.8.2"
 resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
 integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(node): Remove axios in favor of using fetch#16172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 2 commits into

from

Apr 30, 2025
 Merged


test(node): Remove axios in favor of using fetch#16172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3032a21

test(node): Remove `axios` in favor of using `fetch`


mydea Apr 30, 2025
0b46cb6

remove done usages


mydea Apr 30, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/node-integration-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,6 @@
 "ai": "^4.0.6",
 "amqplib": "^0.10.7",
 "apollo-server": "^3.11.1",
 "axios": "^1.7.7",
 "body-parser": "^1.20.3",
 "connect": "^3.7.0",
 "cors": "^2.8.5",
Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -101,9 +101,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -113,8 +114,8 @@ describe('express tracing', () => {
 ['arr/requiredPath'],
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -135,9 +136,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -161,7 +163,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 headers: {
 'Content-Type': 'application/json',
 },
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -102,9 +102,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -116,8 +117,8 @@ describe('express tracing', () => {
 ['arr55/required/lastParam'],
 ['arr/requiredPath/optionalPath/'],
 ['arr/requiredPath/optionalPath/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -138,9 +139,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -164,7 +166,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

24 changes: 10 additions & 14 deletions
dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production,sentry-sample_rand=0.42',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
 expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
Expand All@@ -29,12 +28,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with new trace if no incoming headers', async () => {
 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -44,12 +42,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with negative sampling decision if tracesSampleRate is 0', async () => {
 const runner = createRunner(__dirname, 'server-tracesSampleRate-zero.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -63,15 +60,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server-sdk-disabled.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).not.toContain('"sentry-trace"');
 expect(html).not.toContain('"baggage"');
Expand Down

26 changes: 18 additions & 8 deletions
dev-packages/node-integration-tests/utils/runner.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import type {
 TransactionEvent,
} from '@sentry/core';
import { normalize } from '@sentry/core';
import axios from 'axios';
import { execSync, spawn, spawnSync } from 'child_process';
import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -161,7 +160,7 @@ type StartResult = {
 makeRequest<T>(
 method: 'get' | 'post',
 path: string,
 options?: { headers?: Record<string, string>; data?: unknown; expectError?: boolean },
 options?: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean },
 ): Promise<T | undefined>;
};

Expand DownExpand Up@@ -532,7 +531,7 @@ export function createRunner(...paths: string[]) {
 makeRequest: async function <T>(
 method: 'get' | 'post',
 path: string,
 options: { headers?: Record<string, string>; data?: unknown; expectError?: boolean } = {},
 options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
 ): Promise<T | undefined> {
 try {
 await waitFor(() => scenarioServerPort !== undefined, 10_000, 'Timed out waiting for server port');
Expand All@@ -542,22 +541,33 @@ export function createRunner(...paths: string[]) {
 }

 const url = `http://localhost:${scenarioServerPort}${path}`;
 const data = options.data;
 const body = options.data;
 const headers = options.headers || {};
 const expectError = options.expectError || false;

 if (process.env.DEBUG) log('making request', method, url, headers, data);
 if (process.env.DEBUG) log('making request', method, url, headers, body);

 try {
 const res =
 method === 'post' ? await axios.post(url, data, { headers }) : await axios.get(url, { headers });
 const res = await fetch(url, { headers, method, body });

 if (!res.ok) {
 if (!expectError) {
 complete(new Error(`Expected request to "${path}" to succeed, but got a ${res.status} response`));
 }

 return;
 }

 if (expectError) {
 complete(new Error(`Expected request to "${path}" to fail, but got a ${res.status} response`));
 return;
 }

 return res.data;
 if (res.headers.get('content-type')?.includes('application/json')) {
 return await res.json();
 }

 return (await res.text()) as T;
 } catch (e) {
 if (expectError) {
 return;
Expand Down

2 changes: 1 addition & 1 deletion
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,7 +10168,7 @@ aws-ssl-profiles@^1.1.1:
 resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
 integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==

axios@1.8.2, axios@^1.0.0, axios@^1.7.7:
axios@1.8.2, axios@^1.0.0:
 version "1.8.2"
 resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
 integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
test(node): Remove axios in favor of using fetch#16172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 2 commits into

from

Apr 30, 2025
 Merged


test(node): Remove axios in favor of using fetch#16172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3032a21

test(node): Remove `axios` in favor of using `fetch`


mydea Apr 30, 2025
0b46cb6

remove done usages


mydea Apr 30, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/node-integration-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,6 @@
 "ai": "^4.0.6",
 "amqplib": "^0.10.7",
 "apollo-server": "^3.11.1",
 "axios": "^1.7.7",
 "body-parser": "^1.20.3",
 "connect": "^3.7.0",
 "cors": "^2.8.5",
Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -101,9 +101,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -113,8 +114,8 @@ describe('express tracing', () => {
 ['arr/requiredPath'],
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -135,9 +136,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -161,7 +163,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 headers: {
 'Content-Type': 'application/json',
 },
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -102,9 +102,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -116,8 +117,8 @@ describe('express tracing', () => {
 ['arr55/required/lastParam'],
 ['arr/requiredPath/optionalPath/'],
 ['arr/requiredPath/optionalPath/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -138,9 +139,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -164,7 +166,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

24 changes: 10 additions & 14 deletions
dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production,sentry-sample_rand=0.42',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
 expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
Expand All@@ -29,12 +28,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with new trace if no incoming headers', async () => {
 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -44,12 +42,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with negative sampling decision if tracesSampleRate is 0', async () => {
 const runner = createRunner(__dirname, 'server-tracesSampleRate-zero.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -63,15 +60,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server-sdk-disabled.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).not.toContain('"sentry-trace"');
 expect(html).not.toContain('"baggage"');
Expand Down

26 changes: 18 additions & 8 deletions
dev-packages/node-integration-tests/utils/runner.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import type {
 TransactionEvent,
} from '@sentry/core';
import { normalize } from '@sentry/core';
import axios from 'axios';
import { execSync, spawn, spawnSync } from 'child_process';
import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -161,7 +160,7 @@ type StartResult = {
 makeRequest<T>(
 method: 'get' | 'post',
 path: string,
 options?: { headers?: Record<string, string>; data?: unknown; expectError?: boolean },
 options?: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean },
 ): Promise<T | undefined>;
};

Expand DownExpand Up@@ -532,7 +531,7 @@ export function createRunner(...paths: string[]) {
 makeRequest: async function <T>(
 method: 'get' | 'post',
 path: string,
 options: { headers?: Record<string, string>; data?: unknown; expectError?: boolean } = {},
 options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
 ): Promise<T | undefined> {
 try {
 await waitFor(() => scenarioServerPort !== undefined, 10_000, 'Timed out waiting for server port');
Expand All@@ -542,22 +541,33 @@ export function createRunner(...paths: string[]) {
 }

 const url = `http://localhost:${scenarioServerPort}${path}`;
 const data = options.data;
 const body = options.data;
 const headers = options.headers || {};
 const expectError = options.expectError || false;

 if (process.env.DEBUG) log('making request', method, url, headers, data);
 if (process.env.DEBUG) log('making request', method, url, headers, body);

 try {
 const res =
 method === 'post' ? await axios.post(url, data, { headers }) : await axios.get(url, { headers });
 const res = await fetch(url, { headers, method, body });

 if (!res.ok) {
 if (!expectError) {
 complete(new Error(`Expected request to "${path}" to succeed, but got a ${res.status} response`));
 }

 return;
 }

 if (expectError) {
 complete(new Error(`Expected request to "${path}" to fail, but got a ${res.status} response`));
 return;
 }

 return res.data;
 if (res.headers.get('content-type')?.includes('application/json')) {
 return await res.json();
 }

 return (await res.text()) as T;
 } catch (e) {
 if (expectError) {
 return;
Expand Down

2 changes: 1 addition & 1 deletion
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,7 +10168,7 @@ aws-ssl-profiles@^1.1.1:
 resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
 integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==

axios@1.8.2, axios@^1.0.0, axios@^1.7.7:
axios@1.8.2, axios@^1.0.0:
 version "1.8.2"
 resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
 integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
test(node): Remove axios in favor of using fetch#16172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 2 commits into

from

Apr 30, 2025
 Merged


test(node): Remove axios in favor of using fetch#16172
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
3032a21

test(node): Remove `axios` in favor of using `fetch`


mydea Apr 30, 2025
0b46cb6

remove done usages


mydea Apr 30, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 0 additions & 1 deletion
dev-packages/node-integration-tests/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,6 @@
 "ai": "^4.0.6",
 "amqplib": "^0.10.7",
 "apollo-server": "^3.11.1",
 "axios": "^1.7.7",
 "body-parser": "^1.20.3",
 "connect": "^3.7.0",
 "cors": "^2.8.5",
Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,8 +79,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -101,9 +101,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -113,8 +114,8 @@ describe('express tracing', () => {
 ['arr/requiredPath'],
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -135,9 +136,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -161,7 +163,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 headers: {
 'Content-Type': 'application/json',
 },
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

29 changes: 18 additions & 11 deletions
dev-packages/node-integration-tests/suites/express/tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,8 +80,8 @@ describe('express tracing', () => {

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand All@@ -102,9 +102,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any,
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 },
 );

 test.each([
Expand All@@ -116,8 +117,8 @@ describe('express tracing', () => {
 ['arr55/required/lastParam'],
 ['arr/requiredPath/optionalPath/'],
 ['arr/requiredPath/optionalPath/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
 createRunner(__dirname, 'server.js')
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand All@@ -138,9 +139,10 @@ describe('express tracing', () => {
 },
 },
 })
 .start(done)
 .makeRequest('get', `/test/${segment}`);
 }) as any);
 .start();
 await runner.makeRequest('get', `/test/${segment}`);
 await runner.completed();
 });

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
Expand All@@ -164,7 +166,12 @@ describe('express tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

7 changes: 6 additions & 1 deletion
dev-packages/node-integration-tests/suites/express/without-tracing/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,12 @@ describe('express without tracing', () => {
 })
 .start();

 runner.makeRequest('post', '/test-post', { data: { foo: 'bar', other: 1 } });
 runner.makeRequest('post', '/test-post', {
 headers: {
 'Content-Type': 'application/json',
 },
 data: JSON.stringify({ foo: 'bar', other: 1 }),
 });
 await runner.completed();
 });

Expand Down

24 changes: 10 additions & 14 deletions
dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,15 +12,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production,sentry-sample_rand=0.42',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
 expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
Expand All@@ -29,12 +28,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with new trace if no incoming headers', async () => {
 const runner = createRunner(__dirname, 'server.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -44,12 +42,11 @@ describe('getTraceMetaTags', () => {
 test('injects <meta> tags with negative sampling decision if tracesSampleRate is 0', async () => {
 const runner = createRunner(__dirname, 'server-tracesSampleRate-zero.js').start();

 const response = await runner.makeRequest('get', '/test');
 const response = await runner.makeRequest<{ response: string }>('get', '/test');

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 const traceId = html.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
 expect(traceId).not.toBeUndefined();

 expect(html).toContain('<meta name="baggage"');
Expand All@@ -63,15 +60,14 @@ describe('getTraceMetaTags', () => {

 const runner = createRunner(__dirname, 'server-sdk-disabled.js').start();

 const response = await runner.makeRequest('get', '/test', {
 const response = await runner.makeRequest<{ response: string }>('get', '/test', {
 headers: {
 'sentry-trace': `${traceId}-${parentSpanId}-1`,
 baggage: 'sentry-environment=production',
 },
 });

 // @ts-ignore - response is defined, types just don't reflect it
 const html = response?.response as unknown as string;
 const html = response?.response;

 expect(html).not.toContain('"sentry-trace"');
 expect(html).not.toContain('"baggage"');
Expand Down

26 changes: 18 additions & 8 deletions
dev-packages/node-integration-tests/utils/runner.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@ import type {
 TransactionEvent,
} from '@sentry/core';
import { normalize } from '@sentry/core';
import axios from 'axios';
import { execSync, spawn, spawnSync } from 'child_process';
import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
import { join } from 'path';
Expand DownExpand Up@@ -161,7 +160,7 @@ type StartResult = {
 makeRequest<T>(
 method: 'get' | 'post',
 path: string,
 options?: { headers?: Record<string, string>; data?: unknown; expectError?: boolean },
 options?: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean },
 ): Promise<T | undefined>;
};

Expand DownExpand Up@@ -532,7 +531,7 @@ export function createRunner(...paths: string[]) {
 makeRequest: async function <T>(
 method: 'get' | 'post',
 path: string,
 options: { headers?: Record<string, string>; data?: unknown; expectError?: boolean } = {},
 options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
 ): Promise<T | undefined> {
 try {
 await waitFor(() => scenarioServerPort !== undefined, 10_000, 'Timed out waiting for server port');
Expand All@@ -542,22 +541,33 @@ export function createRunner(...paths: string[]) {
 }

 const url = `http://localhost:${scenarioServerPort}${path}`;
 const data = options.data;
 const body = options.data;
 const headers = options.headers || {};
 const expectError = options.expectError || false;

 if (process.env.DEBUG) log('making request', method, url, headers, data);
 if (process.env.DEBUG) log('making request', method, url, headers, body);

 try {
 const res =
 method === 'post' ? await axios.post(url, data, { headers }) : await axios.get(url, { headers });
 const res = await fetch(url, { headers, method, body });

 if (!res.ok) {
 if (!expectError) {
 complete(new Error(`Expected request to "${path}" to succeed, but got a ${res.status} response`));
 }

 return;
 }

 if (expectError) {
 complete(new Error(`Expected request to "${path}" to fail, but got a ${res.status} response`));
 return;
 }

 return res.data;
 if (res.headers.get('content-type')?.includes('application/json')) {
 return await res.json();
 }

 return (await res.text()) as T;
 } catch (e) {
 if (expectError) {
 return;
Expand Down

2 changes: 1 addition & 1 deletion
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10168,7 +10168,7 @@ aws-ssl-profiles@^1.1.1:
 resolved "https://registry.yarnpkg.com/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz#157dd77e9f19b1d123678e93f120e6f193022641"
 integrity sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==

axios@1.8.2, axios@^1.0.0, axios@^1.7.7:
axios@1.8.2, axios@^1.0.0:
 version "1.8.2"
 resolved "https://registry.yarnpkg.com/axios/-/axios-1.8.2.tgz#fabe06e241dfe83071d4edfbcaa7b1c3a40f7979"
 integrity sha512-ls4GYBm5aig9vWx8AWDSGLpnpDQRtWAfrjU+EuytuODrFBkqesN2RkOQCBzrA1RQNHw1SmRMSDDDSwzNAYQ6Rg==
Expand Down