Skip to content

Commit 401f292

Browse files
andreiborzaandreiborza
authored
Merge branch 'develop' into ab/node-light-outgoing-fetch-propagation
2 parents 3bc15a0 + ef9916a commit 401f292

File tree

39 files changed

+3010
-766
lines changed

39 files changed

+3010
-766
lines changed

‎.size-limit.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ module.exports = [
8989
path: 'packages/browser/build/npm/esm/prod/index.js',
9090
import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'feedbackIntegration'),
9191
gzip: true,
92-
limit: '98 KB',
92+
limit: '99 KB',
9393
},
9494
{
9595
name: '@sentry/browser (incl. Feedback)',
@@ -156,7 +156,7 @@ module.exports = [
156156
path: 'packages/vue/build/esm/index.js',
157157
import: createImport('init'),
158158
gzip: true,
159-
limit: '30 KB',
159+
limit: '31 KB',
160160
},
161161
{
162162
name: '@sentry/vue (incl. Tracing)',
@@ -196,7 +196,7 @@ module.exports = [
196196
name: 'CDN Bundle (incl. Tracing, Logs, Metrics)',
197197
path: createCDNPath('bundle.tracing.logs.metrics.min.js'),
198198
gzip: true,
199-
limit: '44 KB',
199+
limit: '45 KB',
200200
},
201201
{
202202
name: 'CDN Bundle (incl. Replay, Logs, Metrics)',
@@ -208,7 +208,7 @@ module.exports = [
208208
name: 'CDN Bundle (incl. Tracing, Replay)',
209209
path: createCDNPath('bundle.tracing.replay.min.js'),
210210
gzip: true,
211-
limit: '80 KB',
211+
limit: '81 KB',
212212
},
213213
{
214214
name: 'CDN Bundle (incl. Tracing, Replay, Logs, Metrics)',

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
66

7-
Work in this release was contributed by @limbonaut. Thank you for your contribution!
7+
Work in this release was contributed by @limbonaut and @rfoel. Thank you for your contributions!
88

99
### Important Changes
1010

‎dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/init.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import * as Sentry from '@sentry/browser';
2+
3+
window.Sentry = Sentry;
4+
5+
Sentry.init({
6+
dsn: 'https://public@dsn.ingest.sentry.io/1337',
7+
release: '0.1',
8+
integrations: [Sentry.browserSessionIntegration({ lifecycle: 'page' })],
9+
});

‎dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/subject.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
let clickCount = 0;
2+
3+
document.getElementById('navigate').addEventListener('click', () => {
4+
clickCount++;
5+
// Each click navigates to a different page
6+
history.pushState({}, '', `/page-${clickCount}`);
7+
});
8+
9+
document.getElementById('manual-session').addEventListener('click', () => {
10+
Sentry.startSession();
11+
Sentry.captureException('Test error from manual session');
12+
});

‎dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/template.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8" />
5+
</head>
6+
<body>
7+
<button id="navigate">Navigate via pushState</button>
8+
<button id="manual-session">Manual session</button>
9+
</body>
10+
</html>

‎dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/test.ts‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
import { expect } from '@playwright/test';
2+
import type { SessionContext } from '@sentry/core';
3+
import { sentryTest } from '../../../utils/fixtures';
4+
import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers';
5+
6+
sentryTest('should start a session on pageload with page lifecycle.', async ({ getLocalTestUrl, page }) => {
7+
const url = await getLocalTestUrl({ testDir: __dirname });
8+
9+
const sessions = await getMultipleSentryEnvelopeRequests<SessionContext>(page, 1, {
10+
url,
11+
envelopeType: 'session',
12+
timeout: 2000,
13+
});
14+
15+
expect(sessions.length).toBeGreaterThanOrEqual(1);
16+
const session = sessions[0];
17+
expect(session).toBeDefined();
18+
expect(session.init).toBe(true);
19+
expect(session.errors).toBe(0);
20+
expect(session.status).toBe('ok');
21+
});
22+
23+
sentryTest(
24+
'should NOT start a new session on pushState navigation with page lifecycle.',
25+
async ({ getLocalTestUrl, page }) => {
26+
const url = await getLocalTestUrl({ testDir: __dirname });
27+
28+
const sessionsPromise = getMultipleSentryEnvelopeRequests<SessionContext>(page, 10, {
29+
url,
30+
envelopeType: 'session',
31+
timeout: 4000,
32+
});
33+
34+
const manualSessionsPromise = getMultipleSentryEnvelopeRequests<SessionContext>(page, 10, {
35+
envelopeType: 'session',
36+
timeout: 4000,
37+
});
38+
39+
const eventsPromise = getMultipleSentryEnvelopeRequests<SessionContext>(page, 10, {
40+
envelopeType: 'event',
41+
timeout: 4000,
42+
});
43+
44+
await page.waitForSelector('#navigate');
45+
46+
await page.locator('#navigate').click();
47+
await page.locator('#navigate').click();
48+
await page.locator('#navigate').click();
49+
50+
const sessions = (await sessionsPromise).filter(session => session.init);
51+
52+
expect(sessions.length).toBe(1);
53+
expect(sessions[0].init).toBe(true);
54+
55+
// teardown and verify if nothing else got sent
56+
await page.locator('#manual-session').click();
57+
58+
const newSessions = (await manualSessionsPromise).filter(session => session.init);
59+
const events = await eventsPromise;
60+
61+
expect(newSessions.length).toBe(2);
62+
expect(newSessions[0].init).toBe(true);
63+
expect(newSessions[1].init).toBe(true);
64+
expect(newSessions[1].sid).not.toBe(newSessions[0].sid);
65+
expect(events).toEqual([
66+
expect.objectContaining({
67+
level: 'error',
68+
message: 'Test error from manual session',
69+
}),
70+
]);
71+
},
72+
);

‎dev-packages/browser-integration-tests/suites/sessions/route-lifecycle/init.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import * as Sentry from '@sentry/browser';
2+
3+
window.Sentry = Sentry;
4+
5+
Sentry.init({
6+
dsn: 'https://public@dsn.ingest.sentry.io/1337',
7+
release: '0.1',
8+
});

‎dev-packages/browser-integration-tests/suites/sessions/route-lifecycle/subject.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
let clickCount = 0;
2+
3+
document.getElementById('navigate').addEventListener('click', () => {
4+
clickCount++;
5+
history.pushState({}, '', `/page-${clickCount}`);
6+
});

‎dev-packages/browser-integration-tests/suites/sessions/route-lifecycle/template.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8" />
5+
</head>
6+
<body>
7+
<button id="navigate">Navigate via pushState</button>
8+
</body>
9+
</html>

‎dev-packages/browser-integration-tests/suites/sessions/route-lifecycle/test.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { expect } from '@playwright/test';
2+
import type { SessionContext } from '@sentry/core';
3+
import { sentryTest } from '../../../utils/fixtures';
4+
import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers';
5+
6+
sentryTest(
7+
'should start new sessions on pushState navigation with route lifecycle (default).',
8+
async ({ getLocalTestUrl, page }) => {
9+
const url = await getLocalTestUrl({ testDir: __dirname });
10+
11+
const sessionsPromise = getMultipleSentryEnvelopeRequests<SessionContext>(page, 10, {
12+
url,
13+
envelopeType: 'session',
14+
timeout: 4000,
15+
});
16+
17+
await page.waitForSelector('#navigate');
18+
19+
await page.locator('#navigate').click();
20+
await page.locator('#navigate').click();
21+
await page.locator('#navigate').click();
22+
23+
const sessions = (await sessionsPromise).filter(session => session.init);
24+
25+
expect(sessions.length).toBe(3);
26+
},
27+
);

0 commit comments

Comments
 (0)