@newrelic/browser-agent 1.237.1 → 1.239.0

package/dist/cjs/common/util/feature-flags.js

@@ -7,7 +7,6 @@ exports.activateFeatures = activateFeatures;
 exports.activatedFeatures = void 0;
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _handle = require("../event-emitter/handle");
-var _drain = require("../drain/drain");
 var _features = require("../../loaders/features/features");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -21,24 +20,24 @@ const bucketMap = {
   spa: [_features.FEATURE_NAMES.spa],
   sr: [_features.FEATURE_NAMES.sessionReplay, _features.FEATURE_NAMES.sessionTrace]
 };
+const sentIds = new Set();
 
 /** Note that this function only processes each unique flag ONCE, with the first occurrence of each flag and numeric value determining its switch on/off setting. */
 function activateFeatures(flags, agentIdentifier) {
   const sharedEE = _contextualEe.ee.get(agentIdentifier);
   if (!(flags && typeof flags === 'object')) return;
-  Object.entries(flags).forEach(_ref => {
-    let [flag, num] = _ref;
-    if (activatedFeatures[flag] !== undefined) return;
-    if (bucketMap[flag]) {
-      bucketMap[flag].forEach(feat => {
-        if (!num) (0, _handle.handle)('block-' + flag, [], undefined, feat, sharedEE);else (0, _handle.handle)('feat-' + flag, [], undefined, feat, sharedEE);
-        (0, _handle.handle)('rumresp-' + flag, [Boolean(num)], undefined, feat, sharedEE); // this is a duplicate of feat-/block- but makes awaiting for 1 event easier than 2
-      });
-    } else if (num) (0, _handle.handle)('feat-' + flag, [], undefined, undefined, sharedEE); // not sure what other flags are overlooked, but there's a test for ones not in the map --
-    // ^^^ THIS DOESN'T ACTUALLY DO ANYTHHING AS UNDEFINED/FEATURE GROUP ISN'T DRAINED
-
-    activatedFeatures[flag] = Boolean(num);
-  });
+  if (!sentIds.has(agentIdentifier)) {
+    Object.entries(flags).forEach(_ref => {
+      let [flag, num] = _ref;
+      if (bucketMap[flag]) {
+        bucketMap[flag].forEach(feat => {
+          if (!num) (0, _handle.handle)('block-' + flag, [], undefined, feat, sharedEE);else (0, _handle.handle)('feat-' + flag, [], undefined, feat, sharedEE);
+          (0, _handle.handle)('rumresp-' + flag, [Boolean(num)], undefined, feat, sharedEE); // this is a duplicate of feat-/block- but makes awaiting for 1 event easier than 2
+        });
+      } else if (num) (0, _handle.handle)('feat-' + flag, [], undefined, undefined, sharedEE); // not sure what other flags are overlooked, but there's a test for ones not in the map --
+      activatedFeatures[flag] = Boolean(num);
+    });
+  }
 
   // Let the features waiting on their respective flags know that RUM response was received and that any missing flags are interpreted as bad entitlement / "off".
   // Hence, those features will not be hanging forever if their flags aren't included in the response.
@@ -48,7 +47,7 @@ function activateFeatures(flags, agentIdentifier) {
       activatedFeatures[flag] = false;
     }
   });
-  (0, _drain.drain)(agentIdentifier, _features.FEATURE_NAMES.pageViewEvent);
+  sentIds.add(agentIdentifier);
 }
 const activatedFeatures = {};
 exports.activatedFeatures = activatedFeatures;

package/dist/cjs/common/util/invoke.js

