diff --git a/.size-limit.js b/.size-limit.js index fe0cd23c59b7..06b4b9136142 100644 --- a/.size-limit.js +++ b/.size-limit.js @@ -15,7 +15,7 @@ module.exports = [ path: 'packages/browser/build/npm/esm/prod/index.js', import: createImport('init'), gzip: true, - limit: '24.5 KB', + limit: '24.1 KB', modifyWebpackConfig: function (config) { const webpack = require('webpack'); @@ -190,7 +190,7 @@ module.exports = [ name: 'CDN Bundle (incl. Logs, Metrics)', path: createCDNPath('bundle.logs.metrics.min.js'), gzip: true, - limit: '30 KB', + limit: '29 KB', }, { name: 'CDN Bundle (incl. Tracing, Logs, Metrics)', @@ -214,7 +214,7 @@ module.exports = [ name: 'CDN Bundle (incl. Tracing, Replay, Logs, Metrics)', path: createCDNPath('bundle.tracing.replay.logs.metrics.min.js'), gzip: true, - limit: '82 KB', + limit: '81 KB', }, { name: 'CDN Bundle (incl. Tracing, Replay, Feedback)', @@ -241,7 +241,7 @@ module.exports = [ path: createCDNPath('bundle.tracing.min.js'), gzip: false, brotli: false, - limit: '129 KB', + limit: '128 KB', }, { name: 'CDN Bundle (incl. Logs, Metrics) - uncompressed', diff --git a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/template.html b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/template.html index e7c463998c02..291d2f23499b 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/template.html +++ b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/template.html @@ -4,6 +4,6 @@ - Navigate + Navigate diff --git a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts index c7bb2c571f2d..781e22c28f40 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts +++ b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts @@ -1,42 +1,31 @@ +import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; +import type { SessionContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; -import { waitForSession } from '../../../utils/helpers'; +import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; -sentryTest('starts a new session on pageload.', async ({ getLocalTestUrl, page }) => { +sentryTest('should start a new session on pageload.', async ({ getLocalTestUrl, page }) => { const url = await getLocalTestUrl({ testDir: __dirname }); - const sessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - - await page.goto(url); - const session = await sessionPromise; + const session = await getFirstSentryEnvelopeRequest(page, url); expect(session).toBeDefined(); - expect(session).toEqual({ - attrs: { - environment: 'production', - release: '0.1', - user_agent: expect.any(String), - }, - did: '1337', - errors: 0, - init: true, - sid: expect.any(String), - started: expect.any(String), - status: 'ok', - timestamp: expect.any(String), - }); + expect(session.init).toBe(true); + expect(session.errors).toBe(0); + expect(session.status).toBe('ok'); + expect(session.did).toBe('1337'); }); -sentryTest('starts a new session with navigation.', async ({ getLocalTestUrl, page }) => { +sentryTest('should start a new session with navigation.', async ({ getLocalTestUrl, page }) => { const url = await getLocalTestUrl({ testDir: __dirname }); - const initSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - await page.goto(url); - const initSession = await initSessionPromise; + // Route must be set up before any navigation to avoid race conditions + await page.route('**/foo', (route: Route) => route.continue({ url })); + + const initSession = await getFirstSentryEnvelopeRequest(page, url); - const newSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); await page.locator('#navigate').click(); - const newSession = await newSessionPromise; + const newSession = await getFirstSentryEnvelopeRequest(page, url); expect(newSession).toBeDefined(); expect(newSession.init).toBe(true); diff --git a/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/subject.js b/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/subject.js index 812e436a0a1f..11d2e4fd8ada 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/subject.js +++ b/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/subject.js @@ -10,7 +10,3 @@ document.getElementById('manual-session').addEventListener('click', () => { Sentry.startSession(); Sentry.captureException('Test error from manual session'); }); - -document.getElementById('error').addEventListener('click', () => { - throw new Error('Test error from error button'); -}); diff --git a/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/template.html b/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/template.html index 994ca54735c6..3e0d0aefc7df 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/template.html +++ b/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/template.html @@ -6,6 +6,5 @@ - diff --git a/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/test.ts b/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/test.ts index 869b194031cf..1837393f86cc 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/test.ts +++ b/dev-packages/browser-integration-tests/suites/sessions/page-lifecycle/test.ts @@ -1,53 +1,45 @@ import { expect } from '@playwright/test'; -import type { SerializedSession } from '@sentry/core/src'; +import type { SessionContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; -import { - envelopeRequestParser, - getMultipleSentryEnvelopeRequests, - waitForErrorRequest, - waitForSession, -} from '../../../utils/helpers'; +import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers'; -sentryTest('starts a session on pageload with page lifecycle.', async ({ getLocalTestUrl, page }) => { +sentryTest('should start a session on pageload with page lifecycle.', async ({ getLocalTestUrl, page }) => { const url = await getLocalTestUrl({ testDir: __dirname }); - const sessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - await page.goto(url); - const session = await sessionPromise; + const sessions = await getMultipleSentryEnvelopeRequests(page, 1, { + url, + envelopeType: 'session', + timeout: 2000, + }); + expect(sessions.length).toBeGreaterThanOrEqual(1); + const session = sessions[0]; expect(session).toBeDefined(); - expect(session).toEqual({ - attrs: { - environment: 'production', - release: '0.1', - user_agent: expect.any(String), - }, - errors: 0, - init: true, - sid: expect.any(String), - started: expect.any(String), - status: 'ok', - timestamp: expect.any(String), - }); + expect(session.init).toBe(true); + expect(session.errors).toBe(0); + expect(session.status).toBe('ok'); }); sentryTest( - "doesn't start a new session on pushState navigation with page lifecycle.", + 'should NOT start a new session on pushState navigation with page lifecycle.', async ({ getLocalTestUrl, page }) => { const url = await getLocalTestUrl({ testDir: __dirname }); - const sessionsPromise = getMultipleSentryEnvelopeRequests(page, 10, { + const sessionsPromise = getMultipleSentryEnvelopeRequests(page, 10, { url, envelopeType: 'session', timeout: 4000, }); - const manualSessionsPromise = getMultipleSentryEnvelopeRequests(page, 10, { + const manualSessionsPromise = getMultipleSentryEnvelopeRequests(page, 10, { envelopeType: 'session', timeout: 4000, }); - const eventsPromise = waitForErrorRequest(page, e => e.message === 'Test error from manual session'); + const eventsPromise = getMultipleSentryEnvelopeRequests(page, 10, { + envelopeType: 'event', + timeout: 4000, + }); await page.waitForSelector('#navigate'); @@ -64,42 +56,17 @@ sentryTest( await page.locator('#manual-session').click(); const newSessions = (await manualSessionsPromise).filter(session => session.init); - const event = envelopeRequestParser(await eventsPromise); + const events = await eventsPromise; expect(newSessions.length).toBe(2); expect(newSessions[0].init).toBe(true); expect(newSessions[1].init).toBe(true); expect(newSessions[1].sid).not.toBe(newSessions[0].sid); - expect(event).toEqual( + expect(events).toEqual([ expect.objectContaining({ level: 'error', message: 'Test error from manual session', }), - ); + ]); }, ); - -sentryTest('Updates the session when an error is thrown', async ({ getLocalTestUrl, page }) => { - const url = await getLocalTestUrl({ testDir: __dirname }); - - const initialSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - await page.goto(url); - const initialSession = await initialSessionPromise; - - // for good measure, throw in a few navigations - await page.locator('#navigate').click(); - await page.locator('#navigate').click(); - await page.locator('#navigate').click(); - - const updatedSessionPromise = waitForSession(page, s => !s.init && s.status !== 'ok'); - await page.locator('#error').click(); - const updatedSession = await updatedSessionPromise; - - expect(updatedSession).toEqual({ - ...initialSession, - errors: 1, - init: false, - status: 'crashed', - timestamp: expect.any(String), - }); -}); diff --git a/dev-packages/browser-integration-tests/suites/sessions/route-lifecycle/test.ts b/dev-packages/browser-integration-tests/suites/sessions/route-lifecycle/test.ts index 1ccee9cd2728..4f4f0641feeb 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/route-lifecycle/test.ts +++ b/dev-packages/browser-integration-tests/suites/sessions/route-lifecycle/test.ts @@ -1,5 +1,5 @@ import { expect } from '@playwright/test'; -import type { SerializedSession } from '@sentry/core/src'; +import type { SessionContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers'; @@ -8,7 +8,7 @@ sentryTest( async ({ getLocalTestUrl, page }) => { const url = await getLocalTestUrl({ testDir: __dirname }); - const sessionsPromise = getMultipleSentryEnvelopeRequests(page, 10, { + const sessionsPromise = getMultipleSentryEnvelopeRequests(page, 10, { url, envelopeType: 'session', timeout: 4000, @@ -20,8 +20,8 @@ sentryTest( await page.locator('#navigate').click(); await page.locator('#navigate').click(); - const startedSessions = (await sessionsPromise).filter(session => session.init); + const sessions = (await sessionsPromise).filter(session => session.init); - expect(startedSessions.length).toBe(4); + expect(sessions.length).toBe(3); }, ); diff --git a/dev-packages/browser-integration-tests/suites/sessions/start-session/template.html b/dev-packages/browser-integration-tests/suites/sessions/start-session/template.html index e7c463998c02..291d2f23499b 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/start-session/template.html +++ b/dev-packages/browser-integration-tests/suites/sessions/start-session/template.html @@ -4,6 +4,6 @@ - Navigate + Navigate diff --git a/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts b/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts index d5a0d3e7837a..063fcb3dbd13 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts +++ b/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts @@ -1,12 +1,12 @@ +import type { Route } from '@playwright/test'; import { expect } from '@playwright/test'; +import type { SessionContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; -import { waitForSession } from '../../../utils/helpers'; +import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers'; sentryTest('should start a new session on pageload.', async ({ getLocalTestUrl, page }) => { const url = await getLocalTestUrl({ testDir: __dirname }); - const sessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - await page.goto(url); - const session = await sessionPromise; + const session = await getFirstSentryEnvelopeRequest(page, url); expect(session).toBeDefined(); expect(session.init).toBe(true); @@ -16,20 +16,18 @@ sentryTest('should start a new session on pageload.', async ({ getLocalTestUrl, sentryTest('should start a new session with navigation.', async ({ getLocalTestUrl, page }) => { const url = await getLocalTestUrl({ testDir: __dirname }); + await page.route('**/foo', (route: Route) => route.continue({ url })); - const initSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - await page.goto(url); - const initSession = await initSessionPromise; + const initSession = await getFirstSentryEnvelopeRequest(page, url); - const newSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); await page.locator('#navigate').click(); - const newSession = await newSessionPromise; + + const newSession = await getFirstSentryEnvelopeRequest(page, url); expect(newSession).toBeDefined(); expect(newSession.init).toBe(true); expect(newSession.errors).toBe(0); expect(newSession.status).toBe('ok'); expect(newSession.sid).toBeDefined(); - expect(initSession.sid).not.toBe(newSession.sid); }); diff --git a/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts b/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts index 96c68858b361..816cdf1dc056 100644 --- a/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts +++ b/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts @@ -1,22 +1,21 @@ import { expect } from '@playwright/test'; +import type { SessionContext } from '@sentry/core'; import { sentryTest } from '../../../utils/fixtures'; -import { waitForSession } from '../../../utils/helpers'; +import { getFirstSentryEnvelopeRequest, waitForSession } from '../../../utils/helpers'; sentryTest('should update session when an error is thrown.', async ({ getLocalTestUrl, page }) => { - const pageloadSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); const url = await getLocalTestUrl({ testDir: __dirname }); - await page.goto(url); - const pageloadSession = await pageloadSessionPromise; + const pageloadSession = await getFirstSentryEnvelopeRequest(page, url); - const updatedSessionPromise = waitForSession(page, s => !s.init); + const updatedSessionPromise = waitForSession(page); await page.locator('#throw-error').click(); const updatedSession = await updatedSessionPromise; expect(pageloadSession).toBeDefined(); expect(pageloadSession.init).toBe(true); expect(pageloadSession.errors).toBe(0); - + expect(updatedSession).toBeDefined(); expect(updatedSession.init).toBe(false); expect(updatedSession.errors).toBe(1); expect(updatedSession.status).toBe('crashed'); @@ -26,9 +25,7 @@ sentryTest('should update session when an error is thrown.', async ({ getLocalTe sentryTest('should update session when an exception is captured.', async ({ getLocalTestUrl, page }) => { const url = await getLocalTestUrl({ testDir: __dirname }); - const pageloadSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - await page.goto(url); - const pageloadSession = await pageloadSessionPromise; + const pageloadSession = await getFirstSentryEnvelopeRequest(page, url); const updatedSessionPromise = waitForSession(page); await page.locator('#capture-exception').click(); @@ -37,7 +34,6 @@ sentryTest('should update session when an exception is captured.', async ({ getL expect(pageloadSession).toBeDefined(); expect(pageloadSession.init).toBe(true); expect(pageloadSession.errors).toBe(0); - expect(updatedSession).toBeDefined(); expect(updatedSession.init).toBe(false); expect(updatedSession.errors).toBe(1); diff --git a/dev-packages/browser-integration-tests/suites/sessions/user/subject.js b/dev-packages/browser-integration-tests/suites/sessions/user/subject.js deleted file mode 100644 index 16d9653f0b7b..000000000000 --- a/dev-packages/browser-integration-tests/suites/sessions/user/subject.js +++ /dev/null @@ -1,5 +0,0 @@ -Sentry.setUser({ - id: '1337', - email: 'user@name.com', - username: 'user1337', -}); diff --git a/dev-packages/browser-integration-tests/suites/sessions/user/template.html b/dev-packages/browser-integration-tests/suites/sessions/user/template.html deleted file mode 100644 index e7c463998c02..000000000000 --- a/dev-packages/browser-integration-tests/suites/sessions/user/template.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - Navigate - - diff --git a/dev-packages/browser-integration-tests/suites/sessions/user/test.ts b/dev-packages/browser-integration-tests/suites/sessions/user/test.ts deleted file mode 100644 index f9ba096356ce..000000000000 --- a/dev-packages/browser-integration-tests/suites/sessions/user/test.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { expect } from '@playwright/test'; -import { sentryTest } from '../../../utils/fixtures'; -import { waitForSession } from '../../../utils/helpers'; - -sentryTest('updates the session when setting the user', async ({ getLocalTestUrl, page }) => { - const initialSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - const updatedSessionPromise = waitForSession(page, s => !s.init && s.status === 'ok'); - - const url = await getLocalTestUrl({ testDir: __dirname }); - await page.goto(url); - - const initialSession = await initialSessionPromise; - const updatedSession = await updatedSessionPromise; - - expect(initialSession).toEqual({ - attrs: { - environment: 'production', - release: '0.1', - user_agent: expect.any(String), - }, - errors: 0, - init: true, - sid: expect.any(String), - started: expect.any(String), - status: 'ok', - timestamp: expect.any(String), - }); - - expect(updatedSession).toEqual({ - ...initialSession, - init: false, - timestamp: expect.any(String), - did: '1337', - }); -}); - -sentryTest('includes the user id in the exited session', async ({ getLocalTestUrl, page }) => { - const initialSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - - const url = await getLocalTestUrl({ testDir: __dirname }); - await page.goto(url); - - const initialSession = await initialSessionPromise; - - const exitedInitialSessionPromise = waitForSession(page, s => !s.init && s.status === 'exited'); - - await page.locator('#navigate').click(); - - const exitedInitialSession = await exitedInitialSessionPromise; - - expect(exitedInitialSession).toEqual({ - ...initialSession, - timestamp: expect.any(String), - init: false, - status: 'exited', - did: '1337', - }); -}); - -sentryTest('includes the user id in the subsequent session', async ({ getLocalTestUrl, page }) => { - const initialSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok'); - - const url = await getLocalTestUrl({ testDir: __dirname }); - await page.goto(url); - - const initialSession = await initialSessionPromise; - - expect(initialSession).toEqual({ - attrs: { - environment: 'production', - release: '0.1', - user_agent: expect.any(String), - }, - errors: 0, - init: true, - sid: expect.any(String), - started: expect.any(String), - status: 'ok', - timestamp: expect.any(String), - }); - - const secondSessionPromise = waitForSession(page, s => !!s.init && s.status === 'ok' && s.sid !== initialSession.sid); - - await page.locator('#navigate').click(); - - const secondSession = await secondSessionPromise; - - expect(secondSession.sid).not.toBe(initialSession.sid); - expect(secondSession.did).toBe('1337'); -}); diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts index 9da79bf15b0b..ae534463fe80 100644 --- a/dev-packages/browser-integration-tests/utils/generatePlugin.ts +++ b/dev-packages/browser-integration-tests/utils/generatePlugin.ts @@ -202,7 +202,6 @@ class SentryScenarioGenerationPlugin { factory.hooks.parser.for('javascript/auto').tap(this._name, parser => { parser.hooks.import.tap( this._name, - // @ts-expect-error - not sure why this is failing suddenly??? (statement: { specifiers: [{ imported: { name: string } }] }, source: string) => { const imported = statement.specifiers?.[0]?.imported?.name; diff --git a/dev-packages/browser-integration-tests/utils/helpers.ts b/dev-packages/browser-integration-tests/utils/helpers.ts index 50150c6bee20..6cc5188d3c29 100644 --- a/dev-packages/browser-integration-tests/utils/helpers.ts +++ b/dev-packages/browser-integration-tests/utils/helpers.ts @@ -8,7 +8,7 @@ import type { Event as SentryEvent, EventEnvelope, EventEnvelopeHeaders, - SerializedSession, + SessionContext, TransactionEvent, } from '@sentry/core'; import { parseEnvelope } from '@sentry/core'; @@ -283,10 +283,7 @@ export function waitForClientReportRequest(page: Page, callback?: (report: Clien }); } -export async function waitForSession( - page: Page, - callback?: (session: SerializedSession) => boolean, -): Promise { +export async function waitForSession(page: Page): Promise { const req = await page.waitForRequest(req => { const postData = req.postData(); if (!postData) { @@ -294,11 +291,7 @@ export async function waitForSession( } try { - const event = envelopeRequestParser(req); - - if (callback) { - return callback(event); - } + const event = envelopeRequestParser(req); return typeof event.init === 'boolean' && event.started !== undefined; } catch { @@ -306,7 +299,7 @@ export async function waitForSession( } }); - return envelopeRequestParser(req); + return envelopeRequestParser(req); } /** diff --git a/packages/browser/src/integrations/browsersession.ts b/packages/browser/src/integrations/browsersession.ts index 23fdb4087af9..a0eb63034b9f 100644 --- a/packages/browser/src/integrations/browsersession.ts +++ b/packages/browser/src/integrations/browsersession.ts @@ -1,4 +1,4 @@ -import { captureSession, debug, defineIntegration, getIsolationScope, startSession } from '@sentry/core'; +import { captureSession, debug, defineIntegration, startSession } from '@sentry/core'; import { addHistoryInstrumentationHandler } from '@sentry-internal/browser-utils'; import { DEBUG_BUILD } from '../debug-build'; import { WINDOW } from '../helpers'; @@ -43,32 +43,11 @@ export const browserSessionIntegration = defineIntegration((options: BrowserSess startSession({ ignoreDuration: true }); captureSession(); - // User data can be set at any time, for example async after Sentry.init has run and the initial session - // envelope was already sent, but still on the initial page. - // Therefore, we have to update the ongoing session with the new user data if it exists, to send the `did`. - // In theory, sessions, as well as user data is always put onto the isolation scope. So we listen to the - // isolation scope for changes and update the session with the new user data if it exists. - // This will not catch users set onto other scopes, like the current scope. For now, we'll accept this limitation. - // The alternative is to update and capture the session from within the scope. This could be too costly or would not - // play well with session aggregates on the server side. Since this happens in the scope class, we'd need change - // scope behaviour in the browser. - const isolationScope = getIsolationScope(); - let previousUser = isolationScope.getUser(); - isolationScope.addScopeListener(scope => { - const maybeNewUser = scope.getUser(); - // sessions only care about user id and ip address, so we only need to capture the session if the user has changed - if (previousUser?.id !== maybeNewUser?.id || previousUser?.ip_address !== maybeNewUser?.ip_address) { - // the scope class already writes the user to its session, so we only need to capture the session here - captureSession(); - previousUser = maybeNewUser; - } - }); - if (lifecycle === 'route') { // We want to create a session for every navigation as well addHistoryInstrumentationHandler(({ from, to }) => { // Don't create an additional session for the initial route or if the location did not change - if (from !== to) { + if (from !== undefined && from !== to) { startSession({ ignoreDuration: true }); captureSession(); } diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts index 7af14befc185..d7931565b7ab 100644 --- a/packages/core/src/exports.ts +++ b/packages/core/src/exports.ts @@ -16,7 +16,6 @@ import { isThenable } from './utils/is'; import { uuid4 } from './utils/misc'; import type { ExclusiveEventHintOrCaptureContext } from './utils/prepareEvent'; import { parseEventHintOrCaptureContext } from './utils/prepareEvent'; -import { getCombinedScopeData } from './utils/scopeData'; import { timestampInSeconds } from './utils/time'; import { GLOBAL_OBJ } from './utils/worldwide'; @@ -271,14 +270,13 @@ export function addEventProcessor(callback: EventProcessor): void { */ export function startSession(context?: SessionContext): Session { const isolationScope = getIsolationScope(); - - const { user } = getCombinedScopeData(isolationScope, getCurrentScope()); + const currentScope = getCurrentScope(); // Will fetch userAgent if called from browser sdk const { userAgent } = GLOBAL_OBJ.navigator || {}; const session = makeSession({ - user, + user: currentScope.getUser() || isolationScope.getUser(), ...(userAgent && { userAgent }), ...context, });