@newrelic/browser-agent 1.235.0 → 1.236.0

package/dist/cjs/common/url/parse-url.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.parseUrl = parseUrl;
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -23,9 +23,9 @@ function parseUrl(url) {
     };
   }
   let urlEl;
-  var location = _globalScope.globalScope?.location;
+  var location = _runtime.globalScope?.location;
   var ret = {};
-  if (_globalScope.isBrowserScope) {
+  if (_runtime.isBrowserScope) {
     // Use an anchor dom element to resolve the url natively.
     urlEl = document.createElement('a');
     urlEl.href = url;

package/dist/cjs/common/url/protocol.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isFileProtocol = isFileProtocol;
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 function isFileProtocol() {
-  return Boolean(_globalScope.globalScope?.location?.protocol === 'file:');
+  return Boolean(_runtime.globalScope?.location?.protocol === 'file:');
 }

package/dist/cjs/common/util/submit-data.js

@@ -3,71 +3,38 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.submitData = void 0;
-var _globalScope = require("./global-scope");
-/*
- * Copyright 2020 New Relic Corporation. All rights reserved.
- * SPDX-License-Identifier: Apache-2.0
+exports.beacon = beacon;
+exports.fetchKeepAlive = fetchKeepAlive;
+exports.getSubmitMethod = getSubmitMethod;
+exports.xhr = xhr;
+var _runtime = require("../constants/runtime");
+/**
+ * @file Contains common methods used to transmit harvested data.
+ * @copyright 2023 New Relic Corporation. All rights reserved.
+ * @license Apache-2.0
  */
 
-const submitData = {};
-
 /**
- * Send via JSONP. Do NOT call this function outside of a guaranteed web window environment.
- * @param {Object} args - The args
- * @param {string} args.url - The URL to send to
- * @param {string} args.jsonp - The string name of the jsonp cb method
- * @returns {XMLHttpRequest}
- * @returns {Element}
+ * @typedef {xhr|fetchKeepAlive|beacon} NetworkMethods
  */
-exports.submitData = submitData;
-submitData.jsonp = function jsonp(_ref) {
-  let {
-    url,
-    jsonp
-  } = _ref;
-  try {
-    if (_globalScope.isWorkerScope) {
-      try {
-        return importScripts(url + '&jsonp=' + jsonp);
-      } catch (e) {
-        // for now theres no other way to execute the callback from ingest without jsonp, or unsafe eval / new Function calls
-        // future work needs to be conducted to allow ingest to return a more traditional JSON API-like experience for the entitlement flags
-        submitData.xhrGet({
-          url: url + '&jsonp=' + jsonp
-        });
-        return false;
-      }
-    } else {
-      var element = document.createElement('script');
-      element.type = 'text/javascript';
-      element.src = url + '&jsonp=' + jsonp;
-      var firstScript = document.getElementsByTagName('script')[0];
-      firstScript.parentNode.insertBefore(element, firstScript);
-      return element;
-    }
-  } catch (err) {
-    // do nothing
-  }
-};
 
 /**
- * Performs an asynchronous GET request using XMLHttpRequest.
- *
- * @param {Object} args - An object containing a `url` property.
- * @param {string} args.url - The URL to send the GET request to.
- * @returns {XMLHttpRequest} - An XMLHttpRequest object.
+ * Determines the submit method to use based on options.
+ * @param {object} opts Options used to determine submit method.
+ * @param {boolean} opts.isFinalHarvest Indicates if the data submission is due to
+ * a final harvest within the agent.
  */
-submitData.xhrGet = function xhrGet(_ref2) {
+function getSubmitMethod() {
   let {
-    url
-  } = _ref2;
-  return submitData.xhr({
-    url,
-    sync: false,
-    method: 'GET'
-  });
-};
+    isFinalHarvest = false
+  } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return isFinalHarvest && _runtime.isBrowserScope && _runtime.supportsSendBeacon
+  // Use sendBeacon for final harvest
+  ? beacon
+  // Only IE does not support sendBeacon for final harvest
+  // If not final harvest, or not browserScope, always use xhr post
+  : xhr;
+}
 
 /**
  * Send via XHR
@@ -79,7 +46,7 @@ submitData.xhrGet = function xhrGet(_ref2) {
  * @param {{key: string, value: string}[]} [args.headers] - The headers to attach.
  * @returns {XMLHttpRequest}
  */
-submitData.xhr = function xhr(_ref3) {
+function xhr(_ref) {
   let {
     url,
     body = null,
@@ -89,8 +56,8 @@ submitData.xhr = function xhr(_ref3) {
       key: 'content-type',
       value: 'text/plain'
     }]
-  } = _ref3;
-  var request = new XMLHttpRequest();
+  } = _ref;
+  const request = new XMLHttpRequest();
   request.open(method, url, !sync);
   try {
     // Set cookie
@@ -103,22 +70,37 @@ submitData.xhr = function xhr(_ref3) {
   });
   request.send(body);
   return request;
-};
+}
 
 /**
- * Send by appending an <img> element to the page. Do NOT call this function outside of a guaranteed web window environment.
- * @param {Object} args - The args
- * @param {string} args.url - The URL to send to
- * @returns {HTMLImageElement}
+ * Send via fetch with keepalive true
+ * @param {Object} args - The args.
+ * @param {string} args.url - The URL to send to.
+ * @param {string=} args.body - The Stringified body.
+ * @param {string=} [args.method=POST] - The XHR method to use.
+ * @param {{key: string, value: string}[]} [args.headers] - The headers to attach.
+ * @returns {XMLHttpRequest}
  */