@@ -39,7 +39,9 @@ function debounce(func) {
     }
     if (leading && timer === undefined) {
       func.apply(_this, args);
-      timer = setTimeout(() => timer = clearTimeout(timer), timeout);
+      timer = setTimeout(() => {
+        timer = clearTimeout(timer);
+      }, timeout);
     }
     if (!leading) {
       clearTimeout(timer);

package/dist/cjs/common/util/obfuscate.js

@@ -61,11 +61,9 @@ function validateRules(rules) {
       invalidRegexDetected = true;
     }
     var replacement = rules[i].replacement;
-    if (replacement) {
-      if (typeof replacement !== 'string') {
-        (0, _console.warn)('An obfuscation replacement rule contains a "replacement" value with an invalid type (must be a string)');
-        invalidReplacementDetected = true;
-      }
+    if (replacement && typeof replacement !== 'string') {
+      (0, _console.warn)('An obfuscation replacement rule contains a "replacement" value with an invalid type (must be a string)');
+      invalidReplacementDetected = true;
     }
   }
   return !invalidReplacementDetected && !invalidRegexDetected;

package/dist/cjs/common/util/traverse.js

@@ -26,6 +26,7 @@ function applyFnToProps(obj, fn) {
     if (typeof obj[property] === 'object') {
       applyFnToProps(obj[property], fn, type, ignoreKeys);
     } else {
+      // eslint-disable-next-line valid-typeof
       if (typeof obj[property] === type && !ignoreKeys.includes(property)) obj[property] = fn(obj[property]);
     }
   });

package/dist/cjs/common/window/page-visibility.js

