Skip to content

Commit 9b5cf26

Browse files
authored
fix(node): Ensure autoSessionTracking is enabled by default (#12790)
I noticed that we were not actually enabling auto session tracking correctly in node, because we did not check on the correct `options` object 😬
1 parent 25db805 commit 9b5cf26

File tree

45 files changed

+180
-152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+180
-152
lines changed

dev-packages/node-integration-tests/suites/anr/test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ conditionalTest({ min: 16 })('should report ANR when event loop blocked', () =>
110110
test('With session', done => {
111111
createRunner(__dirname, 'basic-session.js')
112112
.withMockSentryServer()
113+
.unignore('session')
113114
.expect({
114115
session: {
115116
status: 'abnormal',

dev-packages/node-integration-tests/suites/esm/warn-esm/test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ test("warns if using ESM on Node.js versions that don't support `register()`", a
1313
return;
1414
}
1515

16-
const runner = createRunner(__dirname, 'server.mjs').ignore('session', 'sessions', 'event').start();
16+
const runner = createRunner(__dirname, 'server.mjs').ignore('event').start();
1717

1818
await runner.makeRequest('get', '/test/success');
1919

@@ -26,15 +26,15 @@ test('does not warn if using ESM on Node.js versions that support `register()`',
2626
return;
2727
}
2828

29-
const runner = createRunner(__dirname, 'server.mjs').ignore('session', 'sessions', 'event').start();
29+
const runner = createRunner(__dirname, 'server.mjs').ignore('event').start();
3030

3131
await runner.makeRequest('get', '/test/success');
3232

3333
expect(runner.getLogs()).not.toContain(esmWarning);
3434
});
3535

3636
test('does not warn if using CJS', async () => {
37-
const runner = createRunner(__dirname, 'server.js').ignore('session', 'sessions', 'event').start();
37+
const runner = createRunner(__dirname, 'server.js').ignore('event').start();
3838

3939
await runner.makeRequest('get', '/test/success');
4040

dev-packages/node-integration-tests/suites/express/handle-error-scope-data-loss/test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ afterAll(() => {
1515
*/
1616
test('withScope scope is NOT applied to thrown error caught by global handler', done => {
1717
const runner = createRunner(__dirname, 'server.ts')
18-
.ignore('session', 'sessions')
1918
.expect({
2019
event: {
2120
exception: {
@@ -53,7 +52,6 @@ test('withScope scope is NOT applied to thrown error caught by global handler',
5352
*/
5453
test('isolation scope is applied to thrown error caught by global handler', done => {
5554
const runner = createRunner(__dirname, 'server.ts')
56-
.ignore('session', 'sessions')
5755
.expect({
5856
event: {
5957
exception: {

dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-0/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ afterAll(() => {
66

77
test('should capture and send Express controller error with txn name if tracesSampleRate is 0', done => {
88
const runner = createRunner(__dirname, 'server.ts')
9-
.ignore('session', 'sessions', 'transaction')
9+
.ignore('transaction')
1010
.expect({
1111
event: {
1212
exception: {

dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-unset/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ afterAll(() => {
66

77
test('should capture and send Express controller error if tracesSampleRate is not set.', done => {
88
const runner = createRunner(__dirname, 'server.ts')
9-
.ignore('session', 'sessions', 'transaction')
9+
.ignore('transaction')
1010
.expect({
1111
event: {
1212
exception: {

dev-packages/node-integration-tests/suites/express/multiple-init/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ afterAll(() => {
66

77
test('allows to call init multiple times', done => {
88
const runner = createRunner(__dirname, 'server.ts')
9-
.ignore('session', 'sessions')
109
.expect({
1110
event: {
1211
exception: {

dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ afterAll(() => {
66

77
test('should construct correct url with common infixes with multiple parameterized routers.', done => {
88
createRunner(__dirname, 'server.ts')
9-
.ignore('transaction', 'session', 'sessions')
9+
.ignore('transaction')
1010
.expect({ event: { message: 'Custom Message', transaction: 'GET /api/v1/user/:userId' } })
1111
.start(done)
1212
.makeRequest('get', '/api/v1/user/3212');

dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ afterAll(() => {
66

77
test('should construct correct url with common infixes with multiple routers.', done => {
88
createRunner(__dirname, 'server.ts')
9-
.ignore('transaction', 'session', 'sessions')
9+
.ignore('transaction')
1010
.expect({ event: { message: 'Custom Message', transaction: 'GET /api2/v1/test' } })
1111
.start(done)
1212
.makeRequest('get', '/api2/v1/test');

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ afterAll(() => {
66

77
test('should construct correct urls with multiple parameterized routers (use order reversed).', done => {
88
createRunner(__dirname, 'server.ts')
9-
.ignore('transaction', 'session', 'sessions')
9+
.ignore('transaction')
1010
.expect({ event: { message: 'Custom Message', transaction: 'GET /api/v1/user/:userId' } })
1111
.start(done)
1212
.makeRequest('get', '/api/v1/user/1234/');

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ afterAll(() => {
66

77
test('should construct correct urls with multiple parameterized routers.', done => {
88
createRunner(__dirname, 'server.ts')
9-
.ignore('transaction', 'session', 'sessions')
9+
.ignore('transaction')
1010
.expect({ event: { message: 'Custom Message', transaction: 'GET /api/v1/user/:userId' } })
1111
.start(done)
1212
.makeRequest('get', '/api/v1/user/1234/');

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ afterAll(() => {
66

77
test('should construct correct url with multiple parameterized routers of the same length (use order reversed).', done => {
88
createRunner(__dirname, 'server.ts')
9-
.ignore('transaction', 'session', 'sessions')
9+
.ignore('transaction')
1010
.expect({ event: { message: 'Custom Message', transaction: 'GET /api/v1/:userId' } })
1111
.start(done)
1212
.makeRequest('get', '/api/v1/1234/');

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ afterAll(() => {
66

77
test('should construct correct url with multiple parameterized routers of the same length.', done => {
88
createRunner(__dirname, 'server.ts')
9-
.ignore('transaction', 'session', 'sessions')
9+
.ignore('transaction')
1010
.expect({ event: { message: 'Custom Message', transaction: 'GET /api/v1/:userId' } })
1111
.start(done)
1212
.makeRequest('get', '/api/v1/1234/');

dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ afterAll(() => {
66

77
test('should construct correct urls with multiple routers.', done => {
88
createRunner(__dirname, 'server.ts')
9-
.ignore('transaction', 'session', 'sessions')
9+
.ignore('transaction')
1010
.expect({ event: { message: 'Custom Message', transaction: 'GET /api/v1/test' } })
1111
.start(done)
1212
.makeRequest('get', '/api/v1/test');

dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ conditionalTest({ min: 16 })('complex-router', () => {
2828
};
2929

3030
createRunner(__dirname, 'server.ts')
31-
.ignore('event', 'session', 'sessions')
31+
.ignore('event')
3232
.expect({ transaction: EXPECTED_TRANSACTION as any })
3333
.start(done)
3434
.makeRequest('get', '/api/api/v1/sub-router/users/123/posts/456');
@@ -54,7 +54,7 @@ conditionalTest({ min: 16 })('complex-router', () => {
5454
};
5555

5656
createRunner(__dirname, 'server.ts')
57-
.ignore('event', 'session', 'sessions')
57+
.ignore('event')
5858
.expect({ transaction: EXPECTED_TRANSACTION as any })
5959
.start(done)
6060
.makeRequest('get', '/api/api/v1/sub-router/users/123/posts/456?param=1');
@@ -80,7 +80,7 @@ conditionalTest({ min: 16 })('complex-router', () => {
8080
};
8181

8282
createRunner(__dirname, 'server.ts')
83-
.ignore('event', 'session', 'sessions')
83+
.ignore('event')
8484
.expect({ transaction: EXPECTED_TRANSACTION as any })
8585
.start(done)
8686
.makeRequest('get', '/api/api/v1/sub-router/users/123/posts/456/?param=1');

dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
2727
};
2828

2929
createRunner(__dirname, 'server.ts')
30-
.ignore('event', 'session', 'sessions')
30+
.ignore('event')
3131
.expect({ transaction: EXPECTED_TRANSACTION as any })
3232
.start(done)
3333
.makeRequest('get', '/api/v1/users/123/posts/456');

dev-packages/node-integration-tests/suites/express/span-isolationScope/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ afterAll(() => {
66

77
test('correctly applies isolation scope to span', done => {
88
createRunner(__dirname, 'server.ts')
9-
.ignore('session', 'sessions')
109
.expect({
1110
transaction: {
1211
transaction: 'GET /test/isolationScope',

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ describe('express tracing', () => {
88
describe('CJS', () => {
99
test('should create and send transactions for Express routes and spans for middlewares.', done => {
1010
createRunner(__dirname, 'server.js')
11-
.ignore('session', 'sessions')
1211
.expect({
1312
transaction: {
1413
contexts: {
@@ -51,7 +50,6 @@ describe('express tracing', () => {
5150

5251
test('should set a correct transaction name for routes specified in RegEx', done => {
5352
createRunner(__dirname, 'server.js')
54-
.ignore('session', 'sessions')
5553
.expect({
5654
transaction: {
5755
transaction: 'GET /\\/test\\/regex/',
@@ -80,7 +78,6 @@ describe('express tracing', () => {
8078
'should set a correct transaction name for routes consisting of arrays of routes for %p',
8179
((segment: string, done: () => void) => {
8280
createRunner(__dirname, 'server.js')
83-
.ignore('session', 'sessions')
8481
.expect({
8582
transaction: {
8683
transaction: 'GET /test/array1,/\\/test\\/array[2-9]/',
@@ -117,7 +114,6 @@ describe('express tracing', () => {
117114
['arr/requiredPath/optionalPath/lastParam'],
118115
])('should handle more complex regexes in route arrays correctly for %p', ((segment: string, done: () => void) => {
119116
createRunner(__dirname, 'server.js')
120-
.ignore('session', 'sessions')
121117
.expect({
122118
transaction: {
123119
transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('express tracing experimental', () => {
88
describe('CJS', () => {
99
test('should apply the scope transactionName to error events', done => {
1010
createRunner(__dirname, 'server.js')
11-
.ignore('session', 'sessions', 'transaction')
11+
.ignore('transaction')
1212
.expect({
1313
event: {
1414
exception: {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ afterAll(() => {
66

77
test('correctly applies isolation scope even without tracing', done => {
88
const runner = createRunner(__dirname, 'server.ts')
9-
.ignore('session', 'sessions')
109
.expect({
1110
event: {
1211
transaction: 'GET /test/isolationScope/1',

dev-packages/node-integration-tests/suites/proxy/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ afterAll(() => {
77
test('proxies sentry requests', done => {
88
createRunner(__dirname, 'basic.js')
99
.withMockSentryServer()
10-
.ignore('session')
1110
.expect({
1211
event: {
1312
message: 'Hello, via proxy!',

dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
4141

4242
test('Should not include local variables by default', done => {
4343
createRunner(__dirname, 'no-local-variables.js')
44-
.ignore('session')
4544
.expect({
4645
event: event => {
4746
for (const frame of event.exception?.values?.[0]?.stacktrace?.frames || []) {
@@ -53,40 +52,30 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
5352
});
5453

5554
test('Should include local variables when enabled', done => {
56-
createRunner(__dirname, 'local-variables.js')
57-
.ignore('session')
58-
.expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
59-
.start(done);
55+
createRunner(__dirname, 'local-variables.js').expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT }).start(done);
6056
});
6157

6258
test('Should include local variables when instrumenting via --require', done => {
6359
const requirePath = path.resolve(__dirname, 'local-variables-instrument.js');
6460

6561
createRunner(__dirname, 'local-variables-no-sentry.js')
6662
.withFlags(`--require=${requirePath}`)
67-
.ignore('session')
6863
.expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
6964
.start(done);
7065
});
7166

7267
test('Should include local variables with ESM', done => {
73-
createRunner(__dirname, 'local-variables-caught.mjs')
74-
.ignore('session')
75-
.expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
76-
.start(done);
68+
createRunner(__dirname, 'local-variables-caught.mjs').expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT }).start(done);
7769
});
7870

7971
conditionalTest({ min: 19 })('Node v19+', () => {
8072
test('Should not import inspector when not in use', done => {
81-
createRunner(__dirname, 'deny-inspector.mjs').ensureNoErrorOutput().ignore('session').start(done);
73+
createRunner(__dirname, 'deny-inspector.mjs').ensureNoErrorOutput().start(done);
8274
});
8375
});
8476

8577
test('Includes local variables for caught exceptions when enabled', done => {
86-
createRunner(__dirname, 'local-variables-caught.js')
87-
.ignore('session')
88-
.expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
89-
.start(done);
78+
createRunner(__dirname, 'local-variables-caught.js').expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT }).start(done);
9079
});
9180

9281
test('Should not leak memory', done => {

dev-packages/node-integration-tests/suites/sessions/crashed-session-aggregate/test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ test('should aggregate successful and crashed sessions', async () => {
1111
});
1212

1313
const runner = createRunner(__dirname, 'server.ts')
14-
.ignore('transaction', 'event', 'session')
14+
.ignore('transaction', 'event')
15+
.unignore('sessions')
1516
.expectError()
1617
.expect({
1718
sessions: {

dev-packages/node-integration-tests/suites/sessions/errored-session-aggregate/test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ test('should aggregate successful, crashed and erroneous sessions', async () =>
1111
});
1212

1313
const runner = createRunner(__dirname, 'server.ts')
14-
.ignore('transaction', 'event', 'session')
14+
.ignore('transaction', 'event')
15+
.unignore('sessions')
1516
.expectError()
1617
.expect({
1718
sessions: {

dev-packages/node-integration-tests/suites/sessions/exited-session-aggregate/test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ test('should aggregate successful sessions', async () => {
1111
});
1212

1313
const runner = createRunner(__dirname, 'server.ts')
14-
.ignore('transaction', 'event', 'session')
14+
.ignore('transaction', 'event')
15+
.unignore('sessions')
1516
.expectError()
1617
.expect({
1718
sessions: {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe('connect auto-instrumentation', () => {
4747

4848
test('CJS - should capture errors in `connect` middleware.', done => {
4949
createRunner(__dirname, 'scenario.js')
50-
.ignore('transaction', 'session', 'sessions')
50+
.ignore('transaction')
5151
.expectError()
5252
.expect({ event: EXPECTED_EVENT })
5353
.start(done)
@@ -56,7 +56,7 @@ describe('connect auto-instrumentation', () => {
5656

5757
test('CJS - should report errored transactions.', done => {
5858
createRunner(__dirname, 'scenario.js')
59-
.ignore('event', 'session', 'sessions')
59+
.ignore('event')
6060
.expect({ transaction: { transaction: 'GET /error' } })
6161
.expectError()
6262
.start(done)

dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createRunner } from '../../../../utils/runner';
22

33
test('envelope header for error event during active unsampled span is correct', done => {
44
createRunner(__dirname, 'scenario.ts')
5-
.ignore('session', 'sessions', 'transaction')
5+
.ignore('transaction')
66
.expectHeader({
77
event: {
88
trace: {

dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { createRunner } from '../../../../utils/runner';
22

33
test('envelope header for error event during active span is correct', done => {
44
createRunner(__dirname, 'scenario.ts')
5-
.ignore('session', 'sessions', 'transaction')
5+
.ignore('transaction')
66
.expectHeader({
77
event: {
88
trace: {

dev-packages/node-integration-tests/suites/tracing/envelope-header/error/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { createRunner } from '../../../../utils/runner';
22

33
test('envelope header for error events is correct', done => {
44
createRunner(__dirname, 'scenario.ts')
5-
.ignore('session', 'sessions')
65
.expectHeader({
76
event: {
87
trace: {

dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { createRunner } from '../../../../utils/runner';
22

33
test('envelope header for transaction event of route correct', done => {
44
createRunner(__dirname, 'scenario.ts')
5-
.ignore('session', 'sessions')
65
.expectHeader({
76
transaction: {
87
trace: {

dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { createRunner } from '../../../../utils/runner';
22

33
test('envelope header for transaction event with source=url correct', done => {
44
createRunner(__dirname, 'scenario.ts')
5-
.ignore('session', 'sessions')
65
.expectHeader({
76
transaction: {
87
trace: {

dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { createRunner } from '../../../../utils/runner';
22

33
test('envelope header for transaction event is correct', done => {
44
createRunner(__dirname, 'scenario.ts')
5-
.ignore('session', 'sessions')
65
.expectHeader({
76
transaction: {
87
trace: {

0 commit comments

Comments
 (0)