Use trigger config for pre/post duration and recorder config (#1362)

* use trigger config for pre/post duration and recorder config

* prettier

Author: waltjones

src/browser/core.js

@@ -126,7 +126,7 @@ class Rollbar {
     );
 
     this.tracing?.configure(this.options);
-    this.replayManager?.recorder?.configure(this.options);
+    this.replayManager?.configure(this.options);
     this.client.configure(this.options, payloadData);
     this.instrumenter?.configure(this.options);
     this.setupUnhandledCapture();

src/browser/replay/defaults.js

@@ -5,8 +5,6 @@
 export default {
   enabled: false, // Whether recording is enabled
   autoStart: true, // Start recording automatically when Rollbar initializes
-  maxSeconds: 300, // Maximum recording duration in seconds
-  postDuration: 5, // Duration of events to include after a post is triggered, in seconds
 
   // defaults used by triggers that don't specify them
   triggerDefaults: {

src/browser/replay/recorder.js

@@ -56,9 +56,7 @@ export default class Recorder {
       // Rollbar options
       enabled,
       autoStart,
-      maxSeconds,
-      postDuration,
-      triggers,
+      maxPreDuration,
       debug,
 
       // disallowed rrweb options
@@ -72,9 +70,7 @@ export default class Recorder {
     this._options = {
       enabled,
       autoStart,
-      maxSeconds,
-      postDuration,
-      triggers,
+      maxPreDuration,
       debug,
     };
 
@@ -89,12 +85,12 @@ export default class Recorder {
    * Calculates the checkout interval in milliseconds.
    *
    * Recording may span up to two checkout intervals, so the interval is set
-   * to half of maxSeconds to ensure coverage.
+   * to half of maxPreDuration to ensure coverage.
    *
    * @returns {number} Checkout interval in milliseconds
    */
   checkoutEveryNms() {
-    return ((this.options.maxSeconds || 10) * 1000) / 2;
+    return ((this.options.maxPreDuration || 10) * 1000) / 2;
   }
 
   /**

src/browser/replay/replayManager.js

@@ -45,11 +45,14 @@ export default class ReplayManager {
     }
 
     this._map = new Map();
-    this._recorder = new Recorder(options);
+    this._predicates = new ReplayPredicates(options);
+    this._recorder = new Recorder({
+      ...options,
+      maxPreDuration: this._predicates.maxPreDuration,
+    });
     this._tracing = tracing;
     this._telemeter = telemeter;
     this._trailingStatus = new Map();
-    this._predicates = new ReplayPredicates(options);
     this._scheduledCapture = new ScheduledCapture({
       recorder: this._recorder,
       tracing: this._tracing,
@@ -85,6 +88,14 @@ export default class ReplayManager {
     return status === TrailingStatus.SENT || status === TrailingStatus.SKIPPED;
   }
 
+  configure(options) {
+    this._predicates.configure(options);
+    this._recorder.configure({
+      ...options,
+      maxPreDuration: this._predicates.maxPreDuration,
+    });
+  }
+
   /**
    * Exports recording and telemetry spans, then stores the tracing payload in the map.
    *
@@ -123,7 +134,7 @@ export default class ReplayManager {
     const payload = this._tracing.exporter.toPayload();
     this._map.set(replayId, payload);
 
-    const leadingSeconds = this._recorder.options?.postDuration || 0;
+    const leadingSeconds = trigger?.postDuration || 0;
     if (leadingSeconds > 0) {
       this._scheduledCapture.schedule(replayId, occurrenceUuid, leadingSeconds);
       this._trailingStatus.set(replayId, TrailingStatus.PENDING);
@@ -149,6 +160,11 @@ export default class ReplayManager {
 
     replayId = replayId || id.gen(8);
 
+    /*
+     * trigger.preDuration and trigger.postDuration are the requested capture
+     * durations for the trigger. The recorder buffers have been configured to
+     * handle the max preDuration across all triggers.
+     */
     const trigger = this._predicates.shouldCaptureForTriggerContext({
       ...triggerContext,
       replayId,

src/browser/replay/replayPredicates.js

@@ -11,8 +11,7 @@ export default class ReplayPredicates {
    * @param {Object} config - Configuration object containing replay settings.
    */
   constructor(config) {
-    this.config = config || {};
-    this.triggers = this._triggersWithDefaults(config);
+    this.configure(config);
 
     this.predicates = {
       occurrence: [this.isLevelMatching.bind(this), this.isSampled.bind(this)],
@@ -21,11 +20,23 @@ export default class ReplayPredicates {
     };
   }
 
+  configure(config) {
+    this.config = config || {};
+    this.triggers = this._triggersWithDefaults(config);
+    this.maxPreDuration = this._maxPreDuration();
+  }
+
   _triggersWithDefaults(config) {
     const triggers = config?.triggers || [];
     return triggers.map((t) => ({ ...config.triggerDefaults, ...t }));
   }
 
+  _maxPreDuration() {
+    if (!this.triggers) return 0;
+
+    return Math.max(...this.triggers.map((t) => t.preDuration || 0), 0);
+  }
+
   /**
    * shouldCaptureForTriggerContext - Checks if replay is enabled for a given trigger type.
    * Applies all predicates for that trigger type and returns true if all predicates pass

test/browser.replay.recorder.test.js

@@ -45,9 +45,7 @@ describe('Recorder', function () {
       expect(recorder.options).to.deep.equal({
         enabled: undefined,
         autoStart: undefined,
-        maxSeconds: undefined,
-        postDuration: undefined,
-        triggers: undefined,
+        maxPreDuration: undefined,
         debug: undefined,
       });
     });
@@ -59,9 +57,7 @@ describe('Recorder', function () {
       expect(recorder.options).to.deep.equal({
         enabled: true,
         autoStart: undefined,
-        maxSeconds: undefined,
-        postDuration: undefined,
-        triggers: undefined,
+        maxPreDuration: undefined,
         debug: undefined,
       });
     });
@@ -419,29 +415,25 @@ describe('Recorder', function () {
     it('should update options', function () {
       const recorder = new Recorder({ enabled: true, recordFn: recordFnStub });
 
-      recorder.configure({ enabled: false, maxSeconds: 20 });
+      recorder.configure({ enabled: false, maxPreDuration: 20 });
 
       expect(recorder.options).to.deep.equal({
         enabled: false,
         autoStart: undefined,
-        maxSeconds: 20,
-        postDuration: undefined,
-        triggers: undefined,
+        maxPreDuration: 20,
         debug: undefined,
       });
     });
 
     it('should set correct checkoutEveryNms', function () {
       const recorder = new Recorder({ enabled: false });
 
-      recorder.configure({ enabled: true, maxSeconds: 15 });
+      recorder.configure({ enabled: true, maxPreDuration: 15 });
 
       expect(recorder.options).to.deep.equal({
         enabled: true,
         autoStart: undefined,
-        maxSeconds: 15,
-        postDuration: undefined,
-        triggers: undefined,
+        maxPreDuration: 15,
         debug: undefined,
       });
 

test/replay/integration/e2e.test.js

@@ -234,7 +234,13 @@ describe('Session Replay E2E', function () {
   it('should handle trailing and leading replay flow', function (done) {
     this.timeout(10000);
 
-    recorder.configure({ ...recorder.options, postDuration: 0.1 });
+    replayManager.configure({
+      ...options.replay,
+      triggerDefaults: {
+        preDuration: 300,
+        postDuration: 0.1,
+      },
+    });
     recorder.start();
 
     setTimeout(() => {