@newrelic/browser-agent 1.296.0-rc.3 → 1.296.0-rc.5

package/dist/cjs/common/constants/env.cdn.js

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.296.0-rc.3";
+const VERSION = exports.VERSION = "1.296.0-rc.5";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/env.npm.js

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.296.0-rc.3";
+const VERSION = exports.VERSION = "1.296.0-rc.5";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/features/session_replay/aggregate/index.js

@@ -16,7 +16,6 @@ var _constants2 = require("../../../common/session/constants");
 var _stringify = require("../../../common/util/stringify");
 var _stylesheetEvaluator = require("../shared/stylesheet-evaluator");
 var _now = require("../../../common/timing/now");
-var _utils = require("../shared/utils");
 var _agentConstants = require("../../../common/constants/agent-constants");
 var _cleanUrl = require("../../../common/url/clean-url");
 var _featureGates = require("../../utils/feature-gates");
@@ -101,8 +100,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
         }
         return;
       }
-      this.drain();
-      this.initializeRecording(srMode);
+      this.initializeRecording(srMode).then(() => {
+        this.drain();
+      });
     }).then(() => {
       if (this.mode === _constants2.MODE.OFF) {
         this.recorder?.stopRecording(); // stop any conservative preload recording launched by instrument
@@ -125,7 +125,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     return Boolean(this.recorder && this.mode === _constants2.MODE.FULL && !this.blocked && this.entitled);
   }
   handleError(e) {
-    if (this.recorder) this.recorder.currentBufferTarget.hasError = true;
+    if (this.recorder) this.recorder.events.hasError = true;
     // run once
     if (this.mode === _constants2.MODE.ERROR && _runtime.globalScope?.document.visibilityState === 'visible') {
       this.switchToFull();
@@ -184,7 +184,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
           Recorder
         } = await Promise.resolve().then(() => _interopRequireWildcard(require(/* webpackChunkName: "recorder" */'../shared/recorder')));
         this.recorder = new Recorder(this);
-        this.recorder.currentBufferTarget.hasError = this.errorNoticed;
+        this.recorder.events.hasError = this.errorNoticed;
       } catch (err) {
         return this.abort(_constants.ABORT_REASONS.IMPORT);
       }
@@ -199,10 +199,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     // ERROR mode will do this until an error is thrown, and then switch into FULL mode.
     // The makeHarvestPayload should ensure that no payload is returned if we're not in FULL mode...
 
-    // If theres preloaded events and we are in full mode, just harvest immediately to clear up space and for consistency
-    if (this.mode === _constants2.MODE.FULL && this.recorder?.getEvents().type === 'preloaded') {
-      this.prepUtils().then(() => this.agentRef.runtime.harvester.triggerHarvestFor(this));
-    }
     await this.prepUtils();
     if (!this.agentRef.runtime.isRecording) this.recorder.startRecording();
     this.syncWithSessionManager({
@@ -241,33 +237,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
     let len = 0;
     if (!!this.gzipper && !!this.u8) {
       payload.body = this.gzipper(this.u8("[".concat(payload.body.map(({
-        __serialized,
-        ...e
-      }) => {
-        if (e.__newrelic && __serialized) return __serialized;
-        const output = {
-          ...e
-        };
-        if (!output.__newrelic) {
-          output.__newrelic = (0, _utils.buildNRMetaNode)(e.timestamp, this.timeKeeper);
-          output.timestamp = this.timeKeeper.correctAbsoluteTimestamp(e.timestamp);
-        }
-        return (0, _stringify.stringify)(output);
-      }).join(','), "]")));
+        __serialized
+      }) => __serialized).join(','), "]")));
       len = payload.body.length;
     } else {
-      payload.body = payload.body.map(({
-        __serialized,
-        ...node
-      }) => {
-        if (node.__newrelic) return node;
-        const output = {
-          ...node
-        };
-        output.__newrelic = (0, _utils.buildNRMetaNode)(node.timestamp, this.timeKeeper);
-        output.timestamp = this.timeKeeper.correctAbsoluteTimestamp(node.timestamp);
-        return output;
-      });
+      for (let idx in payload.body) delete payload.body[idx].__serialized;
       len = (0, _stringify.stringify)(payload.body).length;
     }
     if (len > _agentConstants.MAX_PAYLOAD_SIZE) {
@@ -286,11 +260,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     return [payloadOutput];
   }
