test(node): Update express integration tests#16204

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
May 6, 2025
Merged

test(node): Update express integration tests #16204

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
67daa45
test(node): Improve how we test express v5 in node-integration-tests
mydea May 6, 2025
245af5e
lol size limit??!
mydea May 6, 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
2 changes: 1 addition & 1 deletion .size-limit.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ module.exports = [
path: 'packages/browser/build/npm/esm/index.js',
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
gzip: true,
limit: '81 KB',
limit: '82 KB',
},
{
name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand Down
5 changes: 4 additions & 1 deletion dev-packages/node-integration-tests/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@ export function loggingTransport(_options: BaseTransportOptions): Transport {
* Setting this port to something specific is useful for local debugging but dangerous for
* CI/CD environments where port collisions can cause flakes!
*/
export function startExpressServerAndSendPortToRunner(app: Express, port: number | undefined = undefined): void {
export function startExpressServerAndSendPortToRunner(
app: Pick<Express, 'listen'>,
port: number | undefined = undefined,
): void {
const server = app.listen(port || 0, () => {
const address = server.address() as AddressInfo;

Expand Down
11 changes: 11 additions & 0 deletions dev-packages/node-integration-tests/suites/express-v5/tracing/instrument.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
// disable attaching headers to /test/* endpoints
tracePropagationTargets: [/^(?!.*test).*$/],
tracesSampleRate: 1.0,
transport: loggingTransport,
});
40 changes: 40 additions & 0 deletions dev-packages/node-integration-tests/suites/express-v5/tracing/scenario.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

app.use(cors());
app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
res.send({ response: 'response 1' });
});

app.get(/\/test\/regex/, (_req, res) => {
res.send({ response: 'response 2' });
});

app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
res.send({ response: 'response 3' });
});

app.get(['/test/arr/:id', /\/test\/arr[0-9]*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
res.send({ response: 'response 4' });
});

