@newrelic/browser-agent 1.254.1 → 1.256.0

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

@@ -14,13 +14,13 @@ var _stringify = require("../../../common/util/stringify");
 var _handle = require("../../../common/event-emitter/handle");
 var _mapOwn = require("../../../common/util/map-own");
 var _config = require("../../../common/config/config");
-var _now = require("../../../common/timing/now");
 var _runtime = require("../../../common/constants/runtime");
 var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _nreum = require("../../../common/window/nreum");
 var _drain = require("../../../common/drain/drain");
+var _now = require("../../../common/timing/now");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -42,9 +42,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.bufferedErrorsUnderSpa = {};
     this.currentBody = undefined;
     this.errorOnPage = false;
+    this.replayAborted = false;
 
     // this will need to change to match whatever ee we use in the instrument
     this.ee.on('interactionDone', (interaction, wasSaved) => this.onInteractionDone(interaction, wasSaved));
+    this.ee.on('REPLAY_ABORTED', () => {
+      this.replayAborted = true;
+    });
     (0, _registerHandler.registerHandler)('err', function () {
       return _this.storeError(...arguments);
     }, this.featureName, this.ee);
@@ -89,9 +93,16 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (releaseIds !== '{}') {
       payload.qs.ri = releaseIds;
     }
-    if (body && body.err && body.err.length && !this.errorOnPage) {
-      payload.qs.pve = '1';
-      this.errorOnPage = true;
+    if (body && body.err && body.err.length) {
+      if (this.replayAborted) {
+        body.err.forEach(e => {
+          delete e.params?.hasReplay;
+        });
+      }
+      if (!this.errorOnPage) {
+        payload.qs.pve = '1';
+        this.errorOnPage = true;
+      }
     }
     return payload;
   }
@@ -136,7 +147,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     return canonicalStackString;
   }
