@newrelic/browser-agent 1.259.0 → 1.260.0

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.260.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.259.0...v1.260.0) (2024-05-13)
+
+
+### Features
+
+* Improve time stamping of page view events ([#1026](https://github.com/newrelic/newrelic-browser-agent/issues/1026)) ([67a658d](https://github.com/newrelic/newrelic-browser-agent/commit/67a658d2645b680a479175dff06a4fd95bd6086a))
+
+
+### Bug Fixes
+
+* Add internal error handler to session replay recorder ([#1029](https://github.com/newrelic/newrelic-browser-agent/issues/1029)) ([84c101c](https://github.com/newrelic/newrelic-browser-agent/commit/84c101ccbff8da207bdf215714f49b7d49941388))
+* Adjust session entity to not race between tabs ([#1032](https://github.com/newrelic/newrelic-browser-agent/issues/1032)) ([d86becf](https://github.com/newrelic/newrelic-browser-agent/commit/d86becf2fc02aa133430332aa4e4c2bc26297750))
+
 ## [1.259.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.258.2...v1.259.0) (2024-05-08)
 
 

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

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.259.0";
+const VERSION = exports.VERSION = "1.260.0";
 
 /**
  * Exposes the build type of the agent

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

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.259.0";
+const VERSION = exports.VERSION = "1.260.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/session/session-entity.js

@@ -74,8 +74,15 @@ class SessionEntity {
       expiresMs = _constants.DEFAULT_EXPIRES_MS,
       inactiveMs = _constants.DEFAULT_INACTIVE_MS
     } = _ref;
+    /** Ensure that certain properties are preserved across a reset if already set */
+    const persistentAttributes = {
+      serverTimeDiff: this.state.serverTimeDiff || model.serverTimeDiff
+    };
     this.state = {};
-    this.sync(model);
+    this.sync({
+      ...model,
+      ...persistentAttributes
+    });
 
     // value is intended to act as the primary value of the k=v pair
     this.state.value = value;

package/dist/cjs/common/timing/time-keeper.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TimeKeeper = void 0;
 var _runtime = require("../constants/runtime");
-var _contextualEe = require("../event-emitter/contextual-ee");
 var _config = require("../config/config");
-var _constants = require("../session/constants");
 /**
  * Class used to adjust the timestamp of harvested data to New Relic server time. This
  * is done by tracking the performance timings of the RUM call and applying a calculation
@@ -41,18 +39,7 @@ class TimeKeeper {
   #ready = false;
   constructor(agentIdentifier) {
     this.#session = (0, _config.getRuntime)(agentIdentifier)?.session;
-    if (this.#session) {
-      const ee = _contextualEe.ee.get(agentIdentifier);
-      ee.on(_constants.SESSION_EVENTS.UPDATE, this.#processSessionUpdate.bind(this));
-      ee.on(_constants.SESSION_EVENTS.STARTED, () => {
-        if (this.#ready) {
-          this.#session.write({
-            serverTimeDiff: this.#localTimeDiff
-          });
-        }
-      });
-      this.#processSessionUpdate(null, this.#session.read());
-    }
+    this.processStoredDiff();
   }
   get ready() {
     return this.#ready;
@@ -68,8 +55,8 @@ class TimeKeeper {
    * @param endTime {number} The end time of the RUM request
    */
   processRumRequest(rumRequest, startTime, endTime) {
+    this.processStoredDiff();
     if (this.#ready) return; // Server time calculated from session entity
-
     const responseDateHeader = rumRequest.getResponseHeader('Date');
     if (!responseDateHeader) {
       throw new Error('Missing date header on rum response.');
@@ -80,10 +67,10 @@ class TimeKeeper {
     // Corrected page origin time
     this.#correctedOriginTime = Math.floor(Date.parse(responseDateHeader) - serverOffset);
     this.#localTimeDiff = _runtime.originTime - this.#correctedOriginTime;
-    if (Number.isNaN(this.#correctedOriginTime)) {
+    if (isNaN(this.#correctedOriginTime)) {
       throw new Error('Date header invalid format.');
     }
-    if (this.#session) this.#session.write({
+    this.#session?.write({
       serverTimeDiff: this.#localTimeDiff
     });
     this.#ready = true;
@@ -108,19 +95,11 @@ class TimeKeeper {
     return Math.floor(timestamp - this.#localTimeDiff);
   }
 
-  /**
-   * Processes a session entity update payload to extract the server time calculated.
-   * @param {import('../session/constants').SESSION_EVENT_TYPES | null} type
-   * @param {Object} data
-   */
-  #processSessionUpdate(type, data) {
-    if (typeof data?.serverTimeDiff !== 'number') return;
-    if (!type && !this.#ready ||
-    // This captures the initial read from the session entity when the timekeeper first initializes
-    type === _constants.SESSION_EVENT_TYPES.CROSS_TAB // This captures any cross-tab write of the session entity
-    ) {
-      // This captures the initial read from the session entity when the timekeeper first initializes
-      this.#localTimeDiff = data.serverTimeDiff;
+  /** Process the session entity and use the info to set the main time calculations if present */
+  processStoredDiff() {
+    const storedServerTimeDiff = this.#session?.read()?.serverTimeDiff;
+    if (typeof storedServerTimeDiff === 'number' && !isNaN(storedServerTimeDiff)) {
+      this.#localTimeDiff = storedServerTimeDiff;
       this.#correctedOriginTime = _runtime.originTime - this.#localTimeDiff;
       this.#ready = true;
     }

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

@@ -198,8 +198,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       time
     };
 
-    // sr, stn and spa aggregators listen to this event - stn sends the error in its payload,
-    // and spa annotates the error with interaction info
+    // 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)('trace-jserror', jsErrorEvent, undefined, _features.FEATURE_NAMES.sessionTrace, this.ee);
     // still send EE events for other features such as above, but stop this one from aggregating internal data

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

@@ -7,7 +7,6 @@ exports.Instrument = void 0;
 var _handle = require("../../../common/event-emitter/handle");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
-var _features = require("../../../loaders/features/features");
 var _runtime = require("../../../common/constants/runtime");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
 var _now = require("../../../common/timing/now");
@@ -30,7 +29,7 @@ class Instrument extends _instrumentBase.InstrumentBase {
     } catch (e) {}
     this.ee.on('internal-error', error => {
       if (!this.abortHandler) return;
-      (0, _handle.handle)('ierr', [(0, _castError.castError)(error), (0, _now.now)(), true, {}, this.#replayRunning], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+      (0, _handle.handle)('ierr', [(0, _castError.castError)(error), (0, _now.now)(), true, {}, this.#replayRunning], undefined, this.featureName, this.ee);
     });
     this.ee.on(_constants2.SR_EVENT_EMITTER_TYPES.REPLAY_RUNNING, isRunning => {
       this.#replayRunning = isRunning;
@@ -39,11 +38,11 @@ class Instrument extends _instrumentBase.InstrumentBase {
       if (!this.abortHandler) return;
       (0, _handle.handle)('err', [(0, _castError.castPromiseRejectionEvent)(promiseRejectionEvent), (0, _now.now)(), false, {
         unhandledPromiseRejection: 1
-      }, this.#replayRunning], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+      }, this.#replayRunning], undefined, this.featureName, this.ee);
     }, (0, _eventListenerOpts.eventListenerOpts)(false, this.removeOnAbort?.signal));
     _runtime.globalScope.addEventListener('error', errorEvent => {
       if (!this.abortHandler) return;
-      (0, _handle.handle)('err', [(0, _castError.castErrorEvent)(errorEvent), (0, _now.now)(), false, {}, this.#replayRunning], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+      (0, _handle.handle)('err', [(0, _castError.castErrorEvent)(errorEvent), (0, _now.now)(), false, {}, this.#replayRunning], undefined, this.featureName, 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_view_event/aggregate/index.js

@@ -32,7 +32,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.timeToFirstByte = 0;
     this.firstByteToWindowLoad = 0; // our "frontend" duration
     this.firstByteToDomContent = 0; // our "dom processing" duration
-
+    this.timeKeeper = new _timeKeeper.TimeKeeper(this.agentIdentifier);
     if (_runtime.isBrowserScope) {
       _timeToFirstByte.timeToFirstByte.subscribe(_ref => {
         let {
@@ -118,6 +118,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     queryParameters.fp = _firstPaint.firstPaint.current.value;
     queryParameters.fcp = _firstContentfulPaint.firstContentfulPaint.current.value;
+    if (this.timeKeeper?.ready) {
+      queryParameters.timestamp = this.timeKeeper.convertRelativeTimestamp((0, _now.now)());
+    }
     const rumStartTime = (0, _now.now)();
     harvester.send({
       endpoint: 'rum',
@@ -142,10 +145,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
           return;
         }
         try {
-          const timeKeeper = new _timeKeeper.TimeKeeper(this.agentIdentifier);
-          timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime);
-          if (!timeKeeper.ready) throw new Error('TimeKeeper not ready');
-          agentRuntime.timeKeeper = timeKeeper;
+          this.timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime);
+          if (!this.timeKeeper.ready) throw new Error('TimeKeeper not ready');
+          agentRuntime.timeKeeper = this.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/session_replay/shared/recorder.js

@@ -101,7 +101,14 @@ class Recorder {
       inlineStylesheet: inline_stylesheet,
       inlineImages: inline_images,
       collectFonts: collect_fonts,
-      checkoutEveryNms: _constants.CHECKOUT_MS[this.parent.mode]
+      checkoutEveryNms: _constants.CHECKOUT_MS[this.parent.mode],
+      /** Emits errors thrown by rrweb directly before bubbling them up to the window */
+      errorHandler: err => {
+        /** capture rrweb errors as "internal" errors only */
+        this.parent.ee.emit('internal-error', [err]);
+        /** returning true informs rrweb to swallow the error instead of throwing it to the window */
+        return true;
+      }
     });
     this.stopRecording = () => {
       this.recording = false;

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

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.259.0";
+export const VERSION = "1.260.0";
 
 /**
  * Exposes the build type of the agent

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

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.259.0";
+export const VERSION = "1.260.0";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/session/session-entity.js

@@ -69,8 +69,15 @@ export class SessionEntity {
       expiresMs = DEFAULT_EXPIRES_MS,
       inactiveMs = DEFAULT_INACTIVE_MS
     } = _ref;
+    /** Ensure that certain properties are preserved across a reset if already set */
+    const persistentAttributes = {
+      serverTimeDiff: this.state.serverTimeDiff || model.serverTimeDiff
+    };
     this.state = {};
-    this.sync(model);
+    this.sync({
+      ...model,
+      ...persistentAttributes
+    });
 
     // value is intended to act as the primary value of the k=v pair
     this.state.value = value;

package/dist/esm/common/timing/time-keeper.js

@@ -1,7 +1,5 @@
 import { originTime } from '../constants/runtime';
-import { ee as baseEE } from '../event-emitter/contextual-ee';
 import { getRuntime } from '../config/config';
-import { SESSION_EVENT_TYPES, SESSION_EVENTS } from '../session/constants';
 
 /**
  * Class used to adjust the timestamp of harvested data to New Relic server time. This
@@ -36,18 +34,7 @@ export class TimeKeeper {
   #ready = false;
   constructor(agentIdentifier) {
     this.#session = getRuntime(agentIdentifier)?.session;
-    if (this.#session) {
-      const ee = baseEE.get(agentIdentifier);
-      ee.on(SESSION_EVENTS.UPDATE, this.#processSessionUpdate.bind(this));
-      ee.on(SESSION_EVENTS.STARTED, () => {
-        if (this.#ready) {
-          this.#session.write({
-            serverTimeDiff: this.#localTimeDiff
-          });
-        }
-      });
-      this.#processSessionUpdate(null, this.#session.read());
-    }
+    this.processStoredDiff();
   }
   get ready() {
     return this.#ready;
@@ -63,8 +50,8 @@ export class TimeKeeper {
    * @param endTime {number} The end time of the RUM request
    */
   processRumRequest(rumRequest, startTime, endTime) {
+    this.processStoredDiff();
     if (this.#ready) return; // Server time calculated from session entity
-
     const responseDateHeader = rumRequest.getResponseHeader('Date');
     if (!responseDateHeader) {
       throw new Error('Missing date header on rum response.');
@@ -75,10 +62,10 @@ export class TimeKeeper {
     // Corrected page origin time
     this.#correctedOriginTime = Math.floor(Date.parse(responseDateHeader) - serverOffset);
     this.#localTimeDiff = originTime - this.#correctedOriginTime;
-    if (Number.isNaN(this.#correctedOriginTime)) {
+    if (isNaN(this.#correctedOriginTime)) {
       throw new Error('Date header invalid format.');
     }
-    if (this.#session) this.#session.write({
+    this.#session?.write({
       serverTimeDiff: this.#localTimeDiff
     });
     this.#ready = true;
@@ -103,19 +90,11 @@ export class TimeKeeper {
     return Math.floor(timestamp - this.#localTimeDiff);
   }
 
-  /**
-   * Processes a session entity update payload to extract the server time calculated.
-   * @param {import('../session/constants').SESSION_EVENT_TYPES | null} type
-   * @param {Object} data
-   */
-  #processSessionUpdate(type, data) {
-    if (typeof data?.serverTimeDiff !== 'number') return;
-    if (!type && !this.#ready ||
-    // This captures the initial read from the session entity when the timekeeper first initializes
-    type === SESSION_EVENT_TYPES.CROSS_TAB // This captures any cross-tab write of the session entity
-    ) {
-      // This captures the initial read from the session entity when the timekeeper first initializes
-      this.#localTimeDiff = data.serverTimeDiff;
+  /** Process the session entity and use the info to set the main time calculations if present */
+  processStoredDiff() {
+    const storedServerTimeDiff = this.#session?.read()?.serverTimeDiff;
+    if (typeof storedServerTimeDiff === 'number' && !isNaN(storedServerTimeDiff)) {
+      this.#localTimeDiff = storedServerTimeDiff;
       this.#correctedOriginTime = originTime - this.#localTimeDiff;
       this.#ready = true;
     }

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

@@ -193,8 +193,7 @@ export class Aggregate extends AggregateBase {
       time
     };
 
-    // sr, stn and spa aggregators listen to this event - stn sends the error in its payload,
-    // and spa annotates the error with interaction info
+    // 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];
     handle('trace-jserror', jsErrorEvent, undefined, FEATURE_NAMES.sessionTrace, this.ee);
     // still send EE events for other features such as above, but stop this one from aggregating internal data

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

@@ -6,7 +6,6 @@
 import { handle } from '../../../common/event-emitter/handle';
 import { InstrumentBase } from '../../utils/instrument-base';
 import { FEATURE_NAME } from '../constants';
-import { FEATURE_NAMES } from '../../../loaders/features/features';
 import { globalScope } from '../../../common/constants/runtime';
 import { eventListenerOpts } from '../../../common/event-listener/event-listener-opts';
 import { now } from '../../../common/timing/now';
@@ -24,7 +23,7 @@ export class Instrument extends InstrumentBase {
     } catch (e) {}
     this.ee.on('internal-error', error => {
       if (!this.abortHandler) return;
-      handle('ierr', [castError(error), now(), true, {}, this.#replayRunning], undefined, FEATURE_NAMES.jserrors, this.ee);
+      handle('ierr', [castError(error), now(), true, {}, this.#replayRunning], undefined, this.featureName, this.ee);
     });
     this.ee.on(SR_EVENT_EMITTER_TYPES.REPLAY_RUNNING, isRunning => {
       this.#replayRunning = isRunning;
@@ -33,11 +32,11 @@ export class Instrument extends InstrumentBase {
       if (!this.abortHandler) return;
       handle('err', [castPromiseRejectionEvent(promiseRejectionEvent), now(), false, {
         unhandledPromiseRejection: 1
-      }, this.#replayRunning], undefined, FEATURE_NAMES.jserrors, this.ee);
+      }, this.#replayRunning], undefined, this.featureName, this.ee);
     }, eventListenerOpts(false, this.removeOnAbort?.signal));
     globalScope.addEventListener('error', errorEvent => {
       if (!this.abortHandler) return;
-      handle('err', [castErrorEvent(errorEvent), now(), false, {}, this.#replayRunning], undefined, FEATURE_NAMES.jserrors, this.ee);
+      handle('err', [castErrorEvent(errorEvent), now(), false, {}, this.#replayRunning], undefined, this.featureName, this.ee);
     }, 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/esm/features/page_view_event/aggregate/index.js

@@ -24,7 +24,7 @@ export class Aggregate extends AggregateBase {
     this.timeToFirstByte = 0;
     this.firstByteToWindowLoad = 0; // our "frontend" duration
     this.firstByteToDomContent = 0; // our "dom processing" duration
-
+    this.timeKeeper = new TimeKeeper(this.agentIdentifier);
     if (isBrowserScope) {
       timeToFirstByte.subscribe(_ref => {
         let {
@@ -110,6 +110,9 @@ export class Aggregate extends AggregateBase {
     }
     queryParameters.fp = firstPaint.current.value;
     queryParameters.fcp = firstContentfulPaint.current.value;
+    if (this.timeKeeper?.ready) {
+      queryParameters.timestamp = this.timeKeeper.convertRelativeTimestamp(now());
+    }
     const rumStartTime = now();
     harvester.send({
       endpoint: 'rum',
@@ -134,10 +137,9 @@ export class Aggregate extends AggregateBase {
           return;
         }
         try {
-          const timeKeeper = new TimeKeeper(this.agentIdentifier);
-          timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime);
-          if (!timeKeeper.ready) throw new Error('TimeKeeper not ready');
-          agentRuntime.timeKeeper = timeKeeper;
+          this.timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime);
+          if (!this.timeKeeper.ready) throw new Error('TimeKeeper not ready');
+          agentRuntime.timeKeeper = this.timeKeeper;
         } catch (error) {
           handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/Failed'], undefined, FEATURE_NAMES.metrics, this.ee);
           drain(this.agentIdentifier, FEATURE_NAMES.metrics, true);

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

@@ -95,7 +95,14 @@ export class Recorder {
       inlineStylesheet: inline_stylesheet,
       inlineImages: inline_images,
       collectFonts: collect_fonts,
-      checkoutEveryNms: CHECKOUT_MS[this.parent.mode]
+      checkoutEveryNms: CHECKOUT_MS[this.parent.mode],
+      /** Emits errors thrown by rrweb directly before bubbling them up to the window */
+      errorHandler: err => {
+        /** capture rrweb errors as "internal" errors only */
+        this.parent.ee.emit('internal-error', [err]);
+        /** returning true informs rrweb to swallow the error instead of throwing it to the window */
+        return true;
+      }
     });
     this.stopRecording = () => {
       this.recording = false;

package/dist/types/common/session/session-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-entity.d.ts","sourceRoot":"","sources":["../../../../src/common/session/session-entity.js"],"names":[],"mappings":"AA8BA;IACE;;;;;OAKG;IACH,uBA0BC;IApBC,qBAAsC;IACtC,aAAsB;IACtB,UAAe;IAGf,SAAc;IAEd,QAAiC;IAenC;;;;aA0EC;IAnEC,8BAA0B;IAC1B,+BAA4B;IAc1B,gCAOqC;IAUrC,4CAkBsC;IAexC,iCAAuB;IAKzB,wBAEC;IAED,sBAEC;IAED;;;OAGG;IACH,QAFa,MAAM,CA6BlB;IAED;;;;;;OAMG;IACH,YAHW,MAAM,GACJ,MAAM,CAkBlB;IAED,gBAuBC;IAED;;OAEG;IACH,gBAIC;IAED;;;OAGG;IACH,qBAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;OAGG;IACH,gBAHW,MAAM,GACJ,OAAO,CAKnB;IAED,yDAUC;IAED,6DAIC;IAED;;;OAGG;IACH,6BAHW,MAAM,GACJ,MAAM,CAIlB;IAED,gDAaC;IAHG,YAAuD;CAI5D;sBAvSqB,gBAAgB;iCAGL,4BAA4B"}
+{"version":3,"file":"session-entity.d.ts","sourceRoot":"","sources":["../../../../src/common/session/session-entity.js"],"names":[],"mappings":"AA8BA;IACE;;;;;OAKG;IACH,uBA0BC;IApBC,qBAAsC;IACtC,aAAsB;IACtB,UAAe;IAGf,SAAc;IAEd,QAAiC;IAenC;;;;aA4EC;IAnEC,8BAA0B;IAC1B,+BAA4B;IAc1B,gCAOqC;IAUrC,4CAkBsC;IAexC,iCAAuB;IAKzB,wBAEC;IAED,sBAEC;IAED;;;OAGG;IACH,QAFa,MAAM,CA6BlB;IAED;;;;;;OAMG;IACH,YAHW,MAAM,GACJ,MAAM,CAkBlB;IAED,gBAuBC;IAED;;OAEG;IACH,gBAIC;IAED;;;OAGG;IACH,qBAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;OAGG;IACH,gBAHW,MAAM,GACJ,OAAO,CAKnB;IAED,yDAUC;IAED,6DAIC;IAED;;;OAGG;IACH,6BAHW,MAAM,GACJ,MAAM,CAIlB;IAED,gDAaC;IAHG,YAAuD;CAI5D;sBAzSqB,gBAAgB;iCAGL,4BAA4B"}

package/dist/types/common/timing/time-keeper.d.ts

@@ -27,6 +27,8 @@ export class TimeKeeper {
      * @return {number} Corrected unix/epoch timestamp
      */
     correctAbsoluteTimestamp(timestamp: number): number;
+    /** Process the session entity and use the info to set the main time calculations if present */
+    processStoredDiff(): void;
     #private;
 }
 //# sourceMappingURL=time-keeper.d.ts.map

package/dist/types/common/timing/time-keeper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-keeper.d.ts","sourceRoot":"","sources":["../../../../src/common/timing/time-keeper.js"],"names":[],"mappings":"AAKA;;;;GAIG;AACH;IA2BE,kCAaC;IAED,oBAEC;IAED,kCAEC;IAED;;;;;OAKG;IACH,8BAJsB,cAAc,aACf,MAAM,WACR,MAAM,QAuBxB;IAED;;;;;OAKG;IACH,uCAHwB,MAAM,GACjB,MAAM,CAIlB;IAED;;;;OAIG;IACH,oCAHqB,MAAM,GACf,MAAM,CAIjB;;CAoBF"}
+{"version":3,"file":"time-keeper.d.ts","sourceRoot":"","sources":["../../../../src/common/timing/time-keeper.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH;IA2BE,kCAGC;IAED,oBAEC;IAED,kCAEC;IAED;;;;;OAKG;IACH,8BAJsB,cAAc,aACf,MAAM,WACR,MAAM,QAuBxB;IAED;;;;;OAKG;IACH,uCAHwB,MAAM,GACjB,MAAM,CAIlB;IAED;;;;OAIG;IACH,oCAHqB,MAAM,GACf,MAAM,CAIjB;IAED,+FAA+F;IAC/F,0BAOC;;CACF"}

package/dist/types/features/jserrors/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/jserrors/aggregate/index.js"],"names":[],"mappings":"AAyBA;;GAEG;AAEH;IACE,2BAAiC;IACjC,mDAgCC;IA7BC,kBAAuB;IACvB,eAAoB;IACpB,qBAA0B;IAC1B,2BAAgC;IAChC,mCAA4B;IAC5B,qBAAwB;IA0B1B;;;MAwBC;IAED,qCAWC;IAED,8BAEC;IAED,oEAMC;IAED;;;;;;OAMG;IACH,qCAHW,SAAS,GACP,MAAM,CAgBlB;IAED,4FA6FC;IA4BD,yDA6BC;IAED,qFAOC;;CAwBF;wBAxSY,OAAO,0BAA0B,EAAE,SAAS;8BAN3B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/jserrors/aggregate/index.js"],"names":[],"mappings":"AAyBA;;GAEG;AAEH;IACE,2BAAiC;IACjC,mDAgCC;IA7BC,kBAAuB;IACvB,eAAoB;IACpB,qBAA0B;IAC1B,2BAAgC;IAChC,mCAA4B;IAC5B,qBAAwB;IA0B1B;;;MAwBC;IAED,qCAWC;IAED,8BAEC;IAED,oEAMC;IAED;;;;;;OAMG;IACH,qCAHW,SAAS,GACP,MAAM,CAgBlB;IAED,4FA4FC;IA4BD,yDA6BC;IAED,qFAOC;;CAwBF;wBAvSY,OAAO,0BAA0B,EAAE,SAAS;8BAN3B,4BAA4B"}

package/dist/types/features/jserrors/instrument/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/jserrors/instrument/index.js"],"names":[],"mappings":"AAeA;IACE,2BAAiC;IAIjC,mEA6BC;IAxBG,2CAA0C;IAsB5C,yBAA+B;;CASlC;+BAlD8B,6BAA6B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/jserrors/instrument/index.js"],"names":[],"mappings":"AAcA;IACE,2BAAiC;IAIjC,mEA6BC;IAxBG,2CAA0C;IAsB5C,yBAA+B;;CASlC;+BAjD8B,6BAA6B"}

package/dist/types/features/page_view_event/aggregate/index.d.ts

@@ -4,7 +4,9 @@ export class Aggregate extends AggregateBase {
     timeToFirstByte: number;
     firstByteToWindowLoad: number;
     firstByteToDomContent: number;
+    timeKeeper: TimeKeeper;
     sendRum(): void;
 }
 import { AggregateBase } from '../../utils/aggregate-base';
+import { TimeKeeper } from '../../../common/timing/time-keeper';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/features/page_view_event/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/page_view_event/aggregate/index.js"],"names":[],"mappings":"AAoBA;IACE,2BAA2C;IAC3C,mDAoBC;IAjBC,wBAAwB;IACxB,8BAA8B;IAC9B,8BAA8B;IAiBhC,gBAmGC;CACF;8BAvI6B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/page_view_event/aggregate/index.js"],"names":[],"mappings":"AAoBA;IACE,2BAA2C;IAC3C,mDAqBC;IAlBC,wBAAwB;IACxB,8BAA8B;IAC9B,8BAA8B;IAC9B,uBAAsD;IAiBxD,gBAsGC;CACF;8BA3I6B,4BAA4B;2BAS/B,oCAAoC"}

package/dist/types/features/session_replay/shared/recorder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/shared/recorder.js"],"names":[],"mappings":"AAYA;IAUE,yBAkBC;IAdC,iEAAiE;IACjE,mBAAsB;IACtB,6DAA6D;IAC7D,oCAAuC;IACvC,kIAAkI;IAClI,kBAAqB;IACrB,sDAAsD;IACtD,YAAoB;IACpB,oEAAoE;IACpE,6BAAqH;IACrH,0FAA0F;IAC1F,eAA6C;IAC7C,uIAAuI;IACvI,0BAAyE;IAG3E;;;;;;;;;MAYC;IAED,mFAAmF;IACnF,oBAKC;IAED,qDAAqD;IACrD,uBA+BC;IAED;;;;;OAKG;IACH,yCA0BC;IAED,0HAA0H;IAC1H,yCAqDC;IA3CG,8BAAoB;IA6CxB,0HAA0H;IAC1H,yBAOC;IAED,wBAEC;IAED,gCAAgC;IAChC,uCAGC;IAED;;;SAGK;IACL,oCAGC;;CACF;+BApN8B,mBAAmB"}
+{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/shared/recorder.js"],"names":[],"mappings":"AAYA;IAUE,yBAkBC;IAdC,iEAAiE;IACjE,mBAAsB;IACtB,6DAA6D;IAC7D,oCAAuC;IACvC,kIAAkI;IAClI,kBAAqB;IACrB,sDAAsD;IACtD,YAAoB;IACpB,oEAAoE;IACpE,6BAAqH;IACrH,0FAA0F;IAC1F,eAA6C;IAC7C,uIAAuI;IACvI,0BAAyE;IAG3E;;;;;;;;;MAYC;IAED,mFAAmF;IACnF,oBAKC;IAED,qDAAqD;IACrD,uBAsCC;IAED;;;;;OAKG;IACH,yCA0BC;IAED,0HAA0H;IAC1H,yCAqDC;IA3CG,8BAAoB;IA6CxB,0HAA0H;IAC1H,yBAOC;IAED,wBAEC;IAED,gCAAgC;IAChC,uCAGC;IAED;;;SAGK;IACL,oCAGC;;CACF;+BA3N8B,mBAAmB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.259.0",
+  "version": "1.260.0",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",

package/src/common/session/session-entity.js

@@ -64,8 +64,10 @@ export class SessionEntity {
   }
 
   setup ({ value = generateRandomHexString(16), expiresMs = DEFAULT_EXPIRES_MS, inactiveMs = DEFAULT_INACTIVE_MS }) {
+    /** Ensure that certain properties are preserved across a reset if already set */
+    const persistentAttributes = { serverTimeDiff: this.state.serverTimeDiff || model.serverTimeDiff }
     this.state = {}
-    this.sync(model)
+    this.sync({ ...model, ...persistentAttributes })
 
     // value is intended to act as the primary value of the k=v pair
     this.state.value = value

package/src/common/timing/time-keeper.js

@@ -1,7 +1,5 @@
 import { originTime } from '../constants/runtime'
-import { ee as baseEE } from '../event-emitter/contextual-ee'
 import { getRuntime } from '../config/config'
-import { SESSION_EVENT_TYPES, SESSION_EVENTS } from '../session/constants'
 
 /**
  * Class used to adjust the timestamp of harvested data to New Relic server time. This
@@ -37,17 +35,7 @@ export class TimeKeeper {
 
   constructor (agentIdentifier) {
     this.#session = getRuntime(agentIdentifier)?.session
-
-    if (this.#session) {
-      const ee = baseEE.get(agentIdentifier)
-      ee.on(SESSION_EVENTS.UPDATE, this.#processSessionUpdate.bind(this))
-      ee.on(SESSION_EVENTS.STARTED, () => {
-        if (this.#ready) {
-          this.#session.write({ serverTimeDiff: this.#localTimeDiff })
-        }
-      })
-      this.#processSessionUpdate(null, this.#session.read())
-    }
+    this.processStoredDiff()
   }
 
   get ready () {
@@ -65,8 +53,8 @@ export class TimeKeeper {
    * @param endTime {number} The end time of the RUM request
    */
   processRumRequest (rumRequest, startTime, endTime) {
+    this.processStoredDiff()
     if (this.#ready) return // Server time calculated from session entity
-
     const responseDateHeader = rumRequest.getResponseHeader('Date')
     if (!responseDateHeader) {
       throw new Error('Missing date header on rum response.')
@@ -79,11 +67,11 @@ export class TimeKeeper {
     this.#correctedOriginTime = Math.floor(Date.parse(responseDateHeader) - serverOffset)
     this.#localTimeDiff = originTime - this.#correctedOriginTime
 
-    if (Number.isNaN(this.#correctedOriginTime)) {
+    if (isNaN(this.#correctedOriginTime)) {
       throw new Error('Date header invalid format.')
     }
 
-    if (this.#session) this.#session.write({ serverTimeDiff: this.#localTimeDiff })
+    this.#session?.write({ serverTimeDiff: this.#localTimeDiff })
     this.#ready = true
   }
 
@@ -106,20 +94,11 @@ export class TimeKeeper {
     return Math.floor(timestamp - this.#localTimeDiff)
   }
 
-  /**
-   * Processes a session entity update payload to extract the server time calculated.
-   * @param {import('../session/constants').SESSION_EVENT_TYPES | null} type
-   * @param {Object} data
-   */
-  #processSessionUpdate (type, data) {
-    if (typeof data?.serverTimeDiff !== 'number') return
-
-    if (
-      (!type && !this.#ready) || // This captures the initial read from the session entity when the timekeeper first initializes
-      type === SESSION_EVENT_TYPES.CROSS_TAB // This captures any cross-tab write of the session entity
-    ) {
-      // This captures the initial read from the session entity when the timekeeper first initializes
-      this.#localTimeDiff = data.serverTimeDiff
+  /** Process the session entity and use the info to set the main time calculations if present */
+  processStoredDiff () {
+    const storedServerTimeDiff = this.#session?.read()?.serverTimeDiff
+    if (typeof storedServerTimeDiff === 'number' && !isNaN(storedServerTimeDiff)) {
+      this.#localTimeDiff = storedServerTimeDiff
       this.#correctedOriginTime = originTime - this.#localTimeDiff
       this.#ready = true
     }

package/src/features/jserrors/aggregate/index.js

@@ -201,8 +201,7 @@ export class Aggregate extends AggregateBase {
     var type = internal ? 'ierr' : 'err'
     var newMetrics = { time }
 
-    // sr, stn and spa aggregators listen to this event - stn sends the error in its payload,
-    // and spa annotates the error with interaction info
+    // 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]
     handle('trace-jserror', jsErrorEvent, undefined, FEATURE_NAMES.sessionTrace, this.ee)
     // still send EE events for other features such as above, but stop this one from aggregating internal data

package/src/features/jserrors/instrument/index.js

@@ -6,7 +6,6 @@
 import { handle } from '../../../common/event-emitter/handle'
 import { InstrumentBase } from '../../utils/instrument-base'
 import { FEATURE_NAME } from '../constants'
-import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { globalScope } from '../../../common/constants/runtime'
 import { eventListenerOpts } from '../../../common/event-listener/event-listener-opts'
 import { now } from '../../../common/timing/now'
@@ -28,7 +27,7 @@ export class Instrument extends InstrumentBase {
 
     this.ee.on('internal-error', (error) => {
       if (!this.abortHandler) return
-      handle('ierr', [castError(error), now(), true, {}, this.#replayRunning], undefined, FEATURE_NAMES.jserrors, this.ee)
+      handle('ierr', [castError(error), now(), true, {}, this.#replayRunning], undefined, this.featureName, this.ee)
     })
 
     this.ee.on(SR_EVENT_EMITTER_TYPES.REPLAY_RUNNING, (isRunning) => {
@@ -37,12 +36,12 @@ export class Instrument extends InstrumentBase {
 
     globalScope.addEventListener('unhandledrejection', (promiseRejectionEvent) => {
       if (!this.abortHandler) return
-      handle('err', [castPromiseRejectionEvent(promiseRejectionEvent), now(), false, { unhandledPromiseRejection: 1 }, this.#replayRunning], undefined, FEATURE_NAMES.jserrors, this.ee)
+      handle('err', [castPromiseRejectionEvent(promiseRejectionEvent), now(), false, { unhandledPromiseRejection: 1 }, this.#replayRunning], undefined, this.featureName, this.ee)
     }, eventListenerOpts(false, this.removeOnAbort?.signal))
 
     globalScope.addEventListener('error', (errorEvent) => {
       if (!this.abortHandler) return
-      handle('err', [castErrorEvent(errorEvent), now(), false, {}, this.#replayRunning], undefined, FEATURE_NAMES.jserrors, this.ee)
+      handle('err', [castErrorEvent(errorEvent), now(), false, {}, this.#replayRunning], undefined, this.featureName, this.ee)
     }, 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

package/src/features/page_view_event/aggregate/index.js

@@ -26,6 +26,7 @@ export class Aggregate extends AggregateBase {
     this.timeToFirstByte = 0
     this.firstByteToWindowLoad = 0 // our "frontend" duration
     this.firstByteToDomContent = 0 // our "dom processing" duration
+    this.timeKeeper = new TimeKeeper(this.agentIdentifier)
 
     if (isBrowserScope) {
       timeToFirstByte.subscribe(({ value, attrs }) => {
@@ -102,6 +103,10 @@ export class Aggregate extends AggregateBase {
     queryParameters.fp = firstPaint.current.value
     queryParameters.fcp = firstContentfulPaint.current.value
 
+    if (this.timeKeeper?.ready) {
+      queryParameters.timestamp = this.timeKeeper.convertRelativeTimestamp(now())
+    }
+
     const rumStartTime = now()
     harvester.send({
       endpoint: 'rum',
@@ -117,11 +122,10 @@ export class Aggregate extends AggregateBase {
         }
 
         try {
-          const timeKeeper = new TimeKeeper(this.agentIdentifier)
-          timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime)
-          if (!timeKeeper.ready) throw new Error('TimeKeeper not ready')
+          this.timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime)
+          if (!this.timeKeeper.ready) throw new Error('TimeKeeper not ready')
 
-          agentRuntime.timeKeeper = timeKeeper
+          agentRuntime.timeKeeper = this.timeKeeper
         } catch (error) {
           handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/Failed'], undefined, FEATURE_NAMES.metrics, this.ee)
           drain(this.agentIdentifier, FEATURE_NAMES.metrics, true)

package/src/features/session_replay/shared/recorder.js

@@ -86,7 +86,14 @@ export class Recorder {
       inlineStylesheet: inline_stylesheet,
       inlineImages: inline_images,
       collectFonts: collect_fonts,
-      checkoutEveryNms: CHECKOUT_MS[this.parent.mode]
+      checkoutEveryNms: CHECKOUT_MS[this.parent.mode],
+      /** Emits errors thrown by rrweb directly before bubbling them up to the window */
+      errorHandler: (err) => {
+        /** capture rrweb errors as "internal" errors only */
+        this.parent.ee.emit('internal-error', [err])
+        /** returning true informs rrweb to swallow the error instead of throwing it to the window */
+        return true
+      }
     })
 
     this.stopRecording = () => {