@newrelic/browser-agent 1.254.1 → 1.255.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.255.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.254.1...v1.255.0) (2024-04-04)
+
+
+### Features
+
+* Adjust SR Timestamps to NR Server Time ([#939](https://github.com/newrelic/newrelic-browser-agent/issues/939)) ([94f0dee](https://github.com/newrelic/newrelic-browser-agent/commit/94f0deed02a8f5e9d668f3fe5a68ada86cecc439))
+* Send CLS as timing node additionally ([#935](https://github.com/newrelic/newrelic-browser-agent/issues/935)) ([88e71da](https://github.com/newrelic/newrelic-browser-agent/commit/88e71da521f1a58af28ae17fee13f648affd262a))
+* Switch web vitals library to attribution build ([#919](https://github.com/newrelic/newrelic-browser-agent/issues/919)) ([f36acbc](https://github.com/newrelic/newrelic-browser-agent/commit/f36acbc03c4f4d51e65431a270a008e65bb2cfff))
+* Update agent to use new relic server time ([#918](https://github.com/newrelic/newrelic-browser-agent/issues/918)) ([8a4831c](https://github.com/newrelic/newrelic-browser-agent/commit/8a4831cd1f2d32d97daa8788967b15d7f2f723d3))
+
 ## [1.254.1](https://github.com/newrelic/newrelic-browser-agent/compare/v1.254.0...v1.254.1) (2024-03-26)
 
 

package/dist/cjs/common/config/state/runtime.js

@@ -30,7 +30,8 @@ const model = {
   xhrWrappable: typeof _runtime.globalScope.XMLHttpRequest?.prototype?.addEventListener === 'function',
   version: _env.VERSION,
   denyList: undefined,
-  harvestCount: 0
+  harvestCount: 0,
+  timeKeeper: undefined
 };
 const _cache = {};
 function getRuntime(id) {

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.254.1";
+const VERSION = exports.VERSION = "1.255.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.254.1";
+const VERSION = exports.VERSION = "1.255.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/context/shared-context.js

@@ -20,7 +20,7 @@ class SharedContext {
         if (Object.keys(model).includes(key)) this.sharedContext[key] = value;
       });
     } catch (err) {
-      (0, _console.warn)('An error occured while setting SharedContext', err);
+      (0, _console.warn)('An error occurred while setting SharedContext', err);
     }
   }
 }

package/dist/cjs/common/harvest/harvest.js

@@ -10,7 +10,6 @@ var submitData = _interopRequireWildcard(require("../util/submit-data"));
 var _location = require("../url/location");
 var _config = require("../config/config");
 var _cleanUrl = require("../url/clean-url");
-var _now = require("../timing/now");
 var _eventListenerOpts = require("../event-listener/event-listener-opts");
 var _obfuscate = require("../util/obfuscate");
 var _traverse = require("../util/traverse");
@@ -18,6 +17,7 @@ var _sharedContext = require("../context/shared-context");
 var _env = require("../constants/env.npm");
 var _runtime = require("../constants/runtime");
 var _console = require("../util/console");
+var _now = require("../timing/now");
 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; }
 /*

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

@@ -4,15 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TimeKeeper = void 0;
-var _nreum = require("../window/nreum");
-var _config = require("../config/config");
+var _runtime = require("../constants/runtime");
 /**
  * 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
  * to the harvested data event offset time.
  */
 class TimeKeeper {
-  #agent;
+  /**
+   * Represents the browser origin time.
+   * @type {number}
+   */
+  #originTime;
 
   /**
    * Represents the browser origin time corrected to NR server time.
@@ -26,14 +29,23 @@ class TimeKeeper {
    * @type {number}
    */
   #localTimeDiff;
-  constructor(agent) {
-    this.#agent = agent;
+
+  /**
+   * Represents whether the timekeeper is in a state that it can accurately convert
+   * timestamps.
+   * @type {number}
+   */
+  #ready = false;
+  constructor() {
+    this.#originTime = _runtime.globalScope.performance.timeOrigin || _runtime.globalScope.performance.timing.navigationStart;
+  }
+  get ready() {
+    return this.#ready;
   }
-  static getTimeKeeperByAgentIdentifier(agentIdentifier) {
-    const nr = (0, _nreum.gosNREUM)();
-    return Object.keys(nr?.initializedAgents || {}).indexOf(agentIdentifier) > -1 ? nr.initializedAgents[agentIdentifier].timeKeeper : undefined;
+  get originTime() {
+    return this.#originTime;
   }
-  get correctedPageOriginTime() {
+  get correctedOriginTime() {
     return this.#correctedOriginTime;
   }
 
@@ -53,17 +65,18 @@ class TimeKeeper {
 
     // Corrected page origin time
     this.#correctedOriginTime = Math.floor(Date.parse(responseDateHeader) - serverOffset);
-    this.#localTimeDiff = (0, _config.getRuntime)(this.#agent.agentIdentifier).offset - this.#correctedOriginTime;
+    this.#localTimeDiff = this.#originTime - this.#correctedOriginTime;
     if (Number.isNaN(this.#correctedOriginTime)) {
       throw new Error('Date header invalid format.');
     }
+    this.#ready = true;
   }
 
   /**
    * Converts a page origin relative time to an absolute timestamp
    * corrected to NR server time.
    * @param relativeTime {number} The relative time of the event in milliseconds
-   * @returns {number} The correct timestamp as a unix/epoch timestamp value
+   * @returns {number} Corrected unix/epoch timestamp
    */
   convertRelativeTimestamp(relativeTime) {
     return this.#correctedOriginTime + relativeTime;
@@ -77,13 +90,5 @@ class TimeKeeper {
   correctAbsoluteTimestamp(timestamp) {
     return Math.floor(timestamp - this.#localTimeDiff);
   }
-
-  /**
-   * Returns the current time offset from page origin.
-   * @return {number}
-   */
-  now() {
-    return Math.floor(performance.now());
-  }
 }
 exports.TimeKeeper = TimeKeeper;

package/dist/cjs/common/vitals/cumulative-layout-shift.js

@@ -4,21 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cumulativeLayoutShift = void 0;
-var _webVitals = require("web-vitals");
+var _attribution = require("web-vitals/attribution");
 var _constants = require("./constants");
 var _vitalMetric = require("./vital-metric");
 var _runtime = require("../constants/runtime");
 const cumulativeLayoutShift = exports.cumulativeLayoutShift = new _vitalMetric.VitalMetric(_constants.VITAL_NAMES.CUMULATIVE_LAYOUT_SHIFT, x => x);
 if (_runtime.isBrowserScope) {
-  (0, _webVitals.onCLS)(_ref => {
+  (0, _attribution.onCLS)(_ref => {
     let {
       value,
-      entries
+      attribution,
+      id
     } = _ref;
-    if (cumulativeLayoutShift.roundingMethod(value) === cumulativeLayoutShift.current.value) return;
+    const attrs = {
+      metricId: id,
+      largestShiftTarget: attribution.largestShiftTarget,
+      largestShiftTime: attribution.largestShiftTime,
+      largestShiftValue: attribution.largestShiftValue,
+      loadState: attribution.loadState
+    };
     cumulativeLayoutShift.update({
       value,
-      entries
+      attrs
     });
   }, {
     reportAllChanges: true

package/dist/cjs/common/vitals/first-contentful-paint.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.firstContentfulPaint = void 0;
-var _webVitals = require("web-vitals");
+var _attribution = require("web-vitals/attribution");
 var _runtime = require("../constants/runtime");
 var _constants = require("./constants");
 var _vitalMetric = require("./vital-metric");
@@ -23,8 +23,7 @@ if (_runtime.isBrowserScope) {
         paintEntries.forEach(entry => {
           if (entry.name === 'first-contentful-paint') {
             firstContentfulPaint.update({
-              value: Math.floor(entry.startTime),
-              entries: paintEntries
+              value: Math.floor(entry.startTime)
             });
           }
         });
@@ -33,15 +32,20 @@ if (_runtime.isBrowserScope) {
       // ignore
     }
   } else {
-    (0, _webVitals.onFCP)(_ref => {
+    (0, _attribution.onFCP)(_ref => {
       let {
         value,
-        entries
+        attribution
       } = _ref;
       if (_runtime.initiallyHidden || firstContentfulPaint.isValid) return;
+      const attrs = {
+        timeToFirstByte: attribution.timeToFirstByte,
+        firstByteToFCP: attribution.firstByteToFCP,
+        loadState: attribution.loadState
+      };
       firstContentfulPaint.update({
         value,
-        entries
+        attrs
       });
     });
   }

package/dist/cjs/common/vitals/first-input-delay.js

@@ -4,27 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.firstInputDelay = void 0;
-var _webVitals = require("web-vitals");
+var _attribution = require("web-vitals/attribution");
 var _vitalMetric = require("./vital-metric");
 var _constants = require("./constants");
 var _runtime = require("../constants/runtime");
 const firstInputDelay = exports.firstInputDelay = new _vitalMetric.VitalMetric(_constants.VITAL_NAMES.FIRST_INPUT_DELAY);
 if (_runtime.isBrowserScope) {
-  (0, _webVitals.onFID)(_ref => {
+  (0, _attribution.onFID)(_ref => {
     let {
       value,
-      entries
+      attribution
     } = _ref;
-    if (_runtime.initiallyHidden || firstInputDelay.isValid || entries.length === 0) return;
+    if (_runtime.initiallyHidden || firstInputDelay.isValid) return;
+    const attrs = {
+      type: attribution.eventType,
+      fid: Math.round(value),
+      eventTarget: attribution.eventTarget,
+      loadState: attribution.loadState
+    };
 
     // CWV will only report one (THE) first-input entry to us; fid isn't reported if there are no user interactions occurs before the *first* page hiding.
     firstInputDelay.update({
-      value: entries[0].startTime,
-      entries,
-      attrs: {
-        type: entries[0].name,
-        fid: Math.round(value)
-      }
+      value: attribution.eventTime,
+      attrs
     });
   });
 }

package/dist/cjs/common/vitals/first-paint.js

@@ -16,8 +16,7 @@ if (_runtime.isBrowserScope) {
 
         /* Initial hidden state and pre-rendering not yet considered for first paint. See web-vitals onFCP for example. */
         firstPaint.update({
-          value: entry.startTime,
-          entries
+          value: entry.startTime
         });
       }
     });

package/dist/cjs/common/vitals/interaction-to-next-paint.js

@@ -4,25 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.interactionToNextPaint = void 0;
-var _webVitals = require("web-vitals");
+var _attribution = require("web-vitals/attribution");
 var _vitalMetric = require("./vital-metric");
 var _constants = require("./constants");
 var _runtime = require("../constants/runtime");
 const interactionToNextPaint = exports.interactionToNextPaint = new _vitalMetric.VitalMetric(_constants.VITAL_NAMES.INTERACTION_TO_NEXT_PAINT);
 if (_runtime.isBrowserScope) {
   /* Interaction-to-Next-Paint */
-  (0, _webVitals.onINP)(_ref => {
+  (0, _attribution.onINP)(_ref => {
     let {
       value,
-      entries,
+      attribution,
       id
     } = _ref;
+    const attrs = {
+      metricId: id,
+      eventTarget: attribution.eventTarget,
+      eventType: attribution.eventType,
+      eventTime: attribution.eventTime,
+      loadState: attribution.loadState
+    };
     interactionToNextPaint.update({
       value,
-      entries,
-      attrs: {
-        metricId: id
-      }
+      attrs
     });
   });
 }

package/dist/cjs/common/vitals/largest-contentful-paint.js

@@ -4,36 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.largestContentfulPaint = void 0;
-var _webVitals = require("web-vitals");
+var _attribution = require("web-vitals/attribution");
 var _vitalMetric = require("./vital-metric");
 var _constants = require("./constants");
 var _runtime = require("../constants/runtime");
 var _cleanUrl = require("../url/clean-url");
 const largestContentfulPaint = exports.largestContentfulPaint = new _vitalMetric.VitalMetric(_constants.VITAL_NAMES.LARGEST_CONTENTFUL_PAINT);
 if (_runtime.isBrowserScope) {
-  (0, _webVitals.onLCP)(_ref => {
+  (0, _attribution.onLCP)(_ref => {
     let {
       value,
-      entries
+      attribution
     } = _ref;
     /* Largest Contentful Paint - As of WV v3, it still imperfectly tries to detect document vis state asap and isn't supposed to report if page starts hidden. */
     if (_runtime.initiallyHidden || largestContentfulPaint.isValid) return;
-    const lcpEntry = entries[entries.length - 1]; // this looks weird if we only expect one, but this is how cwv-attribution gets it so to be sure...
+    let attrs;
+    const lcpEntry = attribution.lcpEntry;
+    if (lcpEntry) {
+      attrs = {
+        size: lcpEntry.size,
+        eid: lcpEntry.id,
+        element: attribution.element,
+        timeToFirstByte: attribution.timeToFirstByte,
+        resourceLoadDelay: attribution.resourceLoadDelay,
+        resourceLoadTime: attribution.resourceLoadTime,
+        elementRenderDelay: attribution.elementRenderDelay
+      };
+      if (attribution.url) attrs.elUrl = (0, _cleanUrl.cleanURL)(attribution.url);
+      if (lcpEntry.element?.tagName) attrs.elTag = lcpEntry.element.tagName;
+    }
     largestContentfulPaint.update({
       value,
-      entries,
-      ...(entries.length > 0 && {
-        attrs: {
-          size: lcpEntry.size,
-          eid: lcpEntry.id,
-          ...(!!lcpEntry.url && {
-            elUrl: (0, _cleanUrl.cleanURL)(lcpEntry.url)
-          }),
-          ...(!!lcpEntry.element?.tagName && {
-            elTag: lcpEntry.element.tagName
-          })
-        }
-      })
+      attrs
     });
   });
 }

package/dist/cjs/common/vitals/long-task.js

@@ -14,7 +14,6 @@ if (_runtime.isBrowserScope) {
     entries.forEach(entry => {
       longTask.update({
         value: entry.duration,
-        entries: [entry],
         attrs: {
           ltFrame: entry.name,
           // MDN: the browsing context or frame that can be attributed to the long task

package/dist/cjs/common/vitals/time-to-first-byte.js

@@ -7,17 +7,20 @@ exports.timeToFirstByte = void 0;
 var _runtime = require("../constants/runtime");
 var _constants = require("./constants");
 var _vitalMetric = require("./vital-metric");
-var _webVitals = require("web-vitals");
+var _attribution = require("web-vitals/attribution");
 const timeToFirstByte = exports.timeToFirstByte = new _vitalMetric.VitalMetric(_constants.VITAL_NAMES.TIME_TO_FIRST_BYTE);
 if (_runtime.isBrowserScope && typeof PerformanceNavigationTiming !== 'undefined' && !_runtime.isiOS) {
-  (0, _webVitals.onTTFB)(_ref => {
+  (0, _attribution.onTTFB)(_ref => {
     let {
       value,
-      entries
+      attribution
     } = _ref;
-    if (!timeToFirstByte.isValid) timeToFirstByte.update({
+    if (timeToFirstByte.isValid) return;
+    timeToFirstByte.update({
       value,
-      entries
+      attrs: {
+        navigationEntry: attribution.navigationEntry
+      }
     });
   });
 } else {
@@ -29,7 +32,9 @@ if (_runtime.isBrowserScope && typeof PerformanceNavigationTiming !== 'undefined
     // ttfb is equiv to document's responseStart property in timing API --> https://developer.mozilla.org/en-US/docs/Web/API/PerformanceTiming/responseStart
     timeToFirstByte.update({
       value: entry.responseStart,
-      entries: [entry]
+      attrs: {
+        navigationEntry: entry
+      }
     });
   }
 }

package/dist/cjs/common/vitals/vital-metric.js

@@ -15,20 +15,18 @@ class VitalMetric {
   update(_ref) {
     let {
       value,
-      entries = [],
       attrs = {}
     } = _ref;
     if (value < 0) return;
     const state = {
       value: this.roundingMethod(value),
       name: this.name,
-      entries,
       attrs
     };
     this.history.push(state);
     this.#subscribers.forEach(cb => {
       try {
-        cb(this.current);
+        cb(state);
       } catch (e) {
         // ignore errors
       }
@@ -38,7 +36,6 @@ class VitalMetric {
     return this.history[this.history.length - 1] || {
       value: undefined,
       name: this.name,
-      entries: [],
       attrs: {}
     };
   }

package/dist/cjs/common/window/nreum.js

@@ -14,8 +14,8 @@ exports.gosNREUMInit = gosNREUMInit;
 exports.gosNREUMLoaderConfig = gosNREUMLoaderConfig;
 exports.gosNREUMOriginals = gosNREUMOriginals;
 exports.setNREUMInitializedAgent = setNREUMInitializedAgent;
-var _now = require("../timing/now");
 var _runtime = require("../constants/runtime");
+var _now = require("../timing/now");
 const defaults = exports.defaults = {
   beacon: 'bam.nr-data.net',
   errorBeacon: 'bam.nr-data.net'

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

@@ -36,7 +36,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
       scheduler.startTimer(harvestTimeSeconds);
       this.drain();
     });
-    const denyList = (0, _config.getRuntime)(agentIdentifier).denyList;
+    const agentRuntime = (0, _config.getRuntime)(agentIdentifier);
+    const denyList = agentRuntime.denyList;
     (0, _denyList.setDenyList)(denyList);
     let ajaxEvents = [];
     let spaAjaxEvents = {};
@@ -122,7 +123,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       if (xhrContext.dt) {
         event.spanId = xhrContext.dt.spanId;
         event.traceId = xhrContext.dt.traceId;
-        event.spanTimestamp = xhrContext.dt.timestamp;
+        event.spanTimestamp = agentRuntime.timeKeeper.correctAbsoluteTimestamp(xhrContext.dt.timestamp);
       }
 
       // parsed from the AJAX body, looking for operationName param & parsing query for operationType

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

@@ -10,7 +10,6 @@ var _id = require("../../../common/ids/id");
 var _runtime = require("../../../common/constants/runtime");
 var _dataSize = require("../../../common/util/data-size");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
-var _now = require("../../../common/timing/now");
 var _wrap = require("../../../common/wrap");
 var _parseUrl = require("../../../common/url/parse-url");
 var _distributedTracing = require("./distributed-tracing");
@@ -19,6 +18,7 @@ var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
 var _constants2 = require("../../metrics/constants");
+var _now = require("../../../common/timing/now");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.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
@@ -172,7 +172,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);
     }
@@ -189,6 +189,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     if (agentRuntime?.session?.state?.sessionReplayMode) params.hasReplay = true;
     params.firstOccurrenceTimestamp = this.observedAt[bucketHash];
+    params.timestamp = this.observedAt[bucketHash];
     var type = internal ? 'ierr' : 'err';
     var newMetrics = {
       time

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,7 @@ 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");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0

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);