-  getCorrectedTimestamp(node) {
-    if (!node?.timestamp) return;
-    if (node.__newrelic) return node.timestamp;
-    return this.timeKeeper.correctAbsoluteTimestamp(node.timestamp);
-  }
 
   /**
    * returns the timestamps for the earliest and latest nodes in the provided array, even if out of order
@@ -338,8 +307,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
       lastEvent
     } = this.getFirstAndLastNodes(events);
     // from rrweb node || from when the harvest cycle started
-    const firstTimestamp = this.getCorrectedTimestamp(firstEvent) || Math.floor(this.timeKeeper.correctAbsoluteTimestamp(recorderEvents.cycleTimestamp));
-    const lastTimestamp = this.getCorrectedTimestamp(lastEvent) || Math.floor(this.timeKeeper.correctRelativeTimestamp(relativeNow));
+    const firstTimestamp = firstEvent?.timestamp || Math.floor(this.timeKeeper.correctAbsoluteTimestamp(recorderEvents.cycleTimestamp));
+    const lastTimestamp = lastEvent?.timestamp || Math.floor(this.timeKeeper.correctRelativeTimestamp(relativeNow));
     const agentMetadata = agentRuntime.appMetadata?.agents?.[0] || {};
     return {
       qs: {

package/dist/cjs/features/session_replay/instrument/index.js

@@ -70,7 +70,7 @@ class Instrument extends _instrumentBase.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(trigger) {
+  async #preloadStartRecording() {
     if (this.#alreadyStarted) return;
     this.#alreadyStarted = true;
     try {
@@ -81,12 +81,11 @@ class Instrument extends _instrumentBase.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,
-        agentIdentifier: this.agentIdentifier,
-        trigger,
-        ee: this.ee,
-        agentRef: this.#agentRef
-      });
+        agentRef: this.#agentRef,
+        timeKeeper: this.#agentRef.runtime.timeKeeper
+      }); // if TK exists due to deferred state, pass it
       this.recorder.startRecording();
       this.abortHandler = this.recorder.stopRecording;
     } catch (err) {
@@ -108,7 +107,7 @@ class Instrument extends _instrumentBase.InstrumentBase {
     } else {
       // pre-load
       this.#mode = _constants.MODE.FULL;
-      this.#preloadStartRecording(_constants2.TRIGGERS.API);
+      this.#preloadStartRecording();
       // 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.

package/dist/cjs/features/session_replay/shared/recorder-events.js

@@ -30,8 +30,8 @@ class RecorderEvents {
     /** Payload metadata -- Denotes whether all stylesheet elements were able to be inlined */
     this.inlinedAllStylesheets = shouldInlineStylesheets;
   }