app.post('/test-post', function (req, res) {
res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
66 changes: 54 additions & 12 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
@@ -1,14 +1,14 @@
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
afterAll(() => {
cleanupChildProcesses();
});

describe('CJS', () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
test('should create and send transactions for Express routes and spans for middlewares.', async () => {
const runner = createRunner(__dirname, 'server.js')
const runner = createRunner()
.expect({
transaction: {
contexts: {
Expand DownExpand Up@@ -51,7 +51,7 @@ describe('express tracing', () => {
});

test('should set a correct transaction name for routes specified in RegEx', async () => {
const runner = createRunner(__dirname, 'server.js')
const runner = createRunner()
.expect({
transaction: {
transaction: 'GET /\\/test\\/regex/',
Expand All@@ -77,10 +77,52 @@ describe('express tracing', () => {
await runner.completed();
});

test('handles root page correctly', async () => {
const runner = createRunner()
.expect({
transaction: {
transaction: 'GET /',
},
})
.start();
runner.makeRequest('get', '/');
await runner.completed();
});

test('handles 404 page correctly', async () => {
const runner = createRunner()
.expect({
transaction: {
// FIXME: This is wrong :(
transaction: 'GET /',
contexts: {
trace: {
span_id: expect.stringMatching(/[a-f0-9]{16}/),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
data: {
'http.response.status_code': 404,
url: expect.stringMatching(/\/does-not-exist$/),
'http.method': 'GET',
// FIXME: This is wrong :(
'http.route': '/',
'http.url': expect.stringMatching(/\/does-not-exist$/),
'http.target': '/does-not-exist',
},
op: 'http.server',
status: 'not_found',
},
},
},
})
.start();
runner.makeRequest('get', '/does-not-exist', { expectError: true });
await runner.completed();
});

test.each([['array1'], ['array5']])(
'should set a correct transaction name for routes consisting of arrays of routes for %p',
async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
const runner = await createRunner()
.expect({
transaction: {
transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand DownExpand Up@@ -115,7 +157,7 @@ describe('express tracing', () => {
['arr/required/lastParam'],
['arr55/required/lastParam'],
])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
const runner = await createRunner(__dirname, 'server.js')
const runner = await createRunner()
.expect({
transaction: {
transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand DownExpand Up@@ -143,7 +185,7 @@ describe('express tracing', () => {

describe('request data', () => {
test('correctly captures JSON request data', async () => {
const runner = createRunner(__dirname, 'server.js')
const runner = createRunner()
.expect({
transaction: {
transaction: 'POST /test-post',
Expand DownExpand Up@@ -173,7 +215,7 @@ describe('express tracing', () => {
});

test('correctly captures plain text request data', async () => {
const runner = createRunner(__dirname, 'server.js')
const runner = createRunner()
.expect({
transaction: {
transaction: 'POST /test-post',
Expand All@@ -198,7 +240,7 @@ describe('express tracing', () => {
});

test('correctly captures text buffer request data', async () => {
const runner = createRunner(__dirname, 'server.js')
const runner = createRunner()
.expect({
transaction: {
transaction: 'POST /test-post',
Expand All@@ -223,7 +265,7 @@ describe('express tracing', () => {
});

test('correctly captures non-text buffer request data', async () => {
const runner = createRunner(__dirname, 'server.js')
const runner = createRunner()
.expect({
transaction: {
transaction: 'POST /test-post',
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/node-integration-tests/suites/express-v5/tracing/updateName/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/node';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
afterAll(() => {
cleanupChildProcesses();
});
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/node-integration-tests/suites/express-v5/tracing/withError/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing experimental', () => {
describe('express v5 tracing', () => {
afterAll(() => {
cleanupChildProcesses();
});
Expand Down
3 changes: 3 additions & 0 deletions dev-packages/node-integration-tests/suites/express-v5/tsconfig.test.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.json"
}
21 changes: 21 additions & 0 deletions dev-packages/node-integration-tests/suites/express/tracing/instrument.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
// disable attaching headers to /test/* endpoints
tracePropagationTargets: [/^(?!.*test).*$/],
tracesSampleRate: 1.0,
transport: loggingTransport,
integrations: [
Sentry.httpIntegration({
ignoreIncomingRequestBody: url => {
if (url.includes('/test-post-ignore-body')) {
return true;
}
return false;
},
}),
],
});
30 changes: 13 additions & 17 deletions ...tests/suites/express-v5/tracing/server.js → ...tests/suites/express/tracing/scenario.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
// disable attaching headers to /test/* endpoints
tracePropagationTargets: [/^(?!.*test).*$/],
tracesSampleRate: 1.0,
transport: loggingTransport,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const bodyParser = require('body-parser');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

Expand All@@ -23,6 +11,10 @@ app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
res.send({ response: 'response 1' });
});
Expand All@@ -43,6 +35,10 @@ app.post('/test-post', function (req, res) {
res.send({ status: 'ok', body: req.body });
});

app.post('/test-post-ignore-body', function (req, res) {
res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);
62 changes: 0 additions & 62 deletions dev-packages/node-integration-tests/suites/express/tracing/server.js
View file
Open in desktop

This file was deleted.

Loading
, '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): Update express integration tests#16204

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

May 6, 2025
 Merged


test(node): Update express integration tests
#16204
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
67daa45

test(node): Improve how we test express v5 in node-integration-tests


mydea May 6, 2025
245af5e

lol size limit??!


mydea May 6, 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


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ module.exports = [
 path: 'packages/browser/build/npm/esm/index.js',
 import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
 gzip: true,
 limit: '81 KB',
 limit: '82 KB',
 },
 {
 name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand Down

5 changes: 4 additions & 1 deletion
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@ export function loggingTransport(_options: BaseTransportOptions): Transport {
 * Setting this port to something specific is useful for local debugging but dangerous for
 * CI/CD environments where port collisions can cause flakes!
 */
export function startExpressServerAndSendPortToRunner(app: Express, port: number | undefined = undefined): void {
export function startExpressServerAndSendPortToRunner(
 app: Pick<Express, 'listen'>,
 port: number | undefined = undefined,
): void {
 const server = app.listen(port || 0, () => {
 const address = server.address() as AddressInfo;

Expand Down

11 changes: 11 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

40 changes: 40 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

app.use(cors());
app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});

app.get(/\/test\/regex/, (_req, res) => {
 res.send({ response: 'response 2' });
});

app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
 res.send({ response: 'response 3' });
});

app.get(['/test/arr/:id', /\/test\/arr[0-9]*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
 res.send({ response: 'response 4' });
});

app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

66 changes: 54 additions & 12 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
@@ -1,14 +1,14 @@
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

describe('CJS', () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('should create and send transactions for Express routes and spans for middlewares.', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 contexts: {
Expand DownExpand Up@@ -51,7 +51,7 @@ describe('express tracing', () => {
 });

 test('should set a correct transaction name for routes specified in RegEx', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /\\/test\\/regex/',
Expand All@@ -77,10 +77,52 @@ describe('express tracing', () => {
 await runner.completed();
 });

 test('handles root page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /',
 },
 })
 .start();
 runner.makeRequest('get', '/');
 await runner.completed();
 });

 test('handles 404 page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 // FIXME: This is wrong :(
 transaction: 'GET /',
 contexts: {
 trace: {
 span_id: expect.stringMatching(/[a-f0-9]{16}/),
 trace_id: expect.stringMatching(/[a-f0-9]{32}/),
 data: {
 'http.response.status_code': 404,
 url: expect.stringMatching(/\/does-not-exist$/),
 'http.method': 'GET',
 // FIXME: This is wrong :(
 'http.route': '/',
 'http.url': expect.stringMatching(/\/does-not-exist$/),
 'http.target': '/does-not-exist',
 },
 op: 'http.server',
 status: 'not_found',
 },
 },
 },
 })
 .start();
 runner.makeRequest('get', '/does-not-exist', { expectError: true });
 await runner.completed();
 });

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
 async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand DownExpand Up@@ -115,7 +157,7 @@ describe('express tracing', () => {
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand DownExpand Up@@ -143,7 +185,7 @@ describe('express tracing', () => {

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand DownExpand Up@@ -173,7 +215,7 @@ describe('express tracing', () => {
 });

 test('correctly captures plain text request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -198,7 +240,7 @@ describe('express tracing', () => {
 });

 test('correctly captures text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -223,7 +265,7 @@ describe('express tracing', () => {
 });

 test('correctly captures non-text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/updateName/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/node';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/withError/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing experimental', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.json"
}

21 changes: 21 additions & 0 deletions
dev-packages/node-integration-tests/suites/express/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
 integrations: [
 Sentry.httpIntegration({
 ignoreIncomingRequestBody: url => {
 if (url.includes('/test-post-ignore-body')) {
 return true;
 }
 return false;
 },
 }),
 ],
});

30 changes: 13 additions & 17 deletions
...tests/suites/express-v5/tracing/server.js → ...tests/suites/express/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const bodyParser = require('body-parser');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

Expand All@@ -23,6 +11,10 @@ app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});
Expand All@@ -43,6 +35,10 @@ app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

app.post('/test-post-ignore-body', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

62 changes: 0 additions & 62 deletions
dev-packages/node-integration-tests/suites/express/tracing/server.js

View file


Open in desktop


This file was deleted.

Loading

, '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): Update express integration tests#16204

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

May 6, 2025
 Merged


test(node): Update express integration tests
#16204
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
67daa45

test(node): Improve how we test express v5 in node-integration-tests


mydea May 6, 2025
245af5e

lol size limit??!


mydea May 6, 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


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ module.exports = [
 path: 'packages/browser/build/npm/esm/index.js',
 import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
 gzip: true,
 limit: '81 KB',
 limit: '82 KB',
 },
 {
 name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand Down

5 changes: 4 additions & 1 deletion
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@ export function loggingTransport(_options: BaseTransportOptions): Transport {
 * Setting this port to something specific is useful for local debugging but dangerous for
 * CI/CD environments where port collisions can cause flakes!
 */
export function startExpressServerAndSendPortToRunner(app: Express, port: number | undefined = undefined): void {
export function startExpressServerAndSendPortToRunner(
 app: Pick<Express, 'listen'>,
 port: number | undefined = undefined,
): void {
 const server = app.listen(port || 0, () => {
 const address = server.address() as AddressInfo;

Expand Down

11 changes: 11 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

40 changes: 40 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

app.use(cors());
app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});

app.get(/\/test\/regex/, (_req, res) => {
 res.send({ response: 'response 2' });
});

app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
 res.send({ response: 'response 3' });
});

app.get(['/test/arr/:id', /\/test\/arr[0-9]*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
 res.send({ response: 'response 4' });
});

app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

66 changes: 54 additions & 12 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
@@ -1,14 +1,14 @@
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

describe('CJS', () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('should create and send transactions for Express routes and spans for middlewares.', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 contexts: {
Expand DownExpand Up@@ -51,7 +51,7 @@ describe('express tracing', () => {
 });

 test('should set a correct transaction name for routes specified in RegEx', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /\\/test\\/regex/',
Expand All@@ -77,10 +77,52 @@ describe('express tracing', () => {
 await runner.completed();
 });

 test('handles root page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /',
 },
 })
 .start();
 runner.makeRequest('get', '/');
 await runner.completed();
 });

 test('handles 404 page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 // FIXME: This is wrong :(
 transaction: 'GET /',
 contexts: {
 trace: {
 span_id: expect.stringMatching(/[a-f0-9]{16}/),
 trace_id: expect.stringMatching(/[a-f0-9]{32}/),
 data: {
 'http.response.status_code': 404,
 url: expect.stringMatching(/\/does-not-exist$/),
 'http.method': 'GET',
 // FIXME: This is wrong :(
 'http.route': '/',
 'http.url': expect.stringMatching(/\/does-not-exist$/),
 'http.target': '/does-not-exist',
 },
 op: 'http.server',
 status: 'not_found',
 },
 },
 },
 })
 .start();
 runner.makeRequest('get', '/does-not-exist', { expectError: true });
 await runner.completed();
 });

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
 async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand DownExpand Up@@ -115,7 +157,7 @@ describe('express tracing', () => {
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand DownExpand Up@@ -143,7 +185,7 @@ describe('express tracing', () => {

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand DownExpand Up@@ -173,7 +215,7 @@ describe('express tracing', () => {
 });

 test('correctly captures plain text request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -198,7 +240,7 @@ describe('express tracing', () => {
 });

 test('correctly captures text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -223,7 +265,7 @@ describe('express tracing', () => {
 });

 test('correctly captures non-text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/updateName/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/node';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/withError/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing experimental', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.json"
}

21 changes: 21 additions & 0 deletions
dev-packages/node-integration-tests/suites/express/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
 integrations: [
 Sentry.httpIntegration({
 ignoreIncomingRequestBody: url => {
 if (url.includes('/test-post-ignore-body')) {
 return true;
 }
 return false;
 },
 }),
 ],
});

30 changes: 13 additions & 17 deletions
...tests/suites/express-v5/tracing/server.js → ...tests/suites/express/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const bodyParser = require('body-parser');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

Expand All@@ -23,6 +11,10 @@ app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});
Expand All@@ -43,6 +35,10 @@ app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

app.post('/test-post-ignore-body', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

62 changes: 0 additions & 62 deletions
dev-packages/node-integration-tests/suites/express/tracing/server.js

View file


Open in desktop


This file was deleted.

Loading

, '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): Update express integration tests#16204

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

May 6, 2025
 Merged


test(node): Update express integration tests
#16204
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
67daa45

test(node): Improve how we test express v5 in node-integration-tests


mydea May 6, 2025
245af5e

lol size limit??!


mydea May 6, 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


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ module.exports = [
 path: 'packages/browser/build/npm/esm/index.js',
 import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
 gzip: true,
 limit: '81 KB',
 limit: '82 KB',
 },
 {
 name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand Down

5 changes: 4 additions & 1 deletion
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@ export function loggingTransport(_options: BaseTransportOptions): Transport {
 * Setting this port to something specific is useful for local debugging but dangerous for
 * CI/CD environments where port collisions can cause flakes!
 */
export function startExpressServerAndSendPortToRunner(app: Express, port: number | undefined = undefined): void {
export function startExpressServerAndSendPortToRunner(
 app: Pick<Express, 'listen'>,
 port: number | undefined = undefined,
): void {
 const server = app.listen(port || 0, () => {
 const address = server.address() as AddressInfo;

Expand Down

11 changes: 11 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

40 changes: 40 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

app.use(cors());
app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});

app.get(/\/test\/regex/, (_req, res) => {
 res.send({ response: 'response 2' });
});

app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
 res.send({ response: 'response 3' });
});

app.get(['/test/arr/:id', /\/test\/arr[0-9]*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
 res.send({ response: 'response 4' });
});

app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

66 changes: 54 additions & 12 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
@@ -1,14 +1,14 @@
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

describe('CJS', () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('should create and send transactions for Express routes and spans for middlewares.', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 contexts: {
Expand DownExpand Up@@ -51,7 +51,7 @@ describe('express tracing', () => {
 });

 test('should set a correct transaction name for routes specified in RegEx', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /\\/test\\/regex/',
Expand All@@ -77,10 +77,52 @@ describe('express tracing', () => {
 await runner.completed();
 });

 test('handles root page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /',
 },
 })
 .start();
 runner.makeRequest('get', '/');
 await runner.completed();
 });

 test('handles 404 page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 // FIXME: This is wrong :(
 transaction: 'GET /',
 contexts: {
 trace: {
 span_id: expect.stringMatching(/[a-f0-9]{16}/),
 trace_id: expect.stringMatching(/[a-f0-9]{32}/),
 data: {
 'http.response.status_code': 404,
 url: expect.stringMatching(/\/does-not-exist$/),
 'http.method': 'GET',
 // FIXME: This is wrong :(
 'http.route': '/',
 'http.url': expect.stringMatching(/\/does-not-exist$/),
 'http.target': '/does-not-exist',
 },
 op: 'http.server',
 status: 'not_found',
 },
 },
 },
 })
 .start();
 runner.makeRequest('get', '/does-not-exist', { expectError: true });
 await runner.completed();
 });

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
 async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand DownExpand Up@@ -115,7 +157,7 @@ describe('express tracing', () => {
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand DownExpand Up@@ -143,7 +185,7 @@ describe('express tracing', () => {

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand DownExpand Up@@ -173,7 +215,7 @@ describe('express tracing', () => {
 });

 test('correctly captures plain text request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -198,7 +240,7 @@ describe('express tracing', () => {
 });

 test('correctly captures text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -223,7 +265,7 @@ describe('express tracing', () => {
 });

 test('correctly captures non-text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/updateName/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/node';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/withError/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing experimental', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.json"
}

21 changes: 21 additions & 0 deletions
dev-packages/node-integration-tests/suites/express/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
 integrations: [
 Sentry.httpIntegration({
 ignoreIncomingRequestBody: url => {
 if (url.includes('/test-post-ignore-body')) {
 return true;
 }
 return false;
 },
 }),
 ],
});

30 changes: 13 additions & 17 deletions
...tests/suites/express-v5/tracing/server.js → ...tests/suites/express/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const bodyParser = require('body-parser');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

Expand All@@ -23,6 +11,10 @@ app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});
Expand All@@ -43,6 +35,10 @@ app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

app.post('/test-post-ignore-body', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

62 changes: 0 additions & 62 deletions
dev-packages/node-integration-tests/suites/express/tracing/server.js

View file


Open in desktop


This file was deleted.

Loading

, '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): Update express integration tests#16204

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

May 6, 2025
 Merged


test(node): Update express integration tests
#16204
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
67daa45

test(node): Improve how we test express v5 in node-integration-tests


mydea May 6, 2025
245af5e

lol size limit??!


mydea May 6, 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


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ module.exports = [
 path: 'packages/browser/build/npm/esm/index.js',
 import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
 gzip: true,
 limit: '81 KB',
 limit: '82 KB',
 },
 {
 name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand Down

5 changes: 4 additions & 1 deletion
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@ export function loggingTransport(_options: BaseTransportOptions): Transport {
 * Setting this port to something specific is useful for local debugging but dangerous for
 * CI/CD environments where port collisions can cause flakes!
 */
export function startExpressServerAndSendPortToRunner(app: Express, port: number | undefined = undefined): void {
export function startExpressServerAndSendPortToRunner(
 app: Pick<Express, 'listen'>,
 port: number | undefined = undefined,
): void {
 const server = app.listen(port || 0, () => {
 const address = server.address() as AddressInfo;

Expand Down

11 changes: 11 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

40 changes: 40 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

app.use(cors());
app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});

app.get(/\/test\/regex/, (_req, res) => {
 res.send({ response: 'response 2' });
});

app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
 res.send({ response: 'response 3' });
});

app.get(['/test/arr/:id', /\/test\/arr[0-9]*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
 res.send({ response: 'response 4' });
});

app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

66 changes: 54 additions & 12 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
@@ -1,14 +1,14 @@
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

describe('CJS', () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('should create and send transactions for Express routes and spans for middlewares.', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 contexts: {
Expand DownExpand Up@@ -51,7 +51,7 @@ describe('express tracing', () => {
 });

 test('should set a correct transaction name for routes specified in RegEx', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /\\/test\\/regex/',
Expand All@@ -77,10 +77,52 @@ describe('express tracing', () => {
 await runner.completed();
 });

 test('handles root page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /',
 },
 })
 .start();
 runner.makeRequest('get', '/');
 await runner.completed();
 });

 test('handles 404 page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 // FIXME: This is wrong :(
 transaction: 'GET /',
 contexts: {
 trace: {
 span_id: expect.stringMatching(/[a-f0-9]{16}/),
 trace_id: expect.stringMatching(/[a-f0-9]{32}/),
 data: {
 'http.response.status_code': 404,
 url: expect.stringMatching(/\/does-not-exist$/),
 'http.method': 'GET',
 // FIXME: This is wrong :(
 'http.route': '/',
 'http.url': expect.stringMatching(/\/does-not-exist$/),
 'http.target': '/does-not-exist',
 },
 op: 'http.server',
 status: 'not_found',
 },
 },
 },
 })
 .start();
 runner.makeRequest('get', '/does-not-exist', { expectError: true });
 await runner.completed();
 });

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
 async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand DownExpand Up@@ -115,7 +157,7 @@ describe('express tracing', () => {
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand DownExpand Up@@ -143,7 +185,7 @@ describe('express tracing', () => {

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand DownExpand Up@@ -173,7 +215,7 @@ describe('express tracing', () => {
 });

 test('correctly captures plain text request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -198,7 +240,7 @@ describe('express tracing', () => {
 });

 test('correctly captures text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -223,7 +265,7 @@ describe('express tracing', () => {
 });

 test('correctly captures non-text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/updateName/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/node';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/withError/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing experimental', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.json"
}

21 changes: 21 additions & 0 deletions
dev-packages/node-integration-tests/suites/express/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
 integrations: [
 Sentry.httpIntegration({
 ignoreIncomingRequestBody: url => {
 if (url.includes('/test-post-ignore-body')) {
 return true;
 }
 return false;
 },
 }),
 ],
});

30 changes: 13 additions & 17 deletions
...tests/suites/express-v5/tracing/server.js → ...tests/suites/express/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const bodyParser = require('body-parser');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

Expand All@@ -23,6 +11,10 @@ app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});
Expand All@@ -43,6 +35,10 @@ app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

app.post('/test-post-ignore-body', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

62 changes: 0 additions & 62 deletions
dev-packages/node-integration-tests/suites/express/tracing/server.js

View file


Open in desktop


This file was deleted.

Loading

, '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): Update express integration tests#16204

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

May 6, 2025
 Merged


test(node): Update express integration tests
#16204
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
67daa45

test(node): Improve how we test express v5 in node-integration-tests


mydea May 6, 2025
245af5e

lol size limit??!


mydea May 6, 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


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ module.exports = [
 path: 'packages/browser/build/npm/esm/index.js',
 import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
 gzip: true,
 limit: '81 KB',
 limit: '82 KB',
 },
 {
 name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand Down

5 changes: 4 additions & 1 deletion
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@ export function loggingTransport(_options: BaseTransportOptions): Transport {
 * Setting this port to something specific is useful for local debugging but dangerous for
 * CI/CD environments where port collisions can cause flakes!
 */
export function startExpressServerAndSendPortToRunner(app: Express, port: number | undefined = undefined): void {
export function startExpressServerAndSendPortToRunner(
 app: Pick<Express, 'listen'>,
 port: number | undefined = undefined,
): void {
 const server = app.listen(port || 0, () => {
 const address = server.address() as AddressInfo;

Expand Down

11 changes: 11 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

40 changes: 40 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

app.use(cors());
app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});

app.get(/\/test\/regex/, (_req, res) => {
 res.send({ response: 'response 2' });
});

app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
 res.send({ response: 'response 3' });
});

app.get(['/test/arr/:id', /\/test\/arr[0-9]*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
 res.send({ response: 'response 4' });
});

app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

66 changes: 54 additions & 12 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
@@ -1,14 +1,14 @@
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

describe('CJS', () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('should create and send transactions for Express routes and spans for middlewares.', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 contexts: {
Expand DownExpand Up@@ -51,7 +51,7 @@ describe('express tracing', () => {
 });

 test('should set a correct transaction name for routes specified in RegEx', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /\\/test\\/regex/',
Expand All@@ -77,10 +77,52 @@ describe('express tracing', () => {
 await runner.completed();
 });

 test('handles root page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /',
 },
 })
 .start();
 runner.makeRequest('get', '/');
 await runner.completed();
 });

 test('handles 404 page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 // FIXME: This is wrong :(
 transaction: 'GET /',
 contexts: {
 trace: {
 span_id: expect.stringMatching(/[a-f0-9]{16}/),
 trace_id: expect.stringMatching(/[a-f0-9]{32}/),
 data: {
 'http.response.status_code': 404,
 url: expect.stringMatching(/\/does-not-exist$/),
 'http.method': 'GET',
 // FIXME: This is wrong :(
 'http.route': '/',
 'http.url': expect.stringMatching(/\/does-not-exist$/),
 'http.target': '/does-not-exist',
 },
 op: 'http.server',
 status: 'not_found',
 },
 },
 },
 })
 .start();
 runner.makeRequest('get', '/does-not-exist', { expectError: true });
 await runner.completed();
 });

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
 async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand DownExpand Up@@ -115,7 +157,7 @@ describe('express tracing', () => {
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand DownExpand Up@@ -143,7 +185,7 @@ describe('express tracing', () => {

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand DownExpand Up@@ -173,7 +215,7 @@ describe('express tracing', () => {
 });

 test('correctly captures plain text request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -198,7 +240,7 @@ describe('express tracing', () => {
 });

 test('correctly captures text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -223,7 +265,7 @@ describe('express tracing', () => {
 });

 test('correctly captures non-text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/updateName/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/node';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/withError/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing experimental', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.json"
}

21 changes: 21 additions & 0 deletions
dev-packages/node-integration-tests/suites/express/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
 integrations: [
 Sentry.httpIntegration({
 ignoreIncomingRequestBody: url => {
 if (url.includes('/test-post-ignore-body')) {
 return true;
 }
 return false;
 },
 }),
 ],
});

30 changes: 13 additions & 17 deletions
...tests/suites/express-v5/tracing/server.js → ...tests/suites/express/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const bodyParser = require('body-parser');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

Expand All@@ -23,6 +11,10 @@ app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});
Expand All@@ -43,6 +35,10 @@ app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

app.post('/test-post-ignore-body', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

62 changes: 0 additions & 62 deletions
dev-packages/node-integration-tests/suites/express/tracing/server.js

View file


Open in desktop


This file was deleted.

Loading

, '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): Update express integration tests#16204

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

May 6, 2025
 Merged


test(node): Update express integration tests
#16204
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
67daa45

test(node): Improve how we test express v5 in node-integration-tests


mydea May 6, 2025
245af5e

lol size limit??!


mydea May 6, 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


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ module.exports = [
 path: 'packages/browser/build/npm/esm/index.js',
 import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
 gzip: true,
 limit: '81 KB',
 limit: '82 KB',
 },
 {
 name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand Down

5 changes: 4 additions & 1 deletion
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@ export function loggingTransport(_options: BaseTransportOptions): Transport {
 * Setting this port to something specific is useful for local debugging but dangerous for
 * CI/CD environments where port collisions can cause flakes!
 */
export function startExpressServerAndSendPortToRunner(app: Express, port: number | undefined = undefined): void {
export function startExpressServerAndSendPortToRunner(
 app: Pick<Express, 'listen'>,
 port: number | undefined = undefined,
): void {
 const server = app.listen(port || 0, () => {
 const address = server.address() as AddressInfo;

Expand Down

11 changes: 11 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

40 changes: 40 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

app.use(cors());
app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});

app.get(/\/test\/regex/, (_req, res) => {
 res.send({ response: 'response 2' });
});

app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
 res.send({ response: 'response 3' });
});

app.get(['/test/arr/:id', /\/test\/arr[0-9]*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
 res.send({ response: 'response 4' });
});

app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

66 changes: 54 additions & 12 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
@@ -1,14 +1,14 @@
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

describe('CJS', () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('should create and send transactions for Express routes and spans for middlewares.', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 contexts: {
Expand DownExpand Up@@ -51,7 +51,7 @@ describe('express tracing', () => {
 });

 test('should set a correct transaction name for routes specified in RegEx', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /\\/test\\/regex/',
Expand All@@ -77,10 +77,52 @@ describe('express tracing', () => {
 await runner.completed();
 });

 test('handles root page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /',
 },
 })
 .start();
 runner.makeRequest('get', '/');
 await runner.completed();
 });

 test('handles 404 page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 // FIXME: This is wrong :(
 transaction: 'GET /',
 contexts: {
 trace: {
 span_id: expect.stringMatching(/[a-f0-9]{16}/),
 trace_id: expect.stringMatching(/[a-f0-9]{32}/),
 data: {
 'http.response.status_code': 404,
 url: expect.stringMatching(/\/does-not-exist$/),
 'http.method': 'GET',
 // FIXME: This is wrong :(
 'http.route': '/',
 'http.url': expect.stringMatching(/\/does-not-exist$/),
 'http.target': '/does-not-exist',
 },
 op: 'http.server',
 status: 'not_found',
 },
 },
 },
 })
 .start();
 runner.makeRequest('get', '/does-not-exist', { expectError: true });
 await runner.completed();
 });

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
 async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand DownExpand Up@@ -115,7 +157,7 @@ describe('express tracing', () => {
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand DownExpand Up@@ -143,7 +185,7 @@ describe('express tracing', () => {

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand DownExpand Up@@ -173,7 +215,7 @@ describe('express tracing', () => {
 });

 test('correctly captures plain text request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -198,7 +240,7 @@ describe('express tracing', () => {
 });

 test('correctly captures text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -223,7 +265,7 @@ describe('express tracing', () => {
 });

 test('correctly captures non-text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/updateName/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/node';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/withError/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing experimental', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.json"
}

21 changes: 21 additions & 0 deletions
dev-packages/node-integration-tests/suites/express/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
 integrations: [
 Sentry.httpIntegration({
 ignoreIncomingRequestBody: url => {
 if (url.includes('/test-post-ignore-body')) {
 return true;
 }
 return false;
 },
 }),
 ],
});

30 changes: 13 additions & 17 deletions
...tests/suites/express-v5/tracing/server.js → ...tests/suites/express/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const bodyParser = require('body-parser');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

Expand All@@ -23,6 +11,10 @@ app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});
Expand All@@ -43,6 +35,10 @@ app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

app.post('/test-post-ignore-body', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

62 changes: 0 additions & 62 deletions
dev-packages/node-integration-tests/suites/express/tracing/server.js

View file


Open in desktop


This file was deleted.

Loading

, '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): Update express integration tests#16204

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

May 6, 2025
 Merged


test(node): Update express integration tests
#16204
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
67daa45

test(node): Improve how we test express v5 in node-integration-tests


mydea May 6, 2025
245af5e

lol size limit??!


mydea May 6, 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


2 changes: 1 addition & 1 deletion
.size-limit.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@ module.exports = [
 path: 'packages/browser/build/npm/esm/index.js',
 import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
 gzip: true,
 limit: '81 KB',
 limit: '82 KB',
 },
 {
 name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
Expand Down

5 changes: 4 additions & 1 deletion
dev-packages/node-integration-tests/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,10 @@ export function loggingTransport(_options: BaseTransportOptions): Transport {
 * Setting this port to something specific is useful for local debugging but dangerous for
 * CI/CD environments where port collisions can cause flakes!
 */
export function startExpressServerAndSendPortToRunner(app: Express, port: number | undefined = undefined): void {
export function startExpressServerAndSendPortToRunner(
 app: Pick<Express, 'listen'>,
 port: number | undefined = undefined,
): void {
 const server = app.listen(port || 0, () => {
 const address = server.address() as AddressInfo;

Expand Down

11 changes: 11 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

40 changes: 40 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

app.use(cors());
app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});

app.get(/\/test\/regex/, (_req, res) => {
 res.send({ response: 'response 2' });
});

app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
 res.send({ response: 'response 3' });
});

app.get(['/test/arr/:id', /\/test\/arr[0-9]*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
 res.send({ response: 'response 4' });
});

app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

66 changes: 54 additions & 12 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
@@ -1,14 +1,14 @@
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { afterAll, describe, expect } from 'vitest';
import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });

describe('CJS', () => {
createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
 test('should create and send transactions for Express routes and spans for middlewares.', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 contexts: {
Expand DownExpand Up@@ -51,7 +51,7 @@ describe('express tracing', () => {
 });

 test('should set a correct transaction name for routes specified in RegEx', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /\\/test\\/regex/',
Expand All@@ -77,10 +77,52 @@ describe('express tracing', () => {
 await runner.completed();
 });

 test('handles root page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'GET /',
 },
 })
 .start();
 runner.makeRequest('get', '/');
 await runner.completed();
 });

 test('handles 404 page correctly', async () => {
 const runner = createRunner()
 .expect({
 transaction: {
 // FIXME: This is wrong :(
 transaction: 'GET /',
 contexts: {
 trace: {
 span_id: expect.stringMatching(/[a-f0-9]{16}/),
 trace_id: expect.stringMatching(/[a-f0-9]{32}/),
 data: {
 'http.response.status_code': 404,
 url: expect.stringMatching(/\/does-not-exist$/),
 'http.method': 'GET',
 // FIXME: This is wrong :(
 'http.route': '/',
 'http.url': expect.stringMatching(/\/does-not-exist$/),
 'http.target': '/does-not-exist',
 },
 op: 'http.server',
 status: 'not_found',
 },
 },
 },
 })
 .start();
 runner.makeRequest('get', '/does-not-exist', { expectError: true });
 await runner.completed();
 });

 test.each([['array1'], ['array5']])(
 'should set a correct transaction name for routes consisting of arrays of routes for %p',
 async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
Expand DownExpand Up@@ -115,7 +157,7 @@ describe('express tracing', () => {
 ['arr/required/lastParam'],
 ['arr55/required/lastParam'],
 ])('should handle more complex regexes in route arrays correctly for %p', async (segment: string) => {
 const runner = await createRunner(__dirname, 'server.js')
 const runner = await createRunner()
 .expect({
 transaction: {
 transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
Expand DownExpand Up@@ -143,7 +185,7 @@ describe('express tracing', () => {

 describe('request data', () => {
 test('correctly captures JSON request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand DownExpand Up@@ -173,7 +215,7 @@ describe('express tracing', () => {
 });

 test('correctly captures plain text request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -198,7 +240,7 @@ describe('express tracing', () => {
 });

 test('correctly captures text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand All@@ -223,7 +265,7 @@ describe('express tracing', () => {
 });

 test('correctly captures non-text buffer request data', async () => {
 const runner = createRunner(__dirname, 'server.js')
 const runner = createRunner()
 .expect({
 transaction: {
 transaction: 'POST /test-post',
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/updateName/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/node';
import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/express-v5/tracing/withError/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';

describe('express tracing experimental', () => {
describe('express v5 tracing', () => {
 afterAll(() => {
 cleanupChildProcesses();
 });
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/express-v5/tsconfig.test.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.json"
}

21 changes: 21 additions & 0 deletions
dev-packages/node-integration-tests/suites/express/tracing/instrument.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
 integrations: [
 Sentry.httpIntegration({
 ignoreIncomingRequestBody: url => {
 if (url.includes('/test-post-ignore-body')) {
 return true;
 }
 return false;
 },
 }),
 ],
});

30 changes: 13 additions & 17 deletions
...tests/suites/express-v5/tracing/server.js → ...tests/suites/express/tracing/scenario.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
const { loggingTransport } = require('@sentry-internal/node-integration-tests');
const Sentry = require('@sentry/node');

Sentry.init({
 dsn: 'https://public@dsn.ingest.sentry.io/1337',
 release: '1.0',
 // disable attaching headers to /test/* endpoints
 tracePropagationTargets: [/^(?!.*test).*$/],
 tracesSampleRate: 1.0,
 transport: loggingTransport,
});

// express must be required after Sentry is initialized
const express = require('express');
const cors = require('cors');
const bodyParser = require('body-parser');
const { startExpressServerAndSendPortToRunner } = require('@sentry-internal/node-integration-tests');
import * as Sentry from '@sentry/node';
import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import cors from 'cors';
import express from 'express';

const app = express();

Expand All@@ -23,6 +11,10 @@ app.use(bodyParser.json());
app.use(bodyParser.text());
app.use(bodyParser.raw());

app.get('/', (_req, res) => {
 res.send({ response: 'response 0' });
});

app.get('/test/express', (_req, res) => {
 res.send({ response: 'response 1' });
});
Expand All@@ -43,6 +35,10 @@ app.post('/test-post', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

app.post('/test-post-ignore-body', function (req, res) {
 res.send({ status: 'ok', body: req.body });
});

Sentry.setupExpressErrorHandler(app);

startExpressServerAndSendPortToRunner(app);

62 changes: 0 additions & 62 deletions
dev-packages/node-integration-tests/suites/express/tracing/server.js

View file


Open in desktop


This file was deleted.

Loading