use shouldRefreshSession instead of isSessionExpired

Author: billyvg

packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts

@@ -4,7 +4,7 @@ import { saveSession } from '../session/saveSession';
 import type { ReplayContainer } from '../types';
 import { isErrorEvent, isFeedbackEvent, isReplayEvent, isTransactionEvent } from '../util/eventUtils';
 import { isRrwebError } from '../util/isRrwebError';
-import { isSessionExpired } from '../util/isSessionExpired';
+import { shouldRefreshSession } from '../session/shouldRefreshSession';
 import { debug } from '../util/logger';
 import { resetReplayIdOnDynamicSamplingContext } from '../util/resetReplayIdOnDynamicSamplingContext';
 import { addFeedbackBreadcrumb } from './util/addFeedbackBreadcrumb';
@@ -16,14 +16,14 @@ import { shouldSampleForBufferEvent } from './util/shouldSampleForBufferEvent';
 export function handleGlobalEventListener(replay: ReplayContainer): (event: Event, hint: EventHint) => Event | null {
   return Object.assign(
     (event: Event, hint: EventHint) => {
-      // Aggressively check for expired session and clean stale replay_id from DSC.
+      // Check for expired session and clean stale replay_id from DSC.
       // This must run BEFORE the isEnabled/isPaused guards because when paused,
-      // the guards short-circuit without cleaning DSC. The cached DSC on the scope
-      // (set by browserTracingIntegration when the idle span ended) persists the
-      // stale replay_id indefinitely until explicitly deleted.
+      // the guards short-circuit without cleaning DSC. Uses shouldRefreshSession
+      // instead of isSessionExpired to respect the buffer-mode carve-out:
+      // buffer sessions with segmentId === 0 are kept alive even when time-expired.
       if (
         replay.session &&
-        isSessionExpired(replay.session, {
+        shouldRefreshSession(replay.session, {
           maxReplayDuration: replay.getOptions().maxReplayDuration,
           sessionIdleExpire: replay.timeouts.sessionIdleExpire,
         })

packages/replay-internal/src/replay.ts

@@ -50,7 +50,6 @@ import { debounce } from './util/debounce';
 import { getRecordingSamplingOptions } from './util/getRecordingSamplingOptions';
 import { getHandleRecordingEmit } from './util/handleRecordingEmit';
 import { isExpired } from './util/isExpired';
-import { isSessionExpired } from './util/isSessionExpired';
 import { debug } from './util/logger';
 import {
   resetReplayIdOnDynamicSamplingContext,
@@ -1011,7 +1010,7 @@ export class ReplayContainer implements ReplayContainerInterface {
       return;
     }
 
-    const expired = isSessionExpired(this.session, {
+    const expired = shouldRefreshSession(this.session, {
       maxReplayDuration: this._options.maxReplayDuration,
       sessionIdleExpire: this.timeouts.sessionIdleExpire,
     });

packages/replay-internal/test/integration/coreHandlers/handleGlobalEvent.test.ts

@@ -511,6 +511,57 @@ describe('Integration | coreHandlers | handleGlobalEvent', () => {
     expect(resetReplayIdSpy).toHaveBeenCalledTimes(1);
   });
 
+  it('does not reset replayId on DSC for expired buffer session with segmentId 0', () => {
+    const now = Date.now();
+
+    replay.session = makeSession({
+      id: 'test-session-id',
+      segmentId: 0,
+      lastActivity: now - SESSION_IDLE_EXPIRE_DURATION - 1,
+      started: now - SESSION_IDLE_EXPIRE_DURATION - 1,
+      sampled: 'buffer',
+    });
+
+    replay['_isPaused'] = true;
+
+    const resetReplayIdSpy = vi.spyOn(
+      resetReplayIdOnDynamicSamplingContextModule,
+      'resetReplayIdOnDynamicSamplingContext',
+    );
+
+    const errorEvent = Error();
+    handleGlobalEventListener(replay)(errorEvent, {});
+
+    // Should NOT reset DSC: buffer sessions with segmentId 0 are kept alive
+    // even when time-expired (shouldRefreshSession carve-out)
+    expect(resetReplayIdSpy).not.toHaveBeenCalled();
+  });
+
+  it('resets replayId on DSC for expired buffer session with segmentId > 0', () => {
+    const now = Date.now();
+
+    replay.session = makeSession({
+      id: 'test-session-id',
+      segmentId: 1,
+      lastActivity: now - SESSION_IDLE_EXPIRE_DURATION - 1,
+      started: now - SESSION_IDLE_EXPIRE_DURATION - 1,
+      sampled: 'buffer',
+    });
+
+    replay['_isPaused'] = true;
+
+    const resetReplayIdSpy = vi.spyOn(
+      resetReplayIdOnDynamicSamplingContextModule,
+      'resetReplayIdOnDynamicSamplingContext',
+    );
+
+    const errorEvent = Error();
+    handleGlobalEventListener(replay)(errorEvent, {});
+
+    // Buffer session with segmentId > 0 that is expired SHOULD have DSC reset
+    expect(resetReplayIdSpy).toHaveBeenCalledTimes(1);
+  });
+
   it('resets replayId on DSC when replay is disabled and session has expired', () => {
     const now = Date.now();