Skip to content
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

fix(replay): Remove replay id from DSC on expired sessions #14342

Merged
merged 2 commits into from
Nov 19, 2024
Merged

fix(replay): Remove replay id from DSC on expired sessions #14342

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
5b88dc5
remove replay id from dsc on expired sessions
chargome Nov 18, 2024
3c638bd
organize imports
chargome Nov 18, 2024
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
3 changes: 3 additions & 0 deletions packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import type { ReplayContainer } from '../types';
import { isErrorEvent, isFeedbackEvent, isReplayEvent, isTransactionEvent } from '../util/eventUtils';
import { isRrwebError } from '../util/isRrwebError';
import { logger } from '../util/logger';
import { resetReplayIdOnDynamicSamplingContext } from '../util/resetReplayIdOnDynamicSamplingContext';
import { addFeedbackBreadcrumb } from './util/addFeedbackBreadcrumb';
import { shouldSampleForBufferEvent } from './util/shouldSampleForBufferEvent';

Expand Down Expand Up @@ -34,6 +35,8 @@ export function handleGlobalEventListener(replay: ReplayContainer): (event: Even
// Ensure we do not add replay_id if the session is expired
const isSessionActive = replay.checkAndHandleExpiredSession();
if (!isSessionActive) {
// prevent exceeding replay durations by removing the expired replayId from the DSC
resetReplayIdOnDynamicSamplingContext();
return event;
}

Expand Down
18 changes: 18 additions & 0 deletions packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { REPLAY_EVENT_NAME, SESSION_IDLE_EXPIRE_DURATION } from '../../../src/co
import { handleGlobalEventListener } from '../../../src/coreHandlers/handleGlobalEvent';
import type { ReplayContainer } from '../../../src/replay';
import { makeSession } from '../../../src/session/Session';
import * as resetReplayIdOnDynamicSamplingContextModule from '../../../src/util/resetReplayIdOnDynamicSamplingContext';
import { Error } from '../../fixtures/error';
import { Transaction } from '../../fixtures/transaction';
import { resetSdkMock } from '../../mocks/resetSdkMock';
Expand Down Expand Up @@ -416,4 +417,21 @@ describe('Integration | coreHandlers | handleGlobalEvent', () => {
}),
);
});

it('resets replayId on DSC when session expires', () => {
const errorEvent = Error();
const txEvent = Transaction();

vi.spyOn(replay, 'checkAndHandleExpiredSession').mockReturnValue(false);

const resetReplayIdSpy = vi.spyOn(
resetReplayIdOnDynamicSamplingContextModule,
'resetReplayIdOnDynamicSamplingContext',
);

handleGlobalEventListener(replay)(errorEvent, {});
handleGlobalEventListener(replay)(txEvent, {});

expect(resetReplayIdSpy).toHaveBeenCalledTimes(2);
});
});
Loading