@newrelic/browser-agent 1.254.0 → 1.254.1

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.254.1](https://github.com/newrelic/newrelic-browser-agent/compare/v1.254.0...v1.254.1) (2024-03-26)
+
+
+### Bug Fixes
+
+* Server Timing - Remove reliance on performance API ([#930](https://github.com/newrelic/newrelic-browser-agent/issues/930)) ([250efcd](https://github.com/newrelic/newrelic-browser-agent/commit/250efcd3bf0a730adbb9d5c45be0bf2f71189664))
+
 ## [1.254.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.253.0...v1.254.0) (2024-03-25)
 
 

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

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TimeKeeper = void 0;
 var _nreum = require("../window/nreum");
-var _runtime = require("../constants/runtime");
 var _config = require("../config/config");
 /**
  * Class used to adjust the timestamp of harvested data to New Relic server time. This
@@ -41,28 +40,16 @@ class TimeKeeper {
   /**
    * Process a rum request to calculate NR server time.
    * @param rumRequest {XMLHttpRequest} The xhr for the rum request
-   * @param rumRequestUrl {string} The full url of the rum request
+   * @param startTime {number} The start time of the RUM request
+   * @param endTime {number} The end time of the RUM request
    */
-  processRumRequest(rumRequest, rumRequestUrl) {
+  processRumRequest(rumRequest, startTime, endTime) {
     const responseDateHeader = rumRequest.getResponseHeader('Date');
     if (!responseDateHeader) {
       throw new Error('Missing date header on rum response.');
     }
-    const resourceEntries = _runtime.globalScope.performance.getEntriesByName(rumRequestUrl, 'resource');
-    if (!Array.isArray(resourceEntries) || resourceEntries.length === 0) {
-      throw new Error('Missing rum request performance entry.');
-    }
-    let medianRumOffset = 0;
-    let serverOffset = 0;
-    if (typeof resourceEntries[0].responseStart === 'number' && resourceEntries[0].responseStart !== 0) {
-      // Cors is enabled and we can make a more accurate calculation of NR server time
-      medianRumOffset = (resourceEntries[0].responseStart - resourceEntries[0].requestStart) / 2;
-      serverOffset = Math.floor(resourceEntries[0].requestStart + medianRumOffset);
-    } else {
-      // Cors is disabled or erred, we need to use a less accurate calculation
-      medianRumOffset = (resourceEntries[0].responseEnd - resourceEntries[0].fetchStart) / 2;
-      serverOffset = Math.floor(resourceEntries[0].fetchStart + medianRumOffset);
-    }
+    const medianRumOffset = (endTime - startTime) / 2;
+    const serverOffset = Math.floor(startTime + medianRumOffset);
 
     // Corrected page origin time
     this.#correctedOriginTime = Math.floor(Date.parse(responseDateHeader) - serverOffset);
@@ -90,5 +77,13 @@ 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/features/page_view_event/aggregate/index.js

@@ -116,6 +116,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     queryParameters.fp = _firstPaint.firstPaint.current.value;
     queryParameters.fcp = _firstContentfulPaint.firstContentfulPaint.current.value;
+    const rumStartTime = this.timeKeeper.now();
     harvester.send({
       endpoint: 'rum',
       payload: {
@@ -130,16 +131,16 @@ class Aggregate extends _aggregateBase.AggregateBase {
         let {
           status,
           responseText,
-          xhr,
-          fullUrl
+          xhr
         } = _ref3;
+        const rumEndTime = this.timeKeeper.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, fullUrl);
+          this.timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime);
         } 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/esm/common/constants/env.cdn.js

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.254.0";
+export const VERSION = "1.254.1";
 
 /**
  * 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.254.0";
+export const VERSION = "1.254.1";
 
 /**
  * Exposes the build type of the agent

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

@@ -1,5 +1,4 @@
 import { gosNREUM } from '../window/nreum';
-import { globalScope } from '../constants/runtime';
 import { getRuntime } from '../config/config';
 
 /**
@@ -36,28 +35,16 @@ export class TimeKeeper {
   /**
    * Process a rum request to calculate NR server time.
    * @param rumRequest {XMLHttpRequest} The xhr for the rum request
-   * @param rumRequestUrl {string} The full url of the rum request
+   * @param startTime {number} The start time of the RUM request
+   * @param endTime {number} The end time of the RUM request
    */
-  processRumRequest(rumRequest, rumRequestUrl) {
+  processRumRequest(rumRequest, startTime, endTime) {
     const responseDateHeader = rumRequest.getResponseHeader('Date');
     if (!responseDateHeader) {
       throw new Error('Missing date header on rum response.');
     }
-    const resourceEntries = globalScope.performance.getEntriesByName(rumRequestUrl, 'resource');
-    if (!Array.isArray(resourceEntries) || resourceEntries.length === 0) {
-      throw new Error('Missing rum request performance entry.');
-    }
-    let medianRumOffset = 0;
-    let serverOffset = 0;
-    if (typeof resourceEntries[0].responseStart === 'number' && resourceEntries[0].responseStart !== 0) {
-      // Cors is enabled and we can make a more accurate calculation of NR server time
-      medianRumOffset = (resourceEntries[0].responseStart - resourceEntries[0].requestStart) / 2;
-      serverOffset = Math.floor(resourceEntries[0].requestStart + medianRumOffset);
-    } else {
-      // Cors is disabled or erred, we need to use a less accurate calculation
-      medianRumOffset = (resourceEntries[0].responseEnd - resourceEntries[0].fetchStart) / 2;
-      serverOffset = Math.floor(resourceEntries[0].fetchStart + medianRumOffset);
-    }
+    const medianRumOffset = (endTime - startTime) / 2;
+    const serverOffset = Math.floor(startTime + medianRumOffset);
 
     // Corrected page origin time
     this.#correctedOriginTime = Math.floor(Date.parse(responseDateHeader) - serverOffset);
@@ -85,4 +72,12 @@ export 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());
+  }
 }

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

@@ -108,6 +108,7 @@ export class Aggregate extends AggregateBase {
     }
     queryParameters.fp = firstPaint.current.value;
     queryParameters.fcp = firstContentfulPaint.current.value;
+    const rumStartTime = this.timeKeeper.now();
     harvester.send({
       endpoint: 'rum',
       payload: {
@@ -122,16 +123,16 @@ export class Aggregate extends AggregateBase {
         let {
           status,
           responseText,
-          xhr,
-          fullUrl
+          xhr
         } = _ref3;
+        const rumEndTime = this.timeKeeper.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, fullUrl);
+          this.timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime);
         } 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/types/common/timing/time-keeper.d.ts

@@ -10,9 +10,10 @@ export class TimeKeeper {
     /**
      * Process a rum request to calculate NR server time.
      * @param rumRequest {XMLHttpRequest} The xhr for the rum request
-     * @param rumRequestUrl {string} The full url of the rum request
+     * @param startTime {number} The start time of the RUM request
+     * @param endTime {number} The end time of the RUM request
      */
-    processRumRequest(rumRequest: XMLHttpRequest, rumRequestUrl: string): void;
+    processRumRequest(rumRequest: XMLHttpRequest, startTime: number, endTime: number): void;
     /**
      * Converts a page origin relative time to an absolute timestamp
      * corrected to NR server time.
@@ -26,6 +27,11 @@ export class TimeKeeper {
      * @return {number} Corrected unix/epoch timestamp
      */
     correctAbsoluteTimestamp(timestamp: number): number;
+    /**
+     * Returns the current time offset from page origin.
+     * @return {number}
+     */
+    now(): number;
     #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":"AAIA;;;;GAIG;AACH;IAoBE,iEAKC;IATD,wBAEC;IASD,sCAEC;IAED;;;;OAIG;IACH,8BAHsB,cAAc,iBACX,MAAM,QAgC9B;IAED;;;;;OAKG;IACH,uCAHwB,MAAM,GACjB,MAAM,CAIlB;IAED;;;;OAIG;IACH,oCAHqB,MAAM,GACf,MAAM,CAIjB;;CACF"}
+{"version":3,"file":"time-keeper.d.ts","sourceRoot":"","sources":["../../../../src/common/timing/time-keeper.js"],"names":[],"mappings":"AAGA;;;;GAIG;AACH;IAoBE,iEAKC;IATD,wBAEC;IASD,sCAEC;IAED;;;;;OAKG;IACH,8BAJsB,cAAc,aACf,MAAM,WACR,MAAM,QAkBxB;IAED;;;;;OAKG;IACH,uCAHwB,MAAM,GACjB,MAAM,CAIlB;IAED;;;;OAIG;IACH,oCAHqB,MAAM,GACf,MAAM,CAIjB;IAED;;;OAGG;IACH,OAFY,MAAM,CAIjB;;CACF"}

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":"AAkBA;IACE,2BAA2C;IAC3C,mDAoBC;IAjBC,wBAAwB;IACxB,8BAA8B;IAC9B,8BAA8B;IAiBhC,gBA4FC;CACF;8BA9H6B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/page_view_event/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAA2C;IAC3C,mDAoBC;IAjBC,wBAAwB;IACxB,8BAA8B;IAC9B,8BAA8B;IAiBhC,gBA+FC;CACF;8BAjI6B,4BAA4B"}

package/package.json

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

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

@@ -1,5 +1,4 @@
 import { gosNREUM } from '../window/nreum'
-import { globalScope } from '../constants/runtime'
 import { getRuntime } from '../config/config'
 
 /**
@@ -41,30 +40,17 @@ export class TimeKeeper {
   /**
    * Process a rum request to calculate NR server time.
    * @param rumRequest {XMLHttpRequest} The xhr for the rum request
-   * @param rumRequestUrl {string} The full url of the rum request
+   * @param startTime {number} The start time of the RUM request
+   * @param endTime {number} The end time of the RUM request
    */
-  processRumRequest (rumRequest, rumRequestUrl) {
+  processRumRequest (rumRequest, startTime, endTime) {
     const responseDateHeader = rumRequest.getResponseHeader('Date')
     if (!responseDateHeader) {
       throw new Error('Missing date header on rum response.')
     }
 
-    const resourceEntries = globalScope.performance.getEntriesByName(rumRequestUrl, 'resource')
-    if (!Array.isArray((resourceEntries)) || resourceEntries.length === 0) {
-      throw new Error('Missing rum request performance entry.')
-    }
-
-    let medianRumOffset = 0
-    let serverOffset = 0
-    if (typeof resourceEntries[0].responseStart === 'number' && resourceEntries[0].responseStart !== 0) {
-      // Cors is enabled and we can make a more accurate calculation of NR server time
-      medianRumOffset = (resourceEntries[0].responseStart - resourceEntries[0].requestStart) / 2
-      serverOffset = Math.floor(resourceEntries[0].requestStart + medianRumOffset)
-    } else {
-      // Cors is disabled or erred, we need to use a less accurate calculation
-      medianRumOffset = (resourceEntries[0].responseEnd - resourceEntries[0].fetchStart) / 2
-      serverOffset = Math.floor(resourceEntries[0].fetchStart + medianRumOffset)
-    }
+    const medianRumOffset = (endTime - startTime) / 2
+    const serverOffset = Math.floor(startTime + medianRumOffset)
 
     // Corrected page origin time
     this.#correctedOriginTime = Math.floor(Date.parse(responseDateHeader) - serverOffset)
@@ -93,4 +79,12 @@ export 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())
+  }
 }

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

@@ -100,11 +100,14 @@ export class Aggregate extends AggregateBase {
     queryParameters.fp = firstPaint.current.value
     queryParameters.fcp = firstContentfulPaint.current.value
 
+    const rumStartTime = this.timeKeeper.now()
     harvester.send({
       endpoint: 'rum',
       payload: { qs: queryParameters, body },
       opts: { needResponse: true, sendEmptyBody: true },
-      cbFinished: ({ status, responseText, xhr, fullUrl }) => {
+      cbFinished: ({ status, responseText, xhr }) => {
+        const rumEndTime = this.timeKeeper.now()
+
         if (status >= 400 || status === 0) {
           // Adding retry logic for the rum call will be a separate change
           this.ee.abort()
@@ -112,7 +115,7 @@ export class Aggregate extends AggregateBase {
         }
 
         try {
-          this.timeKeeper.processRumRequest(xhr, fullUrl)
+          this.timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime)
         } catch (error) {
           handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/Failed'], undefined, FEATURE_NAMES.metrics, this.ee)
           drain(this.agentIdentifier, FEATURE_NAMES.metrics, true)