add trigger back

Author: metal-messiah

src/features/session_replay/aggregate/index.js

@@ -28,7 +28,6 @@ export class Aggregate extends AggregateBase {
 
   // pass the recorder into the aggregator
   constructor (agentRef, args) {
-    console.log('SR AGG constructor!')
     super(agentRef, FEATURE_NAME)
     /** Set once the recorder has fully initialized after flag checks and sampling */
     this.initialized = false
@@ -84,9 +83,7 @@ export class Aggregate extends AggregateBase {
 
     const { error_sampling_rate, sampling_rate, autoStart, block_selector, mask_text_selector, mask_all_inputs, inline_images, collect_fonts } = agentRef.init.session_replay
 
-    console.log('wait for flags...')
     this.waitForFlags(['srs', 'sr']).then(([srMode, entitled]) => {
-      console.log('got flags!', srMode, entitled)
       this.entitled = !!entitled
       if (!this.entitled) {
         this.deregisterDrain()
@@ -96,11 +93,7 @@ export class Aggregate extends AggregateBase {
         }
         return
       }
-      this.ee.on('drain-' + this.featureName, () => {
-        console.log('GOT DRAIN EVENT')
-      })
-      console.log('CALL initializeRecording... has drained?', this.drained)
-      this.initializeRecording(srMode).then(() => { console.log('start draining'); this.drain(); console.log('drained') })
+      this.initializeRecording(srMode).then(() => { this.drain() })
     }).then(() => {
       if (this.mode === MODE.OFF) {
         this.recorder?.stopRecording() // stop any conservative preload recording launched by instrument
@@ -141,7 +134,6 @@ export class Aggregate extends AggregateBase {
       if (!this.agentRef.runtime.isRecording) this.recorder.startRecording()
       this.syncWithSessionManager({ sessionReplayMode: this.mode })
     } else {
-      console.log('switching to full by calling initializeRecording')
       this.initializeRecording(MODE.FULL, true)
     }
   }
@@ -153,7 +145,6 @@ export class Aggregate extends AggregateBase {
    * @returns {void}
    */
   async initializeRecording (srMode, ignoreSession) {
-    console.log('initialize recording!', this.initialized, this.entitled)
     this.initialized = true
     if (!this.entitled) return
 

src/features/session_replay/instrument/index.js

@@ -10,7 +10,7 @@ import { handle } from '../../../common/event-emitter/handle'
 import { DEFAULT_KEY, MODE, PREFIX } from '../../../common/session/constants'
 import { InstrumentBase } from '../../utils/instrument-base'
 import { hasReplayPrerequisite, isPreloadAllowed } from '../shared/utils'
-import { FEATURE_NAME, SR_EVENT_EMITTER_TYPES } from '../constants'
+import { FEATURE_NAME, SR_EVENT_EMITTER_TYPES, TRIGGERS } from '../constants'
 import { setupRecordReplayAPI } from '../../../loaders/api/recordReplay'
 import { setupPauseReplayAPI } from '../../../loaders/api/pauseReplay'
 
@@ -71,7 +71,7 @@ export class Instrument extends InstrumentBase {
   /**
    * This func is use for early pre-load recording prior to replay feature (agg) being loaded onto the page. It should only setup once, including if already called and in-progress.
    */
-  async #preloadStartRecording () {
+  async #preloadStartRecording (trigger) {
     if (this.#alreadyStarted) return
     this.#alreadyStarted = true
 
@@ -80,7 +80,7 @@ export class Instrument extends InstrumentBase {
 
       // If startReplay() has been used by this point, we must record in full mode regardless of session preload:
       // Note: recorder starts here with w/e the mode is at this time, but this may be changed later (see #apiStartOrRestartReplay else-case)
-      this.recorder ??= new Recorder({ ...this, mode: this.#mode, agentRef: this.#agentRef, timeKeeper: this.#agentRef.runtime.timeKeeper }) // if TK exists due to deferred state, pass it
+      this.recorder ??= new Recorder({ ...this, mode: this.#mode, agentRef: this.#agentRef, trigger, timeKeeper: this.#agentRef.runtime.timeKeeper }) // if TK exists due to deferred state, pass it
       this.recorder.startRecording()
       this.abortHandler = this.recorder.stopRecording
     } catch (err) {
@@ -99,7 +99,7 @@ export class Instrument extends InstrumentBase {
       if (this.featAggregate.mode !== MODE.FULL) this.featAggregate.initializeRecording(MODE.FULL, true)
     } else { // pre-load
       this.#mode = MODE.FULL
-      this.#preloadStartRecording()
+      this.#preloadStartRecording(TRIGGERS.API)
       // There's a race here wherein either:
       // a. Recorder has not been initialized, and we've set the enforced mode, so we're good, or;
       // b. Record has been initialized, possibly with the "wrong" mode, so we have to correct that + restart.

src/features/session_replay/shared/recorder.js

@@ -42,11 +42,7 @@ export class Recorder {
     /** The method to stop recording. This defaults to a noop, but is overwritten once the recording library is imported and initialized */
     this.stopRecording = () => { this.parent.agentRef.runtime.isRecording = false }
 
-    console.log('setting up register handler for', this.parent.featureName)
-    registerHandler(RRWEB_DATA_CHANNEL, (event, isCheckout) => {
-      console.log('got data from rrweb register handler...', this.parent)
-      this.audit(event, isCheckout)
-    }, this.parent.featureName, this.parent.ee)
+    registerHandler(RRWEB_DATA_CHANNEL, (event, isCheckout) => { this.audit(event, isCheckout) }, this.parent.featureName, this.parent.ee)
   }
 
   getEvents () {
@@ -78,10 +74,7 @@ export class Recorder {
     let stop
     try {
       stop = recorder({
-        emit: (event, isCheckout) => {
-          console.log('EMIT! --- goes to handle for', this.parent.featureName)
-          handle(RRWEB_DATA_CHANNEL, [event, isCheckout], undefined, this.parent.featureName, this.parent.ee)
-        },
+        emit: (event, isCheckout) => { handle(RRWEB_DATA_CHANNEL, [event, isCheckout], undefined, this.parent.featureName, this.parent.ee) },
         blockClass: block_class,
         ignoreClass: ignore_class,
         maskTextClass: mask_text_class,

tests/unit/features/session_replay/shared/recorder.test.js

@@ -11,10 +11,11 @@ describe('recorder', () => {
             stylesheets: true
           }
         },
-        runtime: {}
-      },
-      timeKeeper: {
-        correctAbsoluteTimestamp: jest.fn(x => x)
+        runtime: {
+          timeKeeper: {
+            correctAbsoluteTimestamp: jest.fn(x => x)
+          }
+        }
       },
       ee: {
         emit: () => {}

tools/testing-server/constants.js

@@ -35,15 +35,14 @@ const defaultFlagValue = (flag) => {
   return 1
 }
 module.exports.rumFlags = (flags = {}, app = {}) => ({
-  test: 1,
   loaded: defaultFlagValue(flags.loaded), // Used internally to signal the tests that the agent has loaded
   st: defaultFlagValue(flags.st), // session trace entitlements 0|1
   err: defaultFlagValue(flags.err), // err entitlements 0|1
   ins: defaultFlagValue(flags.ins), // ins entitlements 0|1
   spa: defaultFlagValue(flags.spa), // spa entitlements 0|1
   sr: defaultFlagValue(flags.sr), // session replay entitlements 0|1
   sts: defaultFlagValue(flags.sts), // session trace sampling 0|1|2 - off full error
-  srs: 0, // session replay sampling 0|1|2 - off full error
+  srs: defaultFlagValue(flags.srs), // session replay sampling 0|1|2 - off full error
   log: flags.log ?? 3, // logging sampling 0|1|2|3|4|5 - off error warn info debug trace
   app: {
     agents: app.agents || [