-  storeError(err, time, internal, customAttributes) {
+  storeError(err, time, internal, customAttributes, hasReplay) {
     // are we in an interaction
     time = time || (0, _now.now)();
     const agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
@@ -172,7 +183,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (!this.stackReported[bucketHash]) {
       this.stackReported[bucketHash] = true;
       params.stack_trace = (0, _formatStackTrace.truncateSize)(stackInfo.stackString);
-      this.observedAt[bucketHash] = agentRuntime.offset + time;
+      this.observedAt[bucketHash] = agentRuntime.timeKeeper.convertRelativeTimestamp(time);
     } else {
       params.browser_stack_hash = (0, _stringHashCode.stringHashCode)(stackInfo.stackString);
     }
@@ -187,8 +198,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
       params.pageview = 1;
       this.pageviewReported[bucketHash] = true;
     }
-    if (agentRuntime?.session?.state?.sessionReplayMode) params.hasReplay = true;
+    if (hasReplay && !this.replayAborted) params.hasReplay = hasReplay;
     params.firstOccurrenceTimestamp = this.observedAt[bucketHash];
+    params.timestamp = this.observedAt[bucketHash];
     var type = internal ? 'ierr' : 'err';
     var newMetrics = {
       time
@@ -197,7 +209,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     // Trace sends the error in its payload, and both trace & replay simply listens for any error to occur.
     const jsErrorEvent = [type, bucketHash, params, newMetrics, customAttributes];
     (0, _handle.handle)('errorAgg', jsErrorEvent, undefined, _features.FEATURE_NAMES.sessionTrace, this.ee);
-    (0, _handle.handle)('errorAgg', jsErrorEvent, undefined, _features.FEATURE_NAMES.sessionReplay, this.ee);
     // still send EE events for other features such as above, but stop this one from aggregating internal data
     if (this.blocked) return;
     const softNavInUse = Boolean((0, _nreum.getNREUMInitializedAgent)(this.agentIdentifier)?.features[_features.FEATURE_NAMES.softNav]);

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Instrument = void 0;
 var _handle = require("../../../common/event-emitter/handle");
-var _now = require("../../../common/timing/now");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
@@ -13,6 +12,8 @@ var _runtime = require("../../../common/constants/runtime");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
 var _stringify = require("../../../common/util/stringify");
 var _uncaughtError = require("./uncaught-error");
+var _now = require("../../../common/timing/now");
+var _constants2 = require("../../session_replay/constants");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -21,6 +22,7 @@ var _uncaughtError = require("./uncaught-error");
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
   #seenErrors = new Set();
+  #replayRunning = false;
   constructor(agentIdentifier, aggregator) {
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
@@ -37,13 +39,16 @@ class Instrument extends _instrumentBase.InstrumentBase {
     });
     this.ee.on('internal-error', error => {
       if (!this.abortHandler) return;
-      (0, _handle.handle)('ierr', [this.#castError(error), (0, _now.now)(), true], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+      (0, _handle.handle)('ierr', [this.#castError(error), (0, _now.now)(), true, {}, this.#replayRunning], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+    });
+    this.ee.on(_constants2.SR_EVENT_EMITTER_TYPES.REPLAY_RUNNING, isRunning => {
+      this.#replayRunning = isRunning;
     });
     _runtime.globalScope.addEventListener('unhandledrejection', promiseRejectionEvent => {
       if (!this.abortHandler) return;
       (0, _handle.handle)('err', [this.#castPromiseRejectionEvent(promiseRejectionEvent), (0, _now.now)(), false, {
         unhandledPromiseRejection: 1
-      }], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+      }, this.#replayRunning], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
     }, (0, _eventListenerOpts.eventListenerOpts)(false, this.removeOnAbort?.signal));
     _runtime.globalScope.addEventListener('error', errorEvent => {
       if (!this.abortHandler) return;
@@ -56,7 +61,7 @@ class Instrument extends _instrumentBase.InstrumentBase {
         this.#seenErrors.delete(errorEvent.error);
         return;
       }
-      (0, _handle.handle)('err', [this.#castErrorEvent(errorEvent), (0, _now.now)()], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+      (0, _handle.handle)('err', [this.#castErrorEvent(errorEvent), (0, _now.now)(), false, {}, this.#replayRunning], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
     }, (0, _eventListenerOpts.eventListenerOpts)(false, this.removeOnAbort?.signal));
     this.abortHandler = this.#abort; // we also use this as a flag to denote that the feature is active or on and handling errors
     this.importAggregator();

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

@@ -95,14 +95,15 @@ class Aggregate extends _aggregateBase.AggregateBase {
       width = window.document.documentElement.clientWidth;
       height = window.document.documentElement.clientHeight;
     }
+    const agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
     var defaults = {
-      timestamp: t + (0, _config.getRuntime)(this.agentIdentifier).offset,
+      timestamp: agentRuntime.timeKeeper.convertRelativeTimestamp(t),
       timeSinceLoad: t / 1000,
       browserWidth: width,
       browserHeight: height,
       referrerUrl: this.referrerUrl,
       currentUrl: (0, _cleanUrl.cleanURL)('' + location),
-      pageUrl: (0, _cleanUrl.cleanURL)((0, _config.getRuntime)(this.agentIdentifier).origin),
+      pageUrl: (0, _cleanUrl.cleanURL)(agentRuntime.origin),
       eventType: 'PageAction'
     };
     (0, _mapOwn.mapOwn)(defaults, set);

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

@@ -21,6 +21,8 @@ var _drain = require("../../../common/drain/drain");
 var _features = require("../../../loaders/features/features");
 var _handle = require("../../../common/event-emitter/handle");
 var _constants2 = require("../../metrics/constants");
+var _now = require("../../../common/timing/now");
+var _timeKeeper = require("../../../common/timing/time-keeper");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 class Aggregate extends _aggregateBase.AggregateBase {
@@ -35,9 +37,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
       _timeToFirstByte.timeToFirstByte.subscribe(_ref => {
         let {
           value,
-          entries
+          attrs
         } = _ref;
-        const navEntry = entries[0];
+        const navEntry = attrs.navigationEntry;
         this.timeToFirstByte = Math.max(value, this.timeToFirstByte);
         this.firstByteToWindowLoad = Math.max(Math.round(navEntry.loadEventEnd - this.timeToFirstByte), this.firstByteToWindowLoad); // our "frontend" duration
         this.firstByteToDomContent = Math.max(Math.round(navEntry.domContentLoadedEventEnd - this.timeToFirstByte), this.firstByteToDomContent); // our "dom processing" duration
@@ -116,7 +118,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     queryParameters.fp = _firstPaint.firstPaint.current.value;
     queryParameters.fcp = _firstContentfulPaint.firstContentfulPaint.current.value;
-    const rumStartTime = this.timeKeeper.now();
+    const rumStartTime = (0, _now.now)();
     harvester.send({
       endpoint: 'rum',
       payload: {
@@ -133,14 +135,17 @@ class Aggregate extends _aggregateBase.AggregateBase {
           responseText,
           xhr
         } = _ref3;
-        const rumEndTime = this.timeKeeper.now();
+        const rumEndTime = (0, _now.now)();
         if (status >= 400 || status === 0) {
           // Adding retry logic for the rum call will be a separate change
           this.ee.abort();
           return;
         }
         try {
-          this.timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime);
+          const timeKeeper = new _timeKeeper.TimeKeeper();
+          timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime);
+          if (!timeKeeper.ready) throw new Error('TimeKeeper not ready');
+          agentRuntime.timeKeeper = timeKeeper;
         } catch (error) {
           (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/Failed'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
           (0, _drain.drain)(this.agentIdentifier, _features.FEATURE_NAMES.metrics, true);

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

@@ -21,6 +21,8 @@ var _interactionToNextPaint = require("../../../common/vitals/interaction-to-nex
 var _largestContentfulPaint = require("../../../common/vitals/largest-contentful-paint");
 var _timeToFirstByte = require("../../../common/vitals/time-to-first-byte");
 var _longTask = require("../../../common/vitals/long-task");
+var _pageVisibility = require("../../../common/window/page-visibility");
+var _constants2 = require("../../../common/vitals/constants");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -44,15 +46,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.timingsSent = [];
     this.curSessEndRecorded = false;
     if ((0, _config.getConfigurationValue)(this.agentIdentifier, 'page_view_timing.long_task') === true) _longTask.longTask.subscribe(this.#handleVitalMetric);
-
-    /* It's important that CWV api, like "onLCP", is called before this scheduler is initialized. The reason is because they listen to the same
-      on vis change or pagehide events, and we'd want ex. onLCP to record the timing (win the race) before we try to send "final harvest". */
-
     (0, _registerHandler.registerHandler)('docHidden', msTimestamp => this.endCurrentSession(msTimestamp), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('winPagehide', msTimestamp => this.recordPageUnload(msTimestamp), this.featureName, this.ee);
     const initialHarvestSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'page_view_timing.initialHarvestSeconds') || 10;
     const harvestTimeSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'page_view_timing.harvestTimeSeconds') || 30;
     this.waitForFlags([]).then(() => {
+      /* It's important that CWV api, like "onLCP", is called before the **scheduler** is initialized. The reason is because they listen to the same
+        on vis change or pagehide events, and we'd want ex. onLCP to record the timing (win the race) before we try to send "final harvest". */
       _firstPaint.firstPaint.subscribe(this.#handleVitalMetric);
       _firstContentfulPaint.firstContentfulPaint.subscribe(this.#handleVitalMetric);
       _firstInputDelay.firstInputDelay.subscribe(this.#handleVitalMetric);
@@ -60,10 +60,23 @@ class Aggregate extends _aggregateBase.AggregateBase {
       _interactionToNextPaint.interactionToNextPaint.subscribe(this.#handleVitalMetric);
       _timeToFirstByte.timeToFirstByte.subscribe(_ref2 => {
         let {
-          entries
+          attrs
         } = _ref2;
-        this.addTiming('load', Math.round(entries[0].loadEventEnd));
+        this.addTiming('load', Math.round(attrs.navigationEntry.loadEventEnd));
       });
+      (0, _pageVisibility.subscribeToVisibilityChange)(() => {
+        /* Downstream, the event consumer interprets all timing node value as ms-unit and converts it to seconds via division by 1000. CLS is unitless so this normally is a problem.
+          bel.6 schema also doesn't support decimal values, of which cls within [0,1). However, the two nicely cancels out, and we can multiply cls by 1000 to both negate the division
+          and send an integer > 1. We effectively lose some precision down to 3 decimal places for this workaround. E.g. (real) 0.749132... -> 749.132...-> 749 -> 0.749 (final) */
+        const {
+          name,
+          value,
+          attrs
+        } = _cumulativeLayoutShift.cumulativeLayoutShift.current;
+        if (value === undefined) return;
+        this.addTiming(name, value * 1000, attrs);
+      }, true); // CLS node should only reports on vis change rather than on every change
+
       const scheduler = new _harvestScheduler.HarvestScheduler('events', {
         onFinished: function () {
           return _this.onHarvestFinished(...arguments);
@@ -113,8 +126,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     Issue: Because NR 'pageHide' was only sent once with what is considered the "final" CLS value, in the case that 'pageHide' fires before 'load' happens, we incorrectly a final CLS of 0 for that page.
     Mitigation: We've set initial CLS to null so that it's omitted from timings like 'pageHide' in that edge case. It should only be included if onCLS callback was executed at least once.
     Future: onCLS value changes should be reported directly & CLS separated into its own timing node so it's not beholden to 'pageHide' firing. It'd also be possible to report the real final CLS.
+    *cli Mar'24 update: CLS now emitted as its own timing node in addition to as-property under other nodes. The 'cls' property is unnecessary for cls nodes.
     */
-    if (_cumulativeLayoutShift.cumulativeLayoutShift.current.value >= 0) {
+    if (name !== _constants2.VITAL_NAMES.CUMULATIVE_LAYOUT_SHIFT && _cumulativeLayoutShift.cumulativeLayoutShift.current.value >= 0) {
       attrs.cls = _cumulativeLayoutShift.cumulativeLayoutShift.current.value;
     }
     this.timings.push({

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

@@ -7,10 +7,10 @@ exports.Instrument = void 0;
 var _handle = require("../../../common/event-emitter/handle");
 var _pageVisibility = require("../../../common/window/page-visibility");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
-var _now = require("../../../common/timing/now");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 var _runtime = require("../../../common/constants/runtime");
+var _now = require("../../../common/timing/now");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0

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

@@ -17,11 +17,12 @@ var _constants2 = require("../../metrics/constants");
 var _handle = require("../../../common/event-emitter/handle");
 var _features = require("../../../loaders/features/features");
 var _env = require("../../../common/constants/env.npm");
-var _now = require("../../../common/timing/now");
 var _constants3 = require("../../../common/session/constants");
 var _stringify = require("../../../common/util/stringify");
 var _stylesheetEvaluator = require("../shared/stylesheet-evaluator");
 var _drain = require("../../../common/drain/drain");
+var _now = require("../../../common/timing/now");
+var _utils = require("../shared/utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; } /*
  * Copyright 2023 New Relic Corporation. All rights reserved.
@@ -35,6 +36,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
+  mode = _constants3.MODE.OFF;
+
   // pass the recorder into the aggregator
   constructor(agentIdentifier, aggregator, args) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
@@ -48,21 +51,18 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.gzipper = undefined;
     /** populated with the u8 string lib async */
     this.u8 = undefined;
-    /** the mode to start in.  Defaults to off */
-    const {
-      session
-    } = (0, _config.getRuntime)(this.agentIdentifier);
-    this.mode = session.state.sessionReplayMode || _constants3.MODE.OFF;
 
     /** set by BCS response */
     this.entitled = false;
+    /** set at BCS response, stored in runtime */
+    this.timeKeeper = undefined;
     this.recorder = args?.recorder;
-    if (this.recorder) this.recorder.parent = this;
+    this.preloaded = !!this.recorder;
+    this.errorNoticed = args?.errorNoticed || false;
     (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Config/SessionReplay/Enabled'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
 
     // The SessionEntity class can emit a message indicating the session was cleared and reset (expiry, inactivity). This feature must abort and never resume if that occurs.
     this.ee.on(_constants3.SESSION_EVENTS.RESET, () => {
-      this.scheduler.runHarvest();
       this.abort(_constants.ABORT_REASONS.RESET);
     });
 
@@ -106,17 +106,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     (0, _registerHandler.registerHandler)(_constants.SR_EVENT_EMITTER_TYPES.PAUSE, () => {
       this.forceStop(this.mode !== _constants3.MODE.ERROR);
     }, this.featureName, this.ee);
-
-    // Wait for an error to be reported.  This currently is wrapped around the "Error" feature.  This is a feature-feature dependency.
-    // This was to ensure that all errors, including those on the page before load and those handled with "noticeError" are accounted for. Needs evalulation
-    (0, _registerHandler.registerHandler)('errorAgg', e => {
-      this.errorNoticed = true;
-      if (this.recorder) this.recorder.currentBufferTarget.hasError = true;
-      // run once
-      if (this.mode === _constants3.MODE.ERROR && _runtime.globalScope?.document.visibilityState === 'visible') {
-        this.switchToFull();
-      }
-    }, this.featureName, this.ee);
     const {
       error_sampling_rate,
       sampling_rate,
@@ -157,6 +146,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
     (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Config/SessionReplay/SamplingRate/Value', sampling_rate], undefined, _features.FEATURE_NAMES.metrics, this.ee);
     (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Config/SessionReplay/ErrorSamplingRate/Value', error_sampling_rate], undefined, _features.FEATURE_NAMES.metrics, this.ee);
   }
+  handleError(e) {
+    if (this.recorder) this.recorder.currentBufferTarget.hasError = true;
+    // run once
+    if (this.mode === _constants3.MODE.ERROR && _runtime.globalScope?.document.visibilityState === 'visible') {
+      this.switchToFull();
+    }
+  }
   switchToFull() {
     this.mode = _constants3.MODE.FULL;
     // if the error was noticed AFTER the recorder was already imported....
@@ -189,8 +185,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
     // session replay samples can only be decided on the first load of a session
     // session replays can continue if already in progress
     const {
-      session
+      session,
+      timeKeeper
     } = (0, _config.getRuntime)(this.agentIdentifier);
+    this.timeKeeper = timeKeeper;
     if (!session.isNew && !ignoreSession) {
       // inherit the mode of the existing session
       this.mode = session.state.sessionReplayMode;
@@ -219,12 +217,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
       } catch (err) {
         return this.abort(_constants.ABORT_REASONS.IMPORT);
       }
+    } else {
+      this.recorder.parent = this;
     }
 
     // If an error was noticed before the mode could be set (like in the early lifecycle of the page), immediately set to FULL mode
-    if (this.mode === _constants3.MODE.ERROR && this.errorNoticed) {
-      this.mode = _constants3.MODE.FULL;
-    }
+    if (this.mode === _constants3.MODE.ERROR && this.errorNoticed) this.mode = _constants3.MODE.FULL;
+    if (!this.preloaded) this.ee.on('err', e => this.handleError(e));
 
     // FULL mode records AND reports from the beginning, while ERROR mode only records (but does not report).
     // ERROR mode will do this until an error is thrown, and then switch into FULL mode.
@@ -256,7 +255,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     let {
       opts
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    if (!this.recorder) return;
+    if (!this.recorder || !this.timeKeeper?.ready) return;
     const recorderEvents = this.recorder.getEvents();
     // get the event type and use that to trigger another harvest if needed
     if (!recorderEvents.events.length || this.mode !== _constants3.MODE.FULL || this.blocked) return;
@@ -265,18 +264,39 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.recorder.clearBuffer();
       return;
     }
+    (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['SessionReplay/Harvest/Attempts'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
     let len = 0;
     if (!!this.gzipper && !!this.u8) {
-      payload.body = this.gzipper(this.u8("[".concat(payload.body.map(e => e.__serialized).join(','), "]")));
+      payload.body = this.gzipper(this.u8("[".concat(payload.body.map(_ref2 => {
+        let {
+          __serialized,
+          ...e
+        } = _ref2;
+        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(','), "]")));
       len = payload.body.length;
       this.scheduler.opts.gzip = true;
     } else {
-      payload.body = payload.body.map(_ref2 => {
+      payload.body = payload.body.map(_ref3 => {
         let {
           __serialized,
           ...node
-        } = _ref2;
-        return node;
+        } = _ref3;
+        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;
       });
       len = (0, _stringify.stringify)(payload.body).length;
       this.scheduler.opts.gzip = false;
@@ -296,6 +316,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (recorderEvents.type === 'preloaded') this.scheduler.runHarvest(opts);
     return [payload];
   }
+  getCorrectedTimestamp(node) {
+    if (!node.timestamp) return;
+    if (node.__newrelic) return node.timestamp;
+    return this.timeKeeper.correctAbsoluteTimestamp(node.timestamp);
+  }
   getHarvestContents(recorderEvents) {
     recorderEvents ??= this.recorder.getEvents();
     let events = recorderEvents.events;
@@ -320,12 +345,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
       events = events.slice(0, events.length - 1);
       recorderEvents.hasMeta = !!events.find(x => x.type === _constants.RRWEB_EVENT_TYPES.Meta);
     }
-    const agentOffset = (0, _config.getRuntime)(this.agentIdentifier).offset;
     const relativeNow = (0, _now.now)();
-    const firstEventTimestamp = events[0]?.timestamp; // from rrweb node
-    const lastEventTimestamp = events[events.length - 1]?.timestamp; // from rrweb node
-    const firstTimestamp = firstEventTimestamp || recorderEvents.cycleTimestamp; // from rrweb node || from when the harvest cycle started
-    const lastTimestamp = lastEventTimestamp || agentOffset + relativeNow;
+    const firstEventTimestamp = this.getCorrectedTimestamp(events[0]); // from rrweb node
+    const lastEventTimestamp = this.getCorrectedTimestamp(events[events.length - 1]); // from rrweb node
+    const firstTimestamp = firstEventTimestamp || this.timeKeeper.correctAbsoluteTimestamp(recorderEvents.cycleTimestamp); // from rrweb node || from when the harvest cycle started
+    const lastTimestamp = lastEventTimestamp || this.timeKeeper.convertRelativeTimestamp(relativeNow);
     const agentMetadata = agentRuntime.appMetadata?.agents?.[0] || {};
     return {
       qs: {
@@ -333,6 +357,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
         type: 'SessionReplay',
         app_id: info.applicationID,
         protocol_version: '0',
+        timestamp: firstTimestamp,
         attributes: (0, _encode.obj)({
           // this section of attributes must be controllable and stay below the query param padding limit -- see QUERY_PARAM_PADDING
           // if not, data could be lost to truncation at time of sending, potentially breaking parsing / API behavior in NR1
@@ -343,9 +368,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
             entityGuid: agentMetadata.entityGuid
           }),
           'replay.firstTimestamp': firstTimestamp,
-          'replay.firstTimestampOffset': firstTimestamp - agentOffset,
           'replay.lastTimestamp': lastTimestamp,
-          'replay.durationMs': lastTimestamp - firstTimestamp,
           'replay.nodes': events.length,
           'session.durationMs': agentRuntime.session.getDuration(),
           agentVersion: agentRuntime.version,
@@ -359,6 +382,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
           invalidStylesheetsDetected: _stylesheetEvaluator.stylesheetEvaluator.invalidStylesheetsDetected,
           inlinedAllStylesheets: recorderEvents.inlinedAllStylesheets,
           'rrweb.version': _env.RRWEB_VERSION,
+          'payload.type': recorderEvents.type,
           // customer-defined data should go last so that if it exceeds the query param padding limit it will be truncated instead of important attrs
           ...(endUserId && {
             'enduser.id': endUserId

package/dist/cjs/features/session_replay/constants.js

@@ -9,7 +9,8 @@ var _features = require("../../loaders/features/features");
 const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.sessionReplay;
 const SR_EVENT_EMITTER_TYPES = exports.SR_EVENT_EMITTER_TYPES = {
   RECORD: 'recordReplay',
-  PAUSE: 'pauseReplay'
+  PAUSE: 'pauseReplay',
+  REPLAY_RUNNING: 'replayRunning'
 };
 const AVG_COMPRESSION = exports.AVG_COMPRESSION = 0.12;
 const RRWEB_EVENT_TYPES = exports.RRWEB_EVENT_TYPES = {

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

@@ -29,6 +29,11 @@ class Instrument extends _instrumentBase.InstrumentBase {
       session = JSON.parse(localStorage.getItem("".concat(_constants.PREFIX, "_").concat(_constants.DEFAULT_KEY)));
     } catch (err) {}
     if (this.#canPreloadRecorder(session)) {
+      /** If this is preloaded, set up a buffer, if not, later when sampling we will set up a .on for live events */
+      this.ee.on('err', e => {
+        this.errorNoticed = true;
+        if (this.featAggregate) this.featAggregate.handleError();
+      });
       this.#startRecording(session?.sessionReplayMode);
     } else {
       this.importAggregator();
@@ -55,12 +60,14 @@ class Instrument extends _instrumentBase.InstrumentBase {
     } = await Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "recorder" */'../shared/recorder')));
     this.recorder = new Recorder({
       mode,
-      agentIdentifier: this.agentIdentifier
+      agentIdentifier: this.agentIdentifier,
+      ee: this.ee
     });
     this.recorder.startRecording();
     this.abortHandler = this.recorder.stopRecording;
     this.importAggregator({
-      recorder: this.recorder
+      recorder: this.recorder,
+      errorNoticed: this.errorNoticed
     });
   }
 }

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

@@ -14,16 +14,20 @@ var _stylesheetEvaluator = require("./stylesheet-evaluator");
 var _handle = require("../../../common/event-emitter/handle");
 var _constants3 = require("../../metrics/constants");
 var _features = require("../../../loaders/features/features");
+var _utils = require("./utils");
 class Recorder {
   /** Each page mutation or event will be stored (raw) in this array. This array will be cleared on each harvest */
-  #events = new _recorderEvents.RecorderEvents();
+  #events;
   /** Backlog used for a 2-part sliding window to guarantee a 15-30s buffer window */
-  #backloggedEvents = new _recorderEvents.RecorderEvents();
+  #backloggedEvents;
   /** array of recorder events -- Will be filled only if forced harvest was triggered and harvester does not exist */
-  #preloaded = [new _recorderEvents.RecorderEvents()];
+  #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;
   constructor(parent) {
+    this.#events = new _recorderEvents.RecorderEvents();
+    this.#backloggedEvents = new _recorderEvents.RecorderEvents();
+    this.#preloaded = [new _recorderEvents.RecorderEvents()];
     /** True when actively recording, false when paused or stopped */
     this.recording = false;
     /** The pointer to the current bucket holding rrweb events */
@@ -77,6 +81,10 @@ class Recorder {
       inline_images,
       collect_fonts
     } = (0, _config.getConfigurationValue)(this.parent.agentIdentifier, 'session_replay');
+    const customMasker = (text, element) => {
+      if (element?.type?.toLowerCase() !== 'password' && (element?.dataset.nrUnmask !== undefined || element?.classList.contains('nr-unmask'))) return text;
+      return '*'.repeat(text.length);
+    };
     // set up rrweb configurations for maximum privacy --
     // https://newrelic.atlassian.net/wiki/spaces/O11Y/pages/2792293280/2023+02+28+Browser+-+Session+Replay#Configuration-options
     const stop = (0, _rrweb.record)({
@@ -87,14 +95,18 @@ class Recorder {
       blockSelector: block_selector,
       maskInputOptions: mask_input_options,
       maskTextSelector: mask_text_selector,
+      maskTextFn: customMasker,
       maskAllInputs: mask_all_inputs,
+      maskInputFn: customMasker,
       inlineStylesheet: inline_stylesheet,
       inlineImages: inline_images,
       collectFonts: collect_fonts,
       checkoutEveryNms: _constants.CHECKOUT_MS[this.parent.mode]
     });
+    this.parent.ee.emit(_constants.SR_EVENT_EMITTER_TYPES.REPLAY_RUNNING, [true, this.parent.mode]);
     this.stopRecording = () => {
       this.recording = false;
+      this.parent.ee.emit(_constants.SR_EVENT_EMITTER_TYPES.REPLAY_RUNNING, [false, this.parent.mode]);
       stop();
     };
   }
@@ -136,9 +148,13 @@ class Recorder {
   /** 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;
-    event.__serialized = (0, _stringify.stringify)(event);
     if (!this.parent.scheduler && 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);
+    }
+    event.__serialized = (0, _stringify.stringify)(event);
     const eventBytes = event.__serialized.length;
     /** The estimated size of the payload after compression */
     const payloadSize = this.getPayloadSize(eventBytes);

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.buildNRMetaNode = buildNRMetaNode;
 exports.canImportReplayAgg = canImportReplayAgg;
 exports.enableSessionTracking = void 0;
 exports.isPreloadAllowed = isPreloadAllowed;
@@ -23,4 +24,15 @@ function isPreloadAllowed(agentId) {
 function canImportReplayAgg(agentId, sessionMgr) {
   if (!hasReplayPrerequisite(agentId)) return false;
   return !!sessionMgr?.isNew || !!sessionMgr?.state.sessionReplayMode; // Session Replay should only try to run if already running from a previous page, or at the beginning of a session
+}
+function buildNRMetaNode(timestamp, timeKeeper) {
+  const correctedTimestamp = timeKeeper.correctAbsoluteTimestamp(timestamp);
+  return {
+    originalTimestamp: timestamp,
+    correctedTimestamp,
+    timestampDiff: timestamp - correctedTimestamp,
+    timeKeeperOriginTime: timeKeeper.originTime,
+    timeKeeperCorrectedOriginTime: timeKeeper.correctedOriginTime,
+    timeKeeperDiff: Math.floor(timeKeeper.originTime - timeKeeper.correctedOriginTime)
+  };
 }