-  add(event) {
-    this.#events.add(event);
+  add(event, evaluatedSize) {
+    this.#events.add(event, evaluatedSize);
   }
   get events() {
     return this.#events.get();

package/dist/cjs/features/session_replay/shared/recorder.js

@@ -15,21 +15,16 @@ var _constants3 = require("../../metrics/constants");
 var _features = require("../../../loaders/features/features");
 var _utils = require("./utils");
 var _agentConstants = require("../../../common/constants/agent-constants");
-var _aggregateBase = require("../../utils/aggregate-base");
 var _console = require("../../../common/util/console");
 var _invoke = require("../../../common/util/invoke");
+var _registerHandler = require("../../../common/event-emitter/register-handler");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
+const RRWEB_DATA_CHANNEL = 'rrweb-data';
 class Recorder {
-  /** Each page mutation or event will be stored (raw) in this array. This array will be cleared on each harvest */
-  #events;
-  /** Backlog used for a 2-part sliding window to guarantee a 15-30s buffer window */
-  #backloggedEvents;
-  /** array of recorder events -- Will be filled only if forced harvest was triggered and harvester does not exist */
-  #preloaded;
   /** flag that if true, blocks events from being "stored".  Only set to true when a full snapshot has incomplete nodes (only stylesheets ATM) */
   #fixing = false;
   #warnCSSOnce = (0, _invoke.single)(() => (0, _console.warn)(47)); // notifies user of potential replayer issue if fix_stylesheets is off
@@ -39,13 +34,12 @@ class Recorder {
     this.parent = parent;
     /** A flag that can be set to false by failing conversions to stop the fetching process */
     this.shouldFix = this.parent.agentRef.init.session_replay.fix_stylesheets;
-    /** Event Buffers */
-    this.#events = new _recorderEvents.RecorderEvents(this.shouldFix);
-    this.#backloggedEvents = new _recorderEvents.RecorderEvents(this.shouldFix);
-    this.#preloaded = [new _recorderEvents.RecorderEvents(this.shouldFix)];
-    /** The pointer to the current bucket holding rrweb events */
-    this.currentBufferTarget = this.#events;
-    /** Only set to true once a snapshot node has been processed.  Used to block preload harvests from sending before we know we have a snapshot */
+
+    /** Each page mutation or event will be stored (raw) in this array. This array will be cleared on each harvest */
+    this.events = new _recorderEvents.RecorderEvents(this.shouldFix);
+    /** Backlog used for a 2-part sliding window to guarantee a 15-30s buffer window */
+    this.backloggedEvents = new _recorderEvents.RecorderEvents(this.shouldFix);
+    /** Only set to true once a snapshot node has been processed.  Used to block harvests from sending before we know we have a snapshot */
     this.hasSeenSnapshot = false;
     /** Hold on to the last meta node, so that it can be re-inserted if the meta and snapshot nodes are broken up due to harvesting */
     this.lastMeta = false;
@@ -53,32 +47,27 @@ class Recorder {
     this.stopRecording = () => {
       this.parent.agentRef.runtime.isRecording = false;
     };
+    (0, _registerHandler.registerHandler)(RRWEB_DATA_CHANNEL, (event, isCheckout) => {
+      this.audit(event, isCheckout);
+    }, this.parent.featureName, this.parent.ee);
   }
   getEvents() {
-    if (this.#preloaded[0]?.events.length) {
-      return {
-        ...this.#preloaded[0],
-        events: this.#preloaded[0].events,
-        payloadBytesEstimation: this.#preloaded[0].payloadBytesEstimation,
-        type: 'preloaded'
-      };
-    }
     return {
-      events: [...this.#backloggedEvents.events, ...this.#events.events].filter(x => x),
+      events: [...this.backloggedEvents.events, ...this.events.events].filter(x => x),
       type: 'standard',
-      cycleTimestamp: Math.min(this.#backloggedEvents.cycleTimestamp, this.#events.cycleTimestamp),
-      payloadBytesEstimation: this.#backloggedEvents.payloadBytesEstimation + this.#events.payloadBytesEstimation,
-      hasError: this.#backloggedEvents.hasError || this.#events.hasError,
-      hasMeta: this.#backloggedEvents.hasMeta || this.#events.hasMeta,
-      hasSnapshot: this.#backloggedEvents.hasSnapshot || this.#events.hasSnapshot,
-      inlinedAllStylesheets: !!this.#backloggedEvents.events.length && this.#backloggedEvents.inlinedAllStylesheets || this.#events.inlinedAllStylesheets
+      cycleTimestamp: Math.min(this.backloggedEvents.cycleTimestamp, this.events.cycleTimestamp),
+      payloadBytesEstimation: this.backloggedEvents.payloadBytesEstimation + this.events.payloadBytesEstimation,
+      hasError: this.backloggedEvents.hasError || this.events.hasError,
+      hasMeta: this.backloggedEvents.hasMeta || this.events.hasMeta,
+      hasSnapshot: this.backloggedEvents.hasSnapshot || this.events.hasSnapshot,
+      inlinedAllStylesheets: !!this.backloggedEvents.events.length && this.backloggedEvents.inlinedAllStylesheets || this.events.inlinedAllStylesheets
     };
   }
 
-  /** Clears the buffer (this.#events), and resets all payload metadata properties */
+  /** Clears the buffer (this.events), and resets all payload metadata properties */
   clearBuffer() {
-    if (this.#preloaded[0]?.events.length) this.#preloaded.shift();else if (this.parent.mode === _constants2.MODE.ERROR) this.#backloggedEvents = this.#events;else this.#backloggedEvents = new _recorderEvents.RecorderEvents(this.shouldFix);
-    this.#events = new _recorderEvents.RecorderEvents(this.shouldFix);
+    this.backloggedEvents = this.parent.mode === _constants2.MODE.ERROR ? this.events : new _recorderEvents.RecorderEvents(this.shouldFix);
+    this.events = new _recorderEvents.RecorderEvents(this.shouldFix);
   }
 
   /** Begin recording using configured recording lib */
@@ -101,7 +90,9 @@ class Recorder {
     let stop;
     try {
       stop = (0, _rrweb.record)({
-        emit: this.audit.bind(this),
+        emit: (event, isCheckout) => {
+          (0, _handle.handle)(RRWEB_DATA_CHANNEL, [event, isCheckout], undefined, this.parent.featureName, this.parent.ee);
+        },
         blockClass: block_class,
         ignoreClass: ignore_class,
         maskTextClass: mask_text_class,
@@ -139,7 +130,7 @@ class Recorder {
     /** only run the full fixing behavior (more costly) if fix_stylesheets is configured as on (default behavior) */
     if (!this.shouldFix) {
       if (incompletes > 0) {
-        this.currentBufferTarget.inlinedAllStylesheets = false;
+        this.events.inlinedAllStylesheets = false;
         this.#warnCSSOnce();
         (0, _handle.handle)(_constants3.SUPPORTABILITY_METRIC_CHANNEL, [missingInlineSMTag + 'Skipped', incompletes], undefined, _features.FEATURE_NAMES.metrics, this.parent.ee);
       }
@@ -151,7 +142,7 @@ class Recorder {
       /** wait for the evaluator to download/replace the incompletes' src code and then take a new snap */
       _stylesheetEvaluator.stylesheetEvaluator.fix().then(failedToFix => {
         if (failedToFix > 0) {
-          this.currentBufferTarget.inlinedAllStylesheets = false;
+          this.events.inlinedAllStylesheets = false;
           this.shouldFix = false;
         }
         (0, _handle.handle)(_constants3.SUPPORTABILITY_METRIC_CHANNEL, [missingInlineSMTag + 'Failed', failedToFix], undefined, _features.FEATURE_NAMES.metrics, this.parent.ee);
@@ -165,15 +156,12 @@ class Recorder {
     if (!this.#fixing) this.store(event, isCheckout);
   }
 
-  /** Store a payload in the buffer (this.#events).  This should be the callback to the recording lib noticing a mutation */
+  /** Store a payload in the buffer (this.events).  This should be the callback to the recording lib noticing a mutation */
   store(event, isCheckout) {
-    if (!event) return;
-    if (!(this.parent instanceof _aggregateBase.AggregateBase) && this.#preloaded.length) this.currentBufferTarget = this.#preloaded[this.#preloaded.length - 1];else this.currentBufferTarget = this.#events;
-    if (this.parent.blocked) return;
-    if (this.parent.timeKeeper?.ready && !event.__newrelic) {
-      event.__newrelic = (0, _utils.buildNRMetaNode)(event.timestamp, this.parent.timeKeeper);
-      event.timestamp = this.parent.timeKeeper.correctAbsoluteTimestamp(event.timestamp);
-    }
+    if (!event || this.parent.blocked) return;
+
+    /** because we've waited until draining to process the buffered rrweb events, we can guarantee the timekeeper exists */
+    event.timestamp = this.parent.timeKeeper.correctAbsoluteTimestamp(event.timestamp);
     event.__serialized = (0, _stringify.stringify)(event);
     const eventBytes = event.__serialized.length;
     /** The estimated size of the payload after compression */
@@ -188,26 +176,18 @@ class Recorder {
     }
 
     // meta event
-    if (event.type === _constants.RRWEB_EVENT_TYPES.Meta) {
-      this.currentBufferTarget.hasMeta = true;
-    }
+    this.events.hasMeta ||= event.type === _constants.RRWEB_EVENT_TYPES.Meta;
     // snapshot event
-    if (event.type === _constants.RRWEB_EVENT_TYPES.FullSnapshot) {
-      this.currentBufferTarget.hasSnapshot = true;
-      this.hasSeenSnapshot = true;
-    }
-    this.currentBufferTarget.add(event);
+    this.events.hasSnapshot ||= this.hasSeenSnapshot ||= event.type === _constants.RRWEB_EVENT_TYPES.FullSnapshot;
+
+    //* dont let the EventBuffer class double evaluate the event data size, it's a performance burden and we have special reasons to do it outside the event buffer */
+    this.events.add(event, eventBytes);
 
     // We are making an effort to try to keep payloads manageable for unloading.  If they reach the unload limit before their interval,
     // it will send immediately.  This often happens on the first snapshot, which can be significantly larger than the other payloads.
-    if ((event.type === _constants.RRWEB_EVENT_TYPES.FullSnapshot && this.currentBufferTarget.hasMeta || payloadSize > _agentConstants.IDEAL_PAYLOAD_SIZE) && this.parent.mode === _constants2.MODE.FULL) {
-      // if we've made it to the ideal size of ~64kb before the interval timer, we should send early.
-      if (this.parent instanceof _aggregateBase.AggregateBase) {
-        this.parent.agentRef.runtime.harvester.triggerHarvestFor(this.parent);
-      } else {
-        // we are still in "preload" and it triggered a "stop point".  Make a new set, which will get pointed at on next cycle
-        this.#preloaded.push(new _recorderEvents.RecorderEvents(this.shouldFix));
-      }
+    if ((this.events.hasSnapshot && this.events.hasMeta || payloadSize > _agentConstants.IDEAL_PAYLOAD_SIZE) && this.parent.mode === _constants2.MODE.FULL) {
+      // if we've made it to the ideal size of ~16kb before the interval timer, we should send early.
+      this.parent.agentRef.runtime.harvester.triggerHarvestFor(this.parent);
     }
   }
 
@@ -221,13 +201,13 @@ class Recorder {
     }
   }
   clearTimestamps() {
-    this.currentBufferTarget.cycleTimestamp = undefined;
+    this.events.cycleTimestamp = undefined;
   }
 
   /** Estimate the payload size */
   getPayloadSize(newBytes = 0) {
     // the query param padding constant gives us some padding for the other metadata to be safely injected
-    return this.estimateCompression(this.currentBufferTarget.payloadBytesEstimation + newBytes) + _constants.QUERY_PARAM_PADDING;
+    return this.estimateCompression(this.events.payloadBytesEstimation + newBytes) + _constants.QUERY_PARAM_PADDING;
   }
 
   /** Extensive research has yielded about an 88% compression factor on these payloads.

package/dist/cjs/features/session_replay/shared/utils.js

@@ -3,13 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildNRMetaNode = buildNRMetaNode;
 exports.customMasker = customMasker;
 exports.hasReplayPrerequisite = hasReplayPrerequisite;
 exports.isPreloadAllowed = isPreloadAllowed;
 var _nreum = require("../../../common/window/nreum");
 var _featureGates = require("../../utils/feature-gates");
-var _runtime = require("../../../common/constants/runtime");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -25,17 +23,6 @@ function hasReplayPrerequisite(agentInit) {
 function isPreloadAllowed(agentInit) {
   return agentInit?.session_replay.preload === true && hasReplayPrerequisite(agentInit);
 }
-function buildNRMetaNode(timestamp, timeKeeper) {
-  const correctedTimestamp = timeKeeper.correctAbsoluteTimestamp(timestamp);
-  return {
-    originalTimestamp: timestamp,
-    correctedTimestamp,
-    timestampDiff: timestamp - correctedTimestamp,
-    originTime: _runtime.originTime,
-    correctedOriginTime: timeKeeper.correctedOriginTime,
-    originTimeDiff: Math.floor(_runtime.originTime - timeKeeper.correctedOriginTime)
-  };
-}
 function customMasker(text, element) {
   try {
     if (typeof element?.type === 'string') {

package/dist/cjs/features/utils/event-buffer.js

@@ -45,10 +45,11 @@ class EventBuffer {
   /**
    * Add feature-processed event to our buffer. If this event would cause our total raw size to exceed the set max payload size, it is dropped.
    * @param {any} event - any primitive type or object
+   * @param {number} [evaluatedSize] - the evalated size of the event, if already done so before storing in the event buffer
    * @returns {Boolean} true if successfully added; false otherwise
    */
-  add(event) {
-    const addSize = (0, _stringify.stringify)(event)?.length || 0; // (estimate) # of bytes a directly stringified event it would take to send
+  add(event, evaluatedSize) {
+    const addSize = evaluatedSize || (0, _stringify.stringify)(event)?.length || 0; // (estimate) # of bytes a directly stringified event it would take to send
     if (this.#rawBytes + addSize > this.maxPayloadSize) {
       const smTag = inject => "EventBuffer/".concat(inject, "/Dropped/Bytes");
       this.featureAgg?.reportSupportabilityMetric(smTag(this.featureAgg.featureName), addSize); // bytes dropped for this feature will aggregate with this metric tag

package/dist/esm/common/constants/env.cdn.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.296.0-rc.3";
+export const VERSION = "1.296.0-rc.5";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/constants/env.npm.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.296.0-rc.3";
+export const VERSION = "1.296.0-rc.5";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/features/session_replay/aggregate/index.js

@@ -18,7 +18,6 @@ import { MODE, SESSION_EVENTS, SESSION_EVENT_TYPES } from '../../../common/sessi
 import { stringify } from '../../../common/util/stringify';
 import { stylesheetEvaluator } from '../shared/stylesheet-evaluator';
 import { now } from '../../../common/timing/now';
-import { buildNRMetaNode } from '../shared/utils';
 import { MAX_PAYLOAD_SIZE } from '../../../common/constants/agent-constants';
 import { cleanURL } from '../../../common/url/clean-url';
 import { canEnableSessionTracking } from '../../utils/feature-gates';
@@ -96,8 +95,9 @@ export class Aggregate extends AggregateBase {
         }
         return;
       }
-      this.drain();
-      this.initializeRecording(srMode);
+      this.initializeRecording(srMode).then(() => {
+        this.drain();
+      });
     }).then(() => {
       if (this.mode === MODE.OFF) {
         this.recorder?.stopRecording(); // stop any conservative preload recording launched by instrument
@@ -120,7 +120,7 @@ export class Aggregate extends AggregateBase {
     return Boolean(this.recorder && this.mode === MODE.FULL && !this.blocked && this.entitled);
   }
   handleError(e) {
-    if (this.recorder) this.recorder.currentBufferTarget.hasError = true;
+    if (this.recorder) this.recorder.events.hasError = true;
     // run once
     if (this.mode === MODE.ERROR && globalScope?.document.visibilityState === 'visible') {
       this.switchToFull();
@@ -179,7 +179,7 @@ export class Aggregate extends AggregateBase {
           Recorder
         } = await import(/* webpackChunkName: "recorder" */'../shared/recorder');
         this.recorder = new Recorder(this);
-        this.recorder.currentBufferTarget.hasError = this.errorNoticed;
+        this.recorder.events.hasError = this.errorNoticed;
       } catch (err) {
         return this.abort(ABORT_REASONS.IMPORT);
       }
@@ -194,10 +194,6 @@ export class Aggregate extends AggregateBase {
     // ERROR mode will do this until an error is thrown, and then switch into FULL mode.
     // The makeHarvestPayload should ensure that no payload is returned if we're not in FULL mode...
 
-    // If theres preloaded events and we are in full mode, just harvest immediately to clear up space and for consistency
-    if (this.mode === MODE.FULL && this.recorder?.getEvents().type === 'preloaded') {
-      this.prepUtils().then(() => this.agentRef.runtime.harvester.triggerHarvestFor(this));
-    }
     await this.prepUtils();
     if (!this.agentRef.runtime.isRecording) this.recorder.startRecording();
     this.syncWithSessionManager({
@@ -236,33 +232,11 @@ export class Aggregate extends AggregateBase {
     let len = 0;
     if (!!this.gzipper && !!this.u8) {
       payload.body = this.gzipper(this.u8("[".concat(payload.body.map(({
-        __serialized,
-        ...e
-      }) => {
-        if (e.__newrelic && __serialized) return __serialized;
-        const output = {
-          ...e
-        };
-        if (!output.__newrelic) {
-          output.__newrelic = buildNRMetaNode(e.timestamp, this.timeKeeper);
-          output.timestamp = this.timeKeeper.correctAbsoluteTimestamp(e.timestamp);
-        }
-        return stringify(output);
-      }).join(','), "]")));
+        __serialized
+      }) => __serialized).join(','), "]")));
       len = payload.body.length;
     } else {
-      payload.body = payload.body.map(({
-        __serialized,
-        ...node
-      }) => {
-        if (node.__newrelic) return node;
-        const output = {
-          ...node
-        };
-        output.__newrelic = buildNRMetaNode(node.timestamp, this.timeKeeper);
-        output.timestamp = this.timeKeeper.correctAbsoluteTimestamp(node.timestamp);
-        return output;
-      });
+      for (let idx in payload.body) delete payload.body[idx].__serialized;
       len = stringify(payload.body).length;
     }
     if (len > MAX_PAYLOAD_SIZE) {
@@ -281,11 +255,6 @@ export class Aggregate extends AggregateBase {
     }
     return [payloadOutput];
   }
-  getCorrectedTimestamp(node) {
-    if (!node?.timestamp) return;
-    if (node.__newrelic) return node.timestamp;
-    return this.timeKeeper.correctAbsoluteTimestamp(node.timestamp);
-  }
 
   /**
    * returns the timestamps for the earliest and latest nodes in the provided array, even if out of order
@@ -333,8 +302,8 @@ export class Aggregate extends AggregateBase {
       lastEvent
     } = this.getFirstAndLastNodes(events);
     // from rrweb node || from when the harvest cycle started
-    const firstTimestamp = this.getCorrectedTimestamp(firstEvent) || Math.floor(this.timeKeeper.correctAbsoluteTimestamp(recorderEvents.cycleTimestamp));
-    const lastTimestamp = this.getCorrectedTimestamp(lastEvent) || Math.floor(this.timeKeeper.correctRelativeTimestamp(relativeNow));
+    const firstTimestamp = firstEvent?.timestamp || Math.floor(this.timeKeeper.correctAbsoluteTimestamp(recorderEvents.cycleTimestamp));
+    const lastTimestamp = lastEvent?.timestamp || Math.floor(this.timeKeeper.correctRelativeTimestamp(relativeNow));
     const agentMetadata = agentRuntime.appMetadata?.agents?.[0] || {};
     return {
       qs: {

package/dist/esm/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, TRIGGERS } from '../constants';
+import { FEATURE_NAME, SR_EVENT_EMITTER_TYPES } from '../constants';
 import { setupRecordReplayAPI } from '../../../loaders/api/recordReplay';
 import { setupPauseReplayAPI } from '../../../loaders/api/pauseReplay';
 export class Instrument extends InstrumentBase {
@@ -65,7 +65,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(trigger) {
+  async #preloadStartRecording() {
     if (this.#alreadyStarted) return;
     this.#alreadyStarted = true;
     try {
@@ -76,12 +76,11 @@ 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,
-        agentIdentifier: this.agentIdentifier,
-        trigger,
-        ee: this.ee,
-        agentRef: this.#agentRef
-      });
+        agentRef: this.#agentRef,
+        timeKeeper: this.#agentRef.runtime.timeKeeper
+      }); // if TK exists due to deferred state, pass it
       this.recorder.startRecording();
       this.abortHandler = this.recorder.stopRecording;
     } catch (err) {
@@ -103,7 +102,7 @@ export class Instrument extends InstrumentBase {
     } else {
       // pre-load
       this.#mode = MODE.FULL;
-      this.#preloadStartRecording(TRIGGERS.API);
+      this.#preloadStartRecording();
       // 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.

package/dist/esm/features/session_replay/shared/recorder-events.js

@@ -23,8 +23,8 @@ export class RecorderEvents {
     /** Payload metadata -- Denotes whether all stylesheet elements were able to be inlined */
     this.inlinedAllStylesheets = shouldInlineStylesheets;
   }
-  add(event) {
-    this.#events.add(event);
+  add(event, evaluatedSize) {
+    this.#events.add(event, evaluatedSize);
   }
   get events() {
     return this.#events.get();