-submitData.img = function img(_ref4) {
+function fetchKeepAlive(_ref2) {
   let {
-    url
-  } = _ref4;
-  var element = new Image();
-  element.src = url;
-  return element;
-};
+    url,
+    body = null,
+    method = 'POST',
+    headers = [{
+      key: 'content-type',
+      value: 'text/plain'
+    }]
+  } = _ref2;
+  return fetch(url, {
+    method,
+    headers: headers.reduce((aggregator, header) => {
+      aggregator.push([header.key, header.value]);
+      return aggregator;
+    }, []),
+    body,
+    keepalive: true
+  });
+}
 
 /**
  * Send via sendBeacon. Do NOT call this function outside of a guaranteed web window environment.
@@ -127,11 +109,11 @@ submitData.img = function img(_ref4) {
  * @param {string=} args.body - The Stringified body
  * @returns {boolean}
  */
-submitData.beacon = function (_ref5) {
+function beacon(_ref3) {
   let {
     url,
     body
-  } = _ref5;
+  } = _ref3;
   try {
     // Navigator has to be bound to ensure it does not error in some browsers
     // https://xgwang.me/posts/you-may-not-know-beacon/#it-may-throw-error%2C-be-sure-to-catch
@@ -140,7 +122,7 @@ submitData.beacon = function (_ref5) {
   } catch (err) {
     // if sendBeacon still trys to throw an illegal invocation error,
     // we can catch here and return.  The harvest module will fallback to use
-    // .img to try to send
+    // fetchKeepAlive to try to send
     return false;
   }
-};
+}

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