@@ -20,11 +20,10 @@ function subscribeToVisibilityChange(cb) {
   let capture = arguments.length > 2 ? arguments[2] : undefined;
   let abortSignal = arguments.length > 3 ? arguments[3] : undefined;
   (0, _eventListenerOpts.documentAddEventListener)('visibilitychange', handleVisibilityChange, capture, abortSignal);
-  return;
   function handleVisibilityChange() {
     if (toHiddenOnly) {
       // trigger cb on change to hidden state only
-      if (document.visibilityState == 'hidden') cb();
+      if (document.visibilityState === 'hidden') cb();
       return;
     }
     cb(document.visibilityState);

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

@@ -20,9 +20,10 @@ var _runtime = require("../constants/runtime");
  */
 
 const wrapped = {};
-const XHR = XMLHttpRequest;
+const XHR = _runtime.globalScope.XMLHttpRequest;
 const ADD_EVENT_LISTENER = 'addEventListener';
 const REMOVE_EVENT_LISTENER = 'removeEventListener';
+const flag = "nr@wrapped:".concat(_contextualEe.contextId);
 
 /**
  * Wraps `addEventListener` and `removeEventListener` on: global scope; the prototype of `XMLHttpRequest`, and
@@ -51,7 +52,7 @@ function wrapEvents(sharedEE) {
     if (originalListener === null || typeof originalListener !== 'function' && typeof originalListener !== 'object') {
       return;
     }
-    var wrapped = (0, _getOrSet.getOrSet)(originalListener, 'nr@wrapped', function () {
+    var wrapped = (0, _getOrSet.getOrSet)(originalListener, flag, function () {
       var listener = {
         object: wrapHandleEvent,
         function: originalListener

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

@@ -7,7 +7,6 @@ exports.scopedEE = scopedEE;
 exports.wrapFetch = wrapFetch;
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _runtime = require("../constants/runtime");
-var _wrapFunction = require("./wrap-function");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -23,7 +22,6 @@ var bodyMethods = ['arrayBuffer', 'blob', 'json', 'text', 'formData'];
 var Req = _runtime.globalScope.Request;
 var Res = _runtime.globalScope.Response;
 var proto = 'prototype';
-var ctxId = 'nr@context';
 const wrapped = {};
 
 /**
@@ -80,7 +78,7 @@ function wrapFetch(sharedEE) {
         // we are wrapping args in an array so we can preserve the reference
         ee.emit(prefix + 'before-start', [args], ctx);
         var dtPayload;
-        if (ctx[ctxId] && ctx[ctxId].dt) dtPayload = ctx[ctxId].dt;
+        if (ctx[_contextualEe.contextId] && ctx[_contextualEe.contextId].dt) dtPayload = ctx[_contextualEe.contextId].dt;
         var origPromiseFromFetch = fn.apply(this, args);
         ee.emit(prefix + 'start', [args, dtPayload], origPromiseFromFetch);
 

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

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createWrapperWithEmitter = createWrapperWithEmitter;
 exports.flag = exports.default = void 0;
-exports.wrapFunction = wrapFunction;
-exports.wrapInPlace = wrapInPlace;
 var _contextualEe = require("../event-emitter/contextual-ee");
+var _bundleId = require("../ids/bundle-id");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -16,7 +15,7 @@ var _contextualEe = require("../event-emitter/contextual-ee");
  * @file Provides helper functions for wrapping functions in various scenarios.
  */
 
-const flag = 'nr@original';
+const flag = "nr@original:".concat(_bundleId.bundleId);
 
 /**
  * A convenience alias of `hasOwnProperty`.
@@ -110,25 +109,23 @@ function createWrapperWithEmitter(emitter, always) {
 
   /**
    * Creates wrapper functions around each of an array of methods on a specified object.
-   * @param {Object} obj - The object to which the specified methods belong.
-   * @param {string[]} methods - An array of method names to be wrapped.
-   * @param {string} [prefix=''] - A prefix to add to the names of emitted events. If `-` is the first character, also
-   *     adds the method name before the prefix.
-   * @param {function|object} [getContext] - The function or object that will serve as the 'this' context for handlers
-   *     of events emitted by this wrapper.
-   * @param {boolean} [bubble=false] - If `true`, emitted events should also bubble up to the old emitter upon which
-   *     the `emitter` in the current scope was based (if it defines one).
+   * @param {Object} obj The object to which the specified methods belong.
+   * @param {string[]} methods An array of method names to be wrapped.
+   * @param {string} [prefix=''] A prefix to add to the names of emitted events. If `-` is the first character, also
+   * adds the method name before the prefix.
+   * @param {function|object} [getContext] The function or object that will serve as the 'this' context for handlers
+   * of events emitted by this wrapper.
+   * @param {boolean} [bubble=false] If `true`, emitted events should also bubble up to the old emitter upon which
+   * the `emitter` in the current scope was based (if it defines one).
    */
   function inPlace(obj, methods, prefix, getContext, bubble) {
     if (!prefix) prefix = '';
+
     // If prefix starts with '-' set this boolean to add the method name to the prefix before passing each one to wrap.
-    var prependMethodPrefix = prefix.charAt(0) === '-';
-    var fn;
-    var method;
-    var i;
-    for (i = 0; i < methods.length; i++) {
-      method = methods[i];
-      fn = obj[method];
+    const prependMethodPrefix = prefix.charAt(0) === '-';
+    for (let i = 0; i < methods.length; i++) {
+      const method = methods[i];
+      const fn = obj[method];
 
       // Unless fn is both wrappable and unwrapped, bail so we don't add extra properties with undefined values.
       if (notWrappable(fn)) continue;
@@ -222,32 +219,4 @@ function copy(from, to, emitter) {
  */
 function notWrappable(fn) {
   return !(fn && fn instanceof Function && fn.apply && !fn[flag]);
-}
-
-/**
- * Creates a wrapped version of a function using a specified wrapper function. The new wrapped function references the
- * original function. Also copies the properties of the original function to the wrapped function.
- * @param {function} fn - A function to be wrapped.
- * @param {function} wrapper - A higher order function that returns a new function, which executes the function passed
- *     to the higher order function as an argument.
- * @returns {function} A wrapped function with an internal reference to the original function.
- */
-function wrapFunction(fn, wrapper) {
-  var wrapped = wrapper(fn);
-  wrapped[flag] = fn;
-  copy(fn, wrapped, _contextualEe.ee);
-  return wrapped;
-}
-
-/**
- * Replaces a function with a wrapped version of itself. To preserve object references, rather than taking the function
- * itself as an argument, takes the object on which the particular named function is a property.
- * @param {Object} obj - The object on which the named function is a property.
- * @param {string} fnName - The name of the function to be wrapped.
- * @param {function} wrapper - A higher order function that returns a new function, which executes the function passed
- *     to the higher order function as an argument.
- */
-function wrapInPlace(obj, fnName, wrapper) {
-  var fn = obj[fnName];
-  obj[fnName] = wrapFunction(fn, wrapper);
 }

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

@@ -117,7 +117,7 @@ function wrapJsonP(sharedEE) {
       };
     }
     return {
-      key: key,
+      key,
       parent: window
     };
   }

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

@@ -7,7 +7,6 @@ exports.scopedEE = scopedEE;
 exports.wrapMutation = wrapMutation;
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _wrapFunction = require("./wrap-function");
-var _config = require("../config/config");
 var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -36,7 +35,7 @@ function wrapMutation(sharedEE) {
   wrapped[ee.debugId] = true; // otherwise, first feature to wrap mutations
 
   var wrapFn = (0, _wrapFunction.createWrapperWithEmitter)(ee);
-  var OriginalObserver = _config.originals.MO;
+  var OriginalObserver = _runtime.globalScope.MutationObserver;
   if (OriginalObserver) {
     window.MutationObserver = function WrappedMutationObserver(cb) {
       if (this instanceof OriginalObserver) {

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

@@ -7,7 +7,6 @@ exports.scopedEE = scopedEE;
 exports.wrapPromise = wrapPromise;
 var _wrapFunction = require("./wrap-function");
 var _contextualEe = require("../event-emitter/contextual-ee");
-var _config = require("../config/config");
 var _runtime = require("../constants/runtime");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -35,9 +34,9 @@ function wrapPromise(sharedEE) {
   if (wrapped[promiseEE.debugId]) return promiseEE;
   wrapped[promiseEE.debugId] = true; // otherwise, first feature to wrap promise
 
-  var getContext = _contextualEe.getOrSetContext;
+  var getContext = promiseEE.context;
   var promiseWrapper = (0, _wrapFunction.createWrapperWithEmitter)(promiseEE);
-  var prevPromiseObj = _config.originals.PR;
+  var prevPromiseObj = _runtime.globalScope.Promise;
   if (prevPromiseObj) {
     // ensure there's a Promise API (native or otherwise) to even wrap
     wrap();

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

@@ -9,7 +9,6 @@ var _wrapEvents = require("./wrap-events");
 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 _runtime = require("../constants/runtime");
 var _console = require("../util/console");
 /*
@@ -42,32 +41,28 @@ function wrapXhr(sharedEE) {
 
   (0, _wrapEvents.wrapEvents)(baseEE); // wrap-events patches XMLHttpRequest.prototype.addEventListener for us
   var wrapFn = (0, _wrapFunction.createWrapperWithEmitter)(ee);
-  var OrigXHR = _config.originals.XHR;
-  var MutationObserver = _config.originals.MO;
-  var Promise = _config.originals.PR;
-  var setImmediate = _config.originals.SI;
+  var OrigXHR = _runtime.globalScope.XMLHttpRequest;
+  var MutationObserver = _runtime.globalScope.MutationObserver;
+  var Promise = _runtime.globalScope.Promise;
+  var setImmediate = _runtime.globalScope.setInterval;
   var READY_STATE_CHANGE = 'readystatechange';
   var handlers = ['onload', 'onerror', 'onabort', 'onloadstart', 'onloadend', 'onprogress', 'ontimeout'];
   var pendingXhrs = [];
-  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];
-    function intercept() {
+    const xhr = new OrigXHR(opts);
+    const context = ee.context(xhr);
+    try {
+      ee.emit('new-xhr', [xhr], context);
+      xhr.addEventListener(READY_STATE_CHANGE, wrapXHR(context), (0, _eventListenerOpts.eventListenerOpts)(false));
+    } catch (e) {
+      (0, _console.warn)('An error occurred while intercepting XHR', e);
       try {
-        ee.emit('new-xhr', [xhr], xhr);
-        xhr.addEventListener(READY_STATE_CHANGE, wrapXHR, (0, _eventListenerOpts.eventListenerOpts)(false));
-      } catch (e) {
-        (0, _console.warn)('An error occured while intercepting XHR', e);
-        try {
-          ee.emit('internal-error', [e]);
-        } catch (err) {
-          // do nothing
-        }
+        ee.emit('internal-error', [e]);
+      } catch (err) {
+        // do nothing
       }
     }
-    this.listeners.forEach(listener => listener());
     return xhr;
   }
   copy(OrigXHR, XHR);
@@ -81,14 +76,15 @@ function wrapXhr(sharedEE) {
   function wrapOnreadystatechange(args, xhr) {
     wrapFn.inPlace(xhr, ['onreadystatechange'], 'fn-', getObject);
   }
-  function wrapXHR() {
-    var xhr = this;
-    var ctx = ee.context(xhr);
-    if (xhr.readyState > 3 && !ctx.resolved) {
-      ctx.resolved = true;
-      ee.emit('xhr-resolved', [], xhr);
-    }
-    wrapFn.inPlace(xhr, handlers, 'fn-', getObject);
+  function wrapXHR(ctx) {
+    return function () {
+      var xhr = this;
+      if (xhr.readyState > 3 && !ctx.resolved) {
+        ctx.resolved = true;
+        ee.emit('xhr-resolved', [], xhr);
+      }
+      wrapFn.inPlace(xhr, handlers, 'fn-', getObject);
+    };
   }
 
   // Wrapping the onreadystatechange property of XHRs takes some special tricks.

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

@@ -12,7 +12,6 @@ var _config = require("../../../common/config/config");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _denyList = require("../../../common/deny-list/deny-list");
 var _constants = require("../constants");
-var _drain = require("../../../common/drain/drain");
 var _features = require("../../../loaders/features/features");
 var _constants2 = require("../../metrics/constants");
 var _aggregateBase = require("../../utils/aggregate-base");
@@ -29,7 +28,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     const allAjaxIsEnabled = agentInit.ajax.enabled !== false;
     (0, _registerHandler.registerHandler)('xhr', storeXhr, this.featureName, this.ee);
     if (!allAjaxIsEnabled) {
-      (0, _drain.drain)(this.agentIdentifier, this.featureName);
+      this.drain();
       return; // feature will only collect timeslice metrics & ajax trace nodes if it's not fully enabled
     }
 
@@ -71,8 +70,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     ee.on("drain-".concat(this.featureName), () => {
       scheduler.startTimer(harvestTimeSeconds);
     });
-    (0, _drain.drain)(this.agentIdentifier, this.featureName);
-    return;
+    this.drain();
     function storeXhr(params, metrics, startTime, endTime, type) {
       metrics.time = startTime;
 
@@ -104,9 +102,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
         path: params.pathname,
         requestSize: metrics.txSize,
         responseSize: metrics.rxSize,
-        type: type,
-        startTime: startTime,
-        endTime: endTime,
+        type,
+        startTime,
+        endTime,
         callbackDuration: metrics.cbTime
       };
       if (xhrContext.dt) {

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

@@ -17,22 +17,18 @@ var _stringify = require("../../../common/util/stringify");
 class DT {
   constructor(agentIdentifier) {
     this.agentIdentifier = agentIdentifier;
-    // Binds this class instance context to the following fn used in an external module (exported);
-    //  Alternatively, can make them class field arrow functions, but requires experimental features/plugin for eslint.
-    this.generateTracePayload = this.generateTracePayload.bind(this);
-    this.shouldGenerateTrace = this.shouldGenerateTrace.bind(this);
   }
   generateTracePayload(parsedOrigin) {
     if (!this.shouldGenerateTrace(parsedOrigin)) {
       return null;
     }
-    var loader_config = (0, _config.getLoaderConfig)(this.agentIdentifier);
-    if (!loader_config) {
+    var loaderConfig = (0, _config.getLoaderConfig)(this.agentIdentifier);
+    if (!loaderConfig) {
       return null;
     }
-    var accountId = (loader_config.accountID || '').toString() || null;
-    var agentId = (loader_config.agentID || '').toString() || null;
-    var trustKey = (loader_config.trustKey || '').toString() || null;
+    var accountId = (loaderConfig.accountID || '').toString() || null;
+    var agentId = (loaderConfig.agentID || '').toString() || null;
+    var trustKey = (loaderConfig.trustKey || '').toString() || null;
     if (!accountId || !agentId) {
       return null;
     }
@@ -40,9 +36,9 @@ class DT {
     var traceId = (0, _uniqueId.generateTraceId)();
     var timestamp = Date.now();
     var payload = {
-      spanId: spanId,
-      traceId: traceId,
-      timestamp: timestamp
+      spanId,
+      traceId,
+      timestamp
     };
     if (parsedOrigin.sameOrigin || this.isAllowedOrigin(parsedOrigin) && this.useTraceContextHeadersForCors()) {
       payload.traceContextParentHeader = this.generateTraceContextParentHeader(spanId, traceId);

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

@@ -26,7 +26,7 @@ var _features = require("../../../loaders/features/features");
 var handlers = ['load', 'error', 'abort', 'timeout'];
 var handlersLen = handlers.length;
 var origRequest = _config.originals.REQ;
-var origXHR = _runtime.globalScope.XMLHttpRequest;
+var origXHR = _config.originals.XHR;
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
@@ -37,6 +37,38 @@ class Instrument extends _instrumentBase.InstrumentBase {
     if (!(0, _config.getRuntime)(agentIdentifier).xhrWrappable) return;
     this.dt = new _distributedTracing.DT(agentIdentifier);
     this.handler = (type, args, ctx, group) => (0, _handle.handle)(type, args, ctx, group, this.ee);
+
+    // this is a best (but imperfect) effort at capturing AJAX calls that may have fired before the agent was instantiated
+    // this could happen because the agent was "improperly" set up (ie, not at the top of the head) or
+    // because it was deferred from loading in some way -- e.g. 'deferred' script loading tags or other lazy-loading techniques
+    //
+    // it is "imperfect" because we cannot capture the following with the API vs wrapping the events directly:
+    // * requestBodySize - (txSize -- request body size)
+    // * method - request type (GET, POST, etc)
+    // * callbackDuration - (cbTime -- sum of resulting callback time)
+    try {
+      const initiators = {
+        xmlhttprequest: 'xhr',
+        fetch: 'fetch',
+        beacon: 'beacon'
+      };
+      _runtime.globalScope?.performance?.getEntriesByType('resource').forEach(resource => {
+        if (resource.initiatorType in initiators && resource.responseStatus !== 0) {
+          const params = {
+            status: resource.responseStatus
+          };
+          const metrics = {
+            rxSize: resource.transferSize,
+            duration: Math.floor(resource.duration),
+            cbTime: 0
+          };
+          addUrl(params, resource.name);
+          this.handler('xhr', [params, metrics, resource.startTime, resource.responseEnd, initiators[resource.initiatorType]], undefined, _features.FEATURE_NAMES.ajax);
+        }
+      });
+    } catch (err) {
+      // do nothing
+    }
     (0, _wrap.wrapFetch)(this.ee);
     (0, _wrap.wrapXhr)(this.ee);
     subscribeToEvents(agentIdentifier, this.ee, this.handler, this.dt);
@@ -97,9 +129,9 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     this.metrics = {};
   }
   function onOpenXhrEnd(args, xhr) {
-    var loader_config = (0, _config.getLoaderConfig)(agentIdentifier);
-    if (loader_config.xpid && this.sameOrigin) {
-      xhr.setRequestHeader('X-NewRelic-ID', loader_config.xpid);
+    var loaderConfig = (0, _config.getLoaderConfig)(agentIdentifier);
+    if (loaderConfig.xpid && this.sameOrigin) {
+      xhr.setRequestHeader('X-NewRelic-ID', loaderConfig.xpid);
     }
     var payload = dt.generateTracePayload(this.parsedOrigin);
     if (payload) {
@@ -193,15 +225,25 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
   function onFetchBeforeStart(args) {
     var opts = args[1] || {};
     var url;
-    // argument is USVString
     if (typeof args[0] === 'string') {
+      // argument is USVString
       url = args[0];
-      // argument is Request object
+      if (url.length === 0 && _runtime.isBrowserScope) {
+        url = '' + _runtime.globalScope.location.href;
+      }
     } else if (args[0] && args[0].url) {
+      // argument is Request object
       url = args[0].url;
-      // argument is URL object
     } else if (_runtime.globalScope?.URL && args[0] && args[0] instanceof URL) {
+      // argument is URL object
       url = args[0].href;
+    } else if (typeof args[0].toString === 'function') {
+      url = args[0].toString();
+    }
+    if (typeof url !== 'string' || url.length === 0) {
+      // Short-circuit DT since we could not determine the URL of the fetch call
+      // this is very unlikely to happen
+      return;
     }
     if (url) {
       this.parsedOrigin = (0, _parseUrl.parseUrl)(url);
@@ -211,7 +253,11 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     if (!payload || !payload.newrelicHeader && !payload.traceContextParentHeader) {
       return;
     }
-    if (typeof args[0] === 'string' || _runtime.globalScope?.URL && args[0] && args[0] instanceof URL) {
+    if (args[0] && args[0].headers) {
+      if (addHeaders(args[0].headers, payload)) {
+        this.dt = payload;
+      }
+    } else {
       var clone = {};
       for (var key in opts) {
         clone[key] = opts[key];
@@ -225,10 +271,6 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
       } else {
         args.push(clone);
       }
-    } else if (args[0] && args[0].headers) {
-      if (addHeaders(args[0].headers, payload)) {
-        this.dt = payload;
-      }
     }
     function addHeaders(headersObj, payload) {
       var added = false;
@@ -271,7 +313,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
 
   // we capture failed call as status 0, the actual error is ignored
   // eslint-disable-next-line handle-callback-err
-  function onFetchDone(err, res) {
+  function onFetchDone(_, res) {
     this.endTime = (0, _now.now)();
     if (!this.params) {
       this.params = {};
@@ -312,17 +354,6 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     metrics.cbTime = this.cbTime;
     handler('xhr', [params, metrics, this.startTime, this.endTime, 'xhr'], this, _features.FEATURE_NAMES.ajax);
   }
-  function addUrl(ctx, url) {
-    var parsed = (0, _parseUrl.parseUrl)(url);
-    var params = ctx.params;
-    params.hostname = parsed.hostname;
-    params.port = parsed.port;
-    params.protocol = parsed.protocol;
-    params.host = parsed.hostname + ':' + parsed.port;
-    params.pathname = parsed.pathname;
-    ctx.parsedOrigin = parsed;
-    ctx.sameOrigin = parsed.sameOrigin;
-  }
   function captureXhrData(ctx, xhr) {
     ctx.params.status = xhr.status;
     var size = (0, _responseSize.responseSizeFromXhr)(xhr, ctx.lastSize);
@@ -335,4 +366,15 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     }
     ctx.loadCaptureCalled = true;
   }
+}
+function addUrl(ctx, url) {
+  var parsed = (0, _parseUrl.parseUrl)(url);
+  var params = ctx.params || ctx;
+  params.hostname = parsed.hostname;
+  params.port = parsed.port;
+  params.protocol = parsed.protocol;
+  params.host = parsed.hostname + ':' + parsed.port;
+  params.pathname = parsed.pathname;
+  ctx.parsedOrigin = parsed;
+  ctx.sameOrigin = parsed.sameOrigin;
 }

package/dist/cjs/features/jserrors/aggregate/canonical-function-name.js

@@ -22,5 +22,4 @@ function canonicalFunctionName(functionNameString) {
   if (!functionNameString) return;
   const match = functionNameString.match(canonicalFunctionNameRe);
   if (match) return match[1];
-  return;
 }

package/dist/cjs/features/jserrors/aggregate/compute-stack-trace.js

@@ -69,8 +69,8 @@ var debug = false;
 var classNameRegex = /function (.+?)\s*\(/;
 var chrome = /^\s*at (?:((?:\[object object\])?(?:[^(]*\([^)]*\))*[^()]*(?: \[as \S+\])?) )?\(?((?:file|http|https|chrome-extension):.*?)?:(\d+)(?::(\d+))?\)?\s*$/i;
 var gecko = /^\s*(?:(\S*|global code)(?:\(.*?\))?@)?((?:file|http|https|chrome|safari-extension).*?):(\d+)(?::(\d+))?\s*$/i;
-var chrome_eval = /^\s*at .+ \(eval at \S+ \((?:(?:file|http|https):[^)]+)?\)(?:, [^:]*:\d+:\d+)?\)$/i;
-var ie_eval = /^\s*at Function code \(Function code:\d+:\d+\)\s*/i;
+var chromeEval = /^\s*at .+ \(eval at \S+ \((?:(?:file|http|https):[^)]+)?\)(?:, [^:]*:\d+:\d+)?\)$/i;
+var ieEval = /^\s*at Function code \(Function code:\d+:\d+\)\s*/i;
 
 /**
  * Represents an error with a stack trace.
@@ -204,7 +204,7 @@ function getStackElement(line) {
       column: parts[4] ? +parts[4] : null
     };
   }
-  if (line.match(chrome_eval) || line.match(ie_eval) || line === 'anonymous') {
+  if (line.match(chromeEval) || line.match(ieEval) || line === 'anonymous') {
     return {
       func: 'evaluated code'
     };
@@ -249,7 +249,7 @@ function computeStackTraceBySourceAndLine(ex) {
     mode: 'sourceline',
     name: className,
     message: ex.message,
-    stackString: stackString,
+    stackString,
     frames: [{
       url: canonicalUrl,
       line: ex.line,