@newrelic/browser-agent 1.237.1 → 1.239.0

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

@@ -7,7 +7,8 @@
  */
 
 import { ee } from '../event-emitter/contextual-ee';
-export const flag = 'nr@original';
+import { bundleId } from '../ids/bundle-id';
+export const flag = "nr@original:".concat(bundleId);
 
 /**
  * A convenience alias of `hasOwnProperty`.
@@ -100,25 +101,23 @@ export 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;
@@ -212,32 +211,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.
- */
-export function wrapFunction(fn, wrapper) {
-  var wrapped = wrapper(fn);
-  wrapped[flag] = fn;
-  copy(fn, wrapped, 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.
- */
-export function wrapInPlace(obj, fnName, wrapper) {
-  var fn = obj[fnName];
-  obj[fnName] = wrapFunction(fn, wrapper);
 }

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

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

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

@@ -9,8 +9,7 @@
 
 import { ee as baseEE } from '../event-emitter/contextual-ee';
 import { createWrapperWithEmitter as wfn } from './wrap-function';
-import { originals } from '../config/config';
-import { isBrowserScope } from '../constants/runtime';
+import { globalScope, isBrowserScope } from '../constants/runtime';
 const wrapped = {};
 
 /**
@@ -29,7 +28,7 @@ export function wrapMutation(sharedEE) {
   wrapped[ee.debugId] = true; // otherwise, first feature to wrap mutations
 
   var wrapFn = wfn(ee);
-  var OriginalObserver = originals.MO;
+  var OriginalObserver = globalScope.MutationObserver;
   if (OriginalObserver) {
     window.MutationObserver = function WrappedMutationObserver(cb) {
       if (this instanceof OriginalObserver) {

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

@@ -8,8 +8,7 @@
  */
 
 import { createWrapperWithEmitter as wrapFn, flag } from './wrap-function';
-import { ee as baseEE, getOrSetContext } from '../event-emitter/contextual-ee';
-import { originals } from '../config/config';
+import { ee as baseEE } from '../event-emitter/contextual-ee';
 import { globalScope } from '../constants/runtime';
 const wrapped = {};
 
@@ -28,9 +27,9 @@ export function wrapPromise(sharedEE) {
   if (wrapped[promiseEE.debugId]) return promiseEE;
   wrapped[promiseEE.debugId] = true; // otherwise, first feature to wrap promise
 
-  var getContext = getOrSetContext;
+  var getContext = promiseEE.context;
   var promiseWrapper = wrapFn(promiseEE);
-  var prevPromiseObj = originals.PR;
+  var prevPromiseObj = globalScope.Promise;
   if (prevPromiseObj) {
     // ensure there's a Promise API (native or otherwise) to even wrap
     wrap();

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

@@ -11,7 +11,6 @@ import { wrapEvents } from './wrap-events';
 import { ee as contextualEE } from '../event-emitter/contextual-ee';
 import { eventListenerOpts } from '../event-listener/event-listener-opts';
 import { createWrapperWithEmitter as wfn } from './wrap-function';
-import { originals } from '../config/config';
 import { globalScope } from '../constants/runtime';
 import { warn } from '../util/console';
 const wrapped = {};
@@ -35,32 +34,28 @@ export function wrapXhr(sharedEE) {
 
   wrapEvents(baseEE); // wrap-events patches XMLHttpRequest.prototype.addEventListener for us
   var wrapFn = wfn(ee);
-  var OrigXHR = originals.XHR;
-  var MutationObserver = originals.MO;
-  var Promise = originals.PR;
-  var setImmediate = originals.SI;
+  var OrigXHR = globalScope.XMLHttpRequest;
+  var MutationObserver = globalScope.MutationObserver;
+  var Promise = globalScope.Promise;
+  var setImmediate = globalScope.setInterval;
   var READY_STATE_CHANGE = 'readystatechange';
   var handlers = ['onload', 'onerror', 'onabort', 'onloadstart', 'onloadend', 'onprogress', 'ontimeout'];
   var pendingXhrs = [];
-  var activeListeners = globalScope.XMLHttpRequest.listeners;
   var XHR = 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), eventListenerOpts(false));
+    } catch (e) {
+      warn('An error occurred while intercepting XHR', e);
       try {
-        ee.emit('new-xhr', [xhr], xhr);
-        xhr.addEventListener(READY_STATE_CHANGE, wrapXHR, eventListenerOpts(false));
-      } catch (e) {
-        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);
@@ -74,14 +69,15 @@ export 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/esm/features/ajax/aggregate/index.js

@@ -10,7 +10,6 @@ import { getConfiguration, getInfo, getRuntime } from '../../../common/config/co
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler';
 import { setDenyList, shouldCollectEvent } from '../../../common/deny-list/deny-list';
 import { FEATURE_NAME } from '../constants';
-import { drain } from '../../../common/drain/drain';
 import { FEATURE_NAMES } from '../../../loaders/features/features';
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants';
 import { AggregateBase } from '../../utils/aggregate-base';
@@ -22,7 +21,7 @@ export class Aggregate extends AggregateBase {
     const allAjaxIsEnabled = agentInit.ajax.enabled !== false;
     register('xhr', storeXhr, this.featureName, this.ee);
     if (!allAjaxIsEnabled) {
-      drain(this.agentIdentifier, this.featureName);
+      this.drain();
       return; // feature will only collect timeslice metrics & ajax trace nodes if it's not fully enabled
     }
 
@@ -64,8 +63,7 @@ export class Aggregate extends AggregateBase {
     ee.on("drain-".concat(this.featureName), () => {
       scheduler.startTimer(harvestTimeSeconds);
     });
-    drain(this.agentIdentifier, this.featureName);
-    return;
+    this.drain();
     function storeXhr(params, metrics, startTime, endTime, type) {
       metrics.time = startTime;
 
@@ -97,9 +95,9 @@ export class Aggregate extends 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/esm/features/ajax/instrument/distributed-tracing.js

@@ -10,22 +10,18 @@ import { stringify } from '../../../common/util/stringify';
 export 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 = getLoaderConfig(this.agentIdentifier);
-    if (!loader_config) {
+    var loaderConfig = 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;
     }
@@ -33,9 +29,9 @@ export class DT {
     var traceId = 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/esm/features/ajax/instrument/index.js

@@ -5,7 +5,7 @@
 import { originals, getLoaderConfig, getRuntime } from '../../../common/config/config';
 import { handle } from '../../../common/event-emitter/handle';
 import { id } from '../../../common/ids/id';
-import { ffVersion, globalScope } from '../../../common/constants/runtime';
+import { ffVersion, globalScope, isBrowserScope } from '../../../common/constants/runtime';
 import { dataSize } from '../../../common/util/data-size';
 import { eventListenerOpts } from '../../../common/event-listener/event-listener-opts';
 import { now } from '../../../common/timing/now';
@@ -19,7 +19,7 @@ import { FEATURE_NAMES } from '../../../loaders/features/features';
 var handlers = ['load', 'error', 'abort', 'timeout'];
 var handlersLen = handlers.length;
 var origRequest = originals.REQ;
-var origXHR = globalScope.XMLHttpRequest;
+var origXHR = originals.XHR;
 export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
@@ -30,6 +30,38 @@ export class Instrument extends InstrumentBase {
     if (!getRuntime(agentIdentifier).xhrWrappable) return;
     this.dt = new DT(agentIdentifier);
     this.handler = (type, args, ctx, group) => 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'
+      };
+      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, FEATURE_NAMES.ajax);
+        }
+      });
+    } catch (err) {
+      // do nothing
+    }
     wrapFetch(this.ee);
     wrapXhr(this.ee);
     subscribeToEvents(agentIdentifier, this.ee, this.handler, this.dt);
@@ -89,9 +121,9 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     this.metrics = {};
   }
   function onOpenXhrEnd(args, xhr) {
-    var loader_config = getLoaderConfig(agentIdentifier);
-    if (loader_config.xpid && this.sameOrigin) {
-      xhr.setRequestHeader('X-NewRelic-ID', loader_config.xpid);
+    var loaderConfig = getLoaderConfig(agentIdentifier);
+    if (loaderConfig.xpid && this.sameOrigin) {
+      xhr.setRequestHeader('X-NewRelic-ID', loaderConfig.xpid);
     }
     var payload = dt.generateTracePayload(this.parsedOrigin);
     if (payload) {
@@ -185,15 +217,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 && isBrowserScope) {
+        url = '' + globalScope.location.href;
+      }
     } else if (args[0] && args[0].url) {
+      // argument is Request object
       url = args[0].url;
-      // argument is URL object
     } else if (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 = parseUrl(url);
@@ -203,7 +245,11 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     if (!payload || !payload.newrelicHeader && !payload.traceContextParentHeader) {
       return;
     }
-    if (typeof args[0] === 'string' || 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];
@@ -217,10 +263,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;
@@ -263,7 +305,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 = now();
     if (!this.params) {
       this.params = {};
@@ -304,17 +346,6 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     metrics.cbTime = this.cbTime;
     handler('xhr', [params, metrics, this.startTime, this.endTime, 'xhr'], this, FEATURE_NAMES.ajax);
   }
-  function addUrl(ctx, url) {
-    var parsed = 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 = responseSizeFromXhr(xhr, ctx.lastSize);
@@ -327,4 +358,15 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     }
     ctx.loadCaptureCalled = true;
   }
+}
+function addUrl(ctx, url) {
+  var parsed = 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/esm/features/jserrors/aggregate/canonical-function-name.js

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

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

@@ -62,8 +62,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.
@@ -197,7 +197,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'
     };
@@ -242,7 +242,7 @@ function computeStackTraceBySourceAndLine(ex) {
     mode: 'sourceline',
     name: className,
     message: ex.message,
-    stackString: stackString,
+    stackString,
     frames: [{
       url: canonicalUrl,
       line: ex.line,

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

@@ -16,7 +16,6 @@ import { getInfo, getConfigurationValue, getRuntime } from '../../../common/conf
 import { now } from '../../../common/timing/now';
 import { globalScope } from '../../../common/constants/runtime';
 import { FEATURE_NAME } from '../constants';
-import { drain } from '../../../common/drain/drain';
 import { FEATURE_NAMES } from '../../../loaders/features/features';
 import { AggregateBase } from '../../utils/aggregate-base';
 
@@ -34,7 +33,7 @@ export class Aggregate extends AggregateBase {
     this.observedAt = {};
     this.pageviewReported = {};
     this.errorCache = {};
-    this.currentBody;
+    this.currentBody = undefined;
     this.errorOnPage = false;
 
     // this will need to change to match whatever ee we use in the instrument
@@ -68,7 +67,7 @@ export class Aggregate extends AggregateBase {
       this.blocked = true;
       scheduler.stopTimer(true);
     }, this.featureName, this.ee);
-    drain(this.agentIdentifier, this.featureName);
+    this.drain();
   }
   onHarvestStarted(options) {
     // this gets rid of dependency in AJAX module
@@ -77,7 +76,7 @@ export class Aggregate extends AggregateBase {
       this.currentBody = body;
     }
     var payload = {
-      body: body,
+      body,
       qs: {}
     };
     var releaseIds = stringify(getRuntime(this.agentIdentifier).releaseIds);
@@ -187,7 +186,7 @@ export class Aggregate extends AggregateBase {
     params.firstOccurrenceTimestamp = this.observedAt[bucketHash];
     var type = internal ? 'ierr' : 'err';
     var newMetrics = {
-      time: time
+      time
     };
 
     // sr, stn and spa aggregators listen to this event - stn sends the error in its payload,