@@ -14,18 +14,18 @@ exports.gosNREUMInitializedAgents = gosNREUMInitializedAgents;
 exports.gosNREUMLoaderConfig = gosNREUMLoaderConfig;
 exports.gosNREUMOriginals = gosNREUMOriginals;
 var _now = require("../timing/now");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 const defaults = {
   beacon: 'bam.nr-data.net',
   errorBeacon: 'bam.nr-data.net'
 };
 exports.defaults = defaults;
 function gosNREUM() {
-  if (!_globalScope.globalScope.NREUM) {
-    _globalScope.globalScope.NREUM = {};
+  if (!_runtime.globalScope.NREUM) {
+    _runtime.globalScope.NREUM = {};
   }
-  if (typeof _globalScope.globalScope.newrelic === 'undefined') _globalScope.globalScope.newrelic = _globalScope.globalScope.NREUM;
-  return _globalScope.globalScope.NREUM;
+  if (typeof _runtime.globalScope.newrelic === 'undefined') _runtime.globalScope.newrelic = _runtime.globalScope.NREUM;
+  return _runtime.globalScope.NREUM;
 }
 function gosNREUMInfo() {
   let nr = gosNREUM();
@@ -57,16 +57,16 @@ function gosNREUMOriginals() {
   let nr = gosNREUM();
   if (!nr.o) {
     nr.o = {
-      ST: _globalScope.globalScope.setTimeout,
-      SI: _globalScope.globalScope.setImmediate,
-      CT: _globalScope.globalScope.clearTimeout,
-      XHR: _globalScope.globalScope.XMLHttpRequest,
-      REQ: _globalScope.globalScope.Request,
-      EV: _globalScope.globalScope.Event,
-      PR: _globalScope.globalScope.Promise,
-      MO: _globalScope.globalScope.MutationObserver,
+      ST: _runtime.globalScope.setTimeout,
+      SI: _runtime.globalScope.setImmediate,
+      CT: _runtime.globalScope.clearTimeout,
+      XHR: _runtime.globalScope.XMLHttpRequest,
+      REQ: _runtime.globalScope.Request,
+      EV: _runtime.globalScope.Event,
+      PR: _runtime.globalScope.Promise,
+      MO: _runtime.globalScope.MutationObserver,
       // this'll be undefined if not in a web window
-      FETCH: _globalScope.globalScope.fetch
+      FETCH: _runtime.globalScope.fetch
     };
   }
   return nr;

package/dist/cjs/common/wrap/wrap-events.js

@@ -8,7 +8,7 @@ exports.wrapEvents = wrapEvents;
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _wrapFunction = require("./wrap-function");
 var _getOrSet = require("../util/get-or-set");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -42,8 +42,8 @@ function wrapEvents(sharedEE) {
 
   // Guard against instrumenting environments w/o necessary features
   if ('getPrototypeOf' in Object) {
-    if (_globalScope.isBrowserScope) findEventListenerProtoAndCb(document, wrapNode);
-    findEventListenerProtoAndCb(_globalScope.globalScope, wrapNode);
+    if (_runtime.isBrowserScope) findEventListenerProtoAndCb(document, wrapNode);
+    findEventListenerProtoAndCb(_runtime.globalScope, wrapNode);
     findEventListenerProtoAndCb(XHR.prototype, wrapNode);
   }
   ee.on(ADD_EVENT_LISTENER + '-start', function (args, target) {

package/dist/cjs/common/wrap/wrap-fetch.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.scopedEE = scopedEE;
 exports.wrapFetch = wrapFetch;
 var _contextualEe = require("../event-emitter/contextual-ee");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 var _wrapFunction = require("./wrap-function");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -20,8 +20,8 @@ var _wrapFunction = require("./wrap-function");
 var prefix = 'fetch-';
 var bodyPrefix = prefix + 'body-';
 var bodyMethods = ['arrayBuffer', 'blob', 'json', 'text', 'formData'];
-var Req = _globalScope.globalScope.Request;
-var Res = _globalScope.globalScope.Response;
+var Req = _runtime.globalScope.Request;
+var Res = _runtime.globalScope.Response;
 var proto = 'prototype';
 var ctxId = 'nr@context';
 const wrapped = {};
@@ -36,7 +36,7 @@ const wrapped = {};
  */
 function wrapFetch(sharedEE) {
   const ee = scopedEE(sharedEE);
-  if (!(Req && Res && _globalScope.globalScope.fetch)) {
+  if (!(Req && Res && _runtime.globalScope.fetch)) {
     return ee;
   }
 
@@ -49,7 +49,7 @@ function wrapFetch(sharedEE) {
     wrapPromiseMethod(Req[proto], method, bodyPrefix);
     wrapPromiseMethod(Res[proto], method, bodyPrefix);
   });
-  wrapPromiseMethod(_globalScope.globalScope, 'fetch', prefix);
+  wrapPromiseMethod(_runtime.globalScope, 'fetch', prefix);
   ee.on(prefix + 'end', function (err, res) {
     var ctx = this;
     if (res) {

package/dist/cjs/common/wrap/wrap-history.js

@@ -7,7 +7,7 @@ exports.scopedEE = scopedEE;
 exports.wrapHistory = wrapHistory;
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _wrapFunction = require("./wrap-function");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -32,7 +32,7 @@ function wrapHistory(sharedEE) {
   // Notice if our wrapping never ran yet, the falsy NaN will not early return; but if it has,
   // then we increment the count to track # of feats using this at runtime. History API is only
   // available in browser DOM context.
-  if (!_globalScope.isBrowserScope || wrapped[ee.debugId]++) return ee;
+  if (!_runtime.isBrowserScope || wrapped[ee.debugId]++) return ee;
   wrapped[ee.debugId] = 1; // otherwise, first feature to wrap history
 
   var wrapFn = (0, _wrapFunction.createWrapperWithEmitter)(ee);

package/dist/cjs/common/wrap/wrap-jsonp.js

@@ -8,7 +8,7 @@ exports.wrapJsonP = wrapJsonP;
 var _eventListenerOpts = require("../event-listener/event-listener-opts");
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _wrapFunction = require("./wrap-function");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -33,7 +33,7 @@ function wrapJsonP(sharedEE) {
   // Notice if our wrapping never ran yet, the falsy NaN will not early return; but if it has,
   // then we increment the count to track # of feats using this at runtime.  JSONP deals with DOM
   // tags so browser window env is required.
-  if (!_globalScope.isBrowserScope || wrapped[ee.debugId]) return ee;
+  if (!_runtime.isBrowserScope || wrapped[ee.debugId]) return ee;
   wrapped[ee.debugId] = true; // otherwise, first feature to wrap JSONP
 
   var wrapFn = (0, _wrapFunction.createWrapperWithEmitter)(ee);

package/dist/cjs/common/wrap/wrap-mutation.js

@@ -8,7 +8,7 @@ exports.wrapMutation = wrapMutation;
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _wrapFunction = require("./wrap-function");
 var _config = require("../config/config");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -32,7 +32,7 @@ function wrapMutation(sharedEE) {
   // Notice if our wrapping never ran yet, the falsy NaN will not early return; but if it has,
   // then we increment the count to track # of feats using this at runtime. Mutations API is only
   // available in browser DOM context.
-  if (!_globalScope.isBrowserScope || wrapped[ee.debugId]) return ee;
+  if (!_runtime.isBrowserScope || wrapped[ee.debugId]) return ee;
   wrapped[ee.debugId] = true; // otherwise, first feature to wrap mutations
 
   var wrapFn = (0, _wrapFunction.createWrapperWithEmitter)(ee);

package/dist/cjs/common/wrap/wrap-promise.js

@@ -8,7 +8,7 @@ exports.wrapPromise = wrapPromise;
 var _wrapFunction = require("./wrap-function");
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _config = require("../config/config");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -43,7 +43,7 @@ function wrapPromise(sharedEE) {
     wrap();
   }
   function wrap() {
-    _globalScope.globalScope.Promise = WrappedPromise;
+    _runtime.globalScope.Promise = WrappedPromise;
 
     // Renamed from "WrappedPromise" back to "Promise" & toString() so that we appear "native" to TP libraries...
     Object.defineProperty(WrappedPromise, 'name', {

package/dist/cjs/common/wrap/wrap-raf.js

@@ -7,7 +7,7 @@ exports.scopedEE = scopedEE;
 exports.wrapRaf = wrapRaf;
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _wrapFunction = require("./wrap-function");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -31,7 +31,7 @@ function wrapRaf(sharedEE) {
 
   // Notice if our wrapping never ran yet, the falsy NaN will not early return; but if it has,
   // then we increment the count to track # of feats using this at runtime.
-  if (!_globalScope.isBrowserScope || wrapped[ee.debugId]++) return ee;
+  if (!_runtime.isBrowserScope || wrapped[ee.debugId]++) return ee;
   wrapped[ee.debugId] = 1; // otherwise, first feature to wrap RAF
 
   var wrapFn = (0, _wrapFunction.createWrapperWithEmitter)(ee);

package/dist/cjs/common/wrap/wrap-timer.js

@@ -7,7 +7,7 @@ exports.scopedEE = scopedEE;
 exports.wrapTimer = wrapTimer;
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _wrapFunction = require("./wrap-function");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -42,9 +42,9 @@ function wrapTimer(sharedEE) {
   wrapped[ee.debugId] = 1; // otherwise, first feature to wrap timer
 
   var wrapFn = (0, _wrapFunction.createWrapperWithEmitter)(ee);
-  wrapFn.inPlace(_globalScope.globalScope, TIMER_FNS.slice(0, 2), SET_TIMEOUT + DASH);
-  wrapFn.inPlace(_globalScope.globalScope, TIMER_FNS.slice(2, 3), SET_INTERVAL + DASH);
-  wrapFn.inPlace(_globalScope.globalScope, TIMER_FNS.slice(3), CLEAR_TIMEOUT + DASH);
+  wrapFn.inPlace(_runtime.globalScope, TIMER_FNS.slice(0, 2), SET_TIMEOUT + DASH);
+  wrapFn.inPlace(_runtime.globalScope, TIMER_FNS.slice(2, 3), SET_INTERVAL + DASH);
+  wrapFn.inPlace(_runtime.globalScope, TIMER_FNS.slice(3), CLEAR_TIMEOUT + DASH);
   ee.on(SET_INTERVAL + START, interval);
   ee.on(SET_TIMEOUT + START, timer);
   function interval(args, obj, type) {

package/dist/cjs/common/wrap/wrap-xhr.js

@@ -10,7 +10,7 @@ var _contextualEe = require("../event-emitter/contextual-ee");
 var _eventListenerOpts = require("../event-listener/event-listener-opts");
 var _wrapFunction = require("./wrap-function");
 var _config = require("../config/config");
-var _globalScope = require("../util/global-scope");
+var _runtime = require("../constants/runtime");
 var _console = require("../util/console");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -49,8 +49,8 @@ function wrapXhr(sharedEE) {
   var READY_STATE_CHANGE = 'readystatechange';
   var handlers = ['onload', 'onerror', 'onabort', 'onloadstart', 'onloadend', 'onprogress', 'ontimeout'];
   var pendingXhrs = [];
-  var activeListeners = _globalScope.globalScope.XMLHttpRequest.listeners;
-  var XHR = _globalScope.globalScope.XMLHttpRequest = newXHR;
+  var activeListeners = _runtime.globalScope.XMLHttpRequest.listeners;
+  var XHR = _runtime.globalScope.XMLHttpRequest = newXHR;
   function newXHR(opts) {
     var xhr = new OrigXHR(opts);
     this.listeners = activeListeners ? [...activeListeners, intercept] : [intercept];

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

@@ -165,7 +165,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     function onEventsHarvestFinished(result) {
       if (result.retry && sentAjaxEvents.length > 0 && allAjaxIsEnabled()) {
-        ajaxEvents = ajaxEvents.concat(sentAjaxEvents);
+        ajaxEvents.unshift(...sentAjaxEvents);
         sentAjaxEvents = [];
       }
     }

package/dist/cjs/features/ajax/instrument/distributed-tracing.js

@@ -7,7 +7,7 @@ exports.DT = void 0;
 var _config = require("../../../common/config/config");
 var _uniqueId = require("../../../common/ids/unique-id");
 var _parseUrl = require("../../../common/url/parse-url");
-var _globalScope = require("../../../common/util/global-scope");
+var _runtime = require("../../../common/constants/runtime");
 var _stringify = require("../../../common/util/stringify");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -65,7 +65,7 @@ class DT {
     return trustKey + '@nr=' + version + '-' + parentType + '-' + accountId + '-' + appId + '-' + spanId + '-' + transactionId + '-' + sampled + '-' + priority + '-' + timestamp;
   }
   generateTraceHeader(spanId, traceId, timestamp, accountId, appId, trustKey) {
-    var hasBtoa = typeof _globalScope.globalScope?.btoa === 'function';
+    var hasBtoa = typeof _runtime.globalScope?.btoa === 'function';
     if (!hasBtoa) {
       return null;
     }

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

@@ -7,7 +7,7 @@ exports.Instrument = void 0;
 var _config = require("../../../common/config/config");
 var _handle = require("../../../common/event-emitter/handle");
 var _id = require("../../../common/ids/id");
-var _firefoxVersion = require("../../../common/browser-version/firefox-version");
+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");
@@ -18,7 +18,6 @@ var _responseSize = require("./response-size");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
-var _globalScope = require("../../../common/util/global-scope");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -27,7 +26,7 @@ var _globalScope = require("../../../common/util/global-scope");
 var handlers = ['load', 'error', 'abort', 'timeout'];
 var handlersLen = handlers.length;
 var origRequest = _config.originals.REQ;
-var origXHR = _globalScope.globalScope.XMLHttpRequest;
+var origXHR = _runtime.globalScope.XMLHttpRequest;
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
@@ -85,7 +84,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1227674
     //
     // So we don't use ProgressEvents to measure XHR sizes for FF.
-    if (_firefoxVersion.ffVersion) return;
+    if (_runtime.ffVersion) return;
     xhr.addEventListener('progress', function (event) {
       ctx.lastSize = event.loaded;
     }, (0, _eventListenerOpts.eventListenerOpts)(false));
@@ -201,7 +200,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     } else if (args[0] && args[0].url) {
       url = args[0].url;
       // argument is URL object
-    } else if (_globalScope.globalScope?.URL && args[0] && args[0] instanceof URL) {
+    } else if (_runtime.globalScope?.URL && args[0] && args[0] instanceof URL) {
       url = args[0].href;
     }
     if (url) {
@@ -212,7 +211,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     if (!payload || !payload.newrelicHeader && !payload.traceContextParentHeader) {
       return;
     }
-    if (typeof args[0] === 'string' || _globalScope.globalScope?.URL && args[0] && args[0] instanceof URL) {
+    if (typeof args[0] === 'string' || _runtime.globalScope?.URL && args[0] && args[0] instanceof URL) {
       var clone = {};
       for (var key in opts) {
         clone[key] = opts[key];
@@ -261,7 +260,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
       url = target;
     } else if (typeof target === 'object' && target instanceof origRequest) {
       url = target.url;
-    } else if (_globalScope.globalScope?.URL && typeof target === 'object' && target instanceof URL) {
+    } else if (_runtime.globalScope?.URL && typeof target === 'object' && target instanceof URL) {
       url = target.href;
     }
     addUrl(this, url);

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

@@ -15,7 +15,7 @@ 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 _globalScope = require("../../../common/util/global-scope");
+var _runtime = require("../../../common/constants/runtime");
 var _constants = require("../constants");
 var _drain = require("../../../common/drain/drain");
 var _features = require("../../../loaders/features/features");
@@ -100,7 +100,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       (0, _mapOwn.mapOwn)(this.currentBody, (key, value) => {
         for (var i = 0; i < value.length; i++) {
           var bucket = value[i];
-          var name = this.getBucketName(bucket.params, bucket.custom);
+          var name = this.getBucketName(key, bucket.params, bucket.custom);
           this.aggregator.merge(key, name, bucket.metrics, bucket.params, bucket.custom);
         }
       });
@@ -110,7 +110,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
   nameHash(params) {
     return (0, _stringHashCode.stringHashCode)("".concat(params.exceptionClass, "_").concat(params.message, "_").concat(params.stack_trace || params.browser_stack_hash));
   }
-  getBucketName(params, customParams) {
+  getBucketName(objType, params, customParams) {
+    if (objType === 'xhr') {
+      return (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(params)) + ':' + (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(customParams));
+    }
     return this.nameHash(params) + ':' + (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(customParams));
   }
 
@@ -153,7 +156,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     const params = {
       stackHash: (0, _stringHashCode.stringHashCode)(canonicalStackString),
       exceptionClass: stackInfo.name,
-      request_uri: _globalScope.globalScope?.location.pathname
+      request_uri: _runtime.globalScope?.location.pathname
     };
     if (stackInfo.message) params.message = '' + stackInfo.message;
     // Notice if filterOutput isn't false|undefined OR our specified object, this func would've returned already (so it's unnecessary to req-check group).

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

@@ -12,7 +12,7 @@ require("./debug");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
-var _globalScope = require("../../../common/util/global-scope");
+var _runtime = require("../../../common/constants/runtime");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
 var _config = require("../../../common/config/config");
 var _stringify = require("../../../common/util/stringify");
@@ -55,9 +55,9 @@ class Instrument extends _instrumentBase.InstrumentBase {
     });
 
     // Replace global error handler with our own.
-    this.origOnerror = _globalScope.globalScope.onerror;
-    _globalScope.globalScope.onerror = this.onerrorHandler.bind(this);
-    _globalScope.globalScope.addEventListener('unhandledrejection', e => {
+    this.origOnerror = _runtime.globalScope.onerror;
+    _runtime.globalScope.onerror = this.onerrorHandler.bind(this);
+    _runtime.globalScope.addEventListener('unhandledrejection', e => {
       /** rejections can contain data of any type -- this is an effort to keep the message human readable */
       const err = castReasonToError(e.reason);
       (0, _handle.handle)('err', [err, (0, _now.now)(), false, {

package/dist/cjs/features/metrics/aggregate/framework-detection.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getFrameworks = getFrameworks;
-var _globalScope = require("../../../common/util/global-scope");
+var _runtime = require("../../../common/constants/runtime");
 const FRAMEWORKS = {
   REACT: 'React',
   ANGULAR: 'Angular',
@@ -18,7 +18,7 @@ const FRAMEWORKS = {
   MOOTOOLS: 'MooTools'
 };
 function getFrameworks() {
-  if (!_globalScope.isBrowserScope) return []; // don't bother detecting frameworks if not in the main window context
+  if (!_runtime.isBrowserScope) return []; // don't bother detecting frameworks if not in the main window context
 
   const frameworks = [];
   try {