@newrelic/browser-agent 1.236.0 → 1.237.1

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

@@ -25,6 +25,7 @@ const model = () => {
     // *cli - per discussion, default should be true
     ajax: {
       deny_list: undefined,
+      block_internal: true,
       enabled: true,
       harvestTimeSeconds: 10
     },

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

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

package/dist/cjs/common/constants/env.cdn.js

@@ -12,7 +12,7 @@ exports.VERSION = exports.DIST_METHOD = exports.BUILD_ENV = void 0;
 /**
  * Exposes the version of the agent
  */
-const VERSION = "1.236.0";
+const VERSION = "1.237.1";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/env.npm.js

@@ -12,7 +12,7 @@ exports.VERSION = exports.DIST_METHOD = exports.BUILD_ENV = void 0;
 /**
  * Exposes the version of the agent
  */
-const VERSION = "1.236.0";
+const VERSION = "1.237.1";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/deny-list/deny-list.js

@@ -47,24 +47,28 @@ function setDenyList(denyListConfig) {
     return;
   }
   for (var i = 0; i < denyListConfig.length; i++) {
-    var url = denyListConfig[i];
+    let url = denyListConfig[i];
+    if (!url) continue; // ignore bad values like undefined or empty strings
+
     if (url.indexOf('http://') === 0) {
       url = url.substring(7);
     } else if (url.indexOf('https://') === 0) {
       url = url.substring(8);
     }
-    var firstSlash = url.indexOf('/');
+    const firstSlash = url.indexOf('/');
+    let host, pathname;
     if (firstSlash > 0) {
-      denyList.push({
-        hostname: url.substring(0, firstSlash),
-        pathname: url.substring(firstSlash)
-      });
+      host = url.substring(0, firstSlash);
+      pathname = url.substring(firstSlash);
     } else {
-      denyList.push({
-        hostname: url,
-        pathname: ''
-      });
+      host = url;
+      pathname = '';
     }
+    let [hostname, port] = host.split(':');
+    denyList.push({
+      hostname,
+      pathname
+    });
   }
 }
 /**

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

@@ -17,6 +17,7 @@ var _traverse = require("../util/traverse");
 var _sharedContext = require("../context/shared-context");
 var _env = require("../constants/env.npm");
 var _runtime = require("../constants/runtime");
+var _console = require("../util/console");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /*
@@ -24,6 +25,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * SPDX-License-Identifier: Apache-2.0
  */
 
+const warnings = {};
+
 /**
  * @typedef {import('./types.js').NetworkSendSpec} NetworkSendSpec
  * @typedef {import('./types.js').HarvestEndpointIdentifier} HarvestEndpointIdentifier
@@ -31,7 +34,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * @typedef {import('./types.js').FeatureHarvestCallback} FeatureHarvestCallback
  * @typedef {import('./types.js').FeatureHarvestCallbackOptions} FeatureHarvestCallbackOptions
  */
-
 class Harvest extends _sharedContext.SharedContext {
   constructor(parent) {
     super(parent); // gets any allowed properties from the parent and stores them in `sharedContext`
@@ -142,13 +144,15 @@ class Harvest extends _sharedContext.SharedContext {
       payloadParams = payloadParams.substring(1);
     }
     const fullUrl = "".concat(url, "?").concat(baseParams).concat(payloadParams);
-    const gzip = qs.content_encoding === 'gzip';
+    const gzip = !!qs?.attributes?.includes('gzip');
     if (!gzip) {
       if (endpoint === 'events') {
         body = body.e;
       } else {
         body = (0, _stringify.stringify)(body);
       }
+      /** Warn --once per endpoint-- if the agent tries to send large payloads */
+      if (body.length > 750000 && (warnings[endpoint] = (warnings?.[endpoint] || 0) + 1) === 1) (0, _console.warn)("The Browser Agent is attempting to send a very large payload to /".concat(endpoint, ". This is usually tied to large amounts of custom attributes. Please check your configurations."));
     }
     if (!body || body.length === 0 || body === '{}' || body === '[]') {
       // If body is null, undefined, or an empty object or array, send an empty string instead
@@ -195,23 +199,6 @@ class Harvest extends _sharedContext.SharedContext {
         cbFinished(cbResult);
       }, (0, _eventListenerOpts.eventListenerOpts)(false));
     }
-
-    // if beacon request failed, retry with an alternative method -- will not happen for workers
-    if (!result && submitMethod === submitData.beacon) {
-      // browsers that support sendBeacon also support fetch with keepalive - IE will not retry unload calls
-      submitMethod = submitData.fetchKeepAlive;
-      try {
-        submitMethod({
-          url: fullUrl,
-          body,
-          headers
-        });
-      } catch (e) {
-        // Ignore error in final harvest
-      } finally {
-        result = true;
-      }
-    }
     return result;
   }
 
@@ -271,9 +258,8 @@ class Harvest extends _sharedContext.SharedContext {
   cleanPayload() {
     let payload = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const clean = input => {
-      if (typeof Uint8Array !== 'undefined' && input instanceof Uint8Array) {
-        return input.length > 0 ? input : null;
-      }
+      if (typeof Uint8Array !== 'undefined' && input instanceof Uint8Array || Array.isArray(input)) return input;
+      if (typeof input === 'string') return input.length > 0 ? input : null;
       return Object.entries(input || {}).reduce((accumulator, _ref2) => {
         let [key, value] = _ref2;
         if (typeof value === 'number' || typeof value === 'string' && value.length > 0 || typeof value === 'object' && Object.keys(value || {}).length > 0) {

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.beacon = beacon;
-exports.fetchKeepAlive = fetchKeepAlive;
 exports.getSubmitMethod = getSubmitMethod;
 exports.xhr = xhr;
 var _runtime = require("../constants/runtime");
@@ -15,7 +14,7 @@ var _runtime = require("../constants/runtime");
  */
 
 /**
- * @typedef {xhr|fetchKeepAlive|beacon} NetworkMethods
+ * @typedef {xhr|beacon} NetworkMethods
  */
 
 /**
@@ -72,36 +71,6 @@ function xhr(_ref) {
   return request;
 }
 
-/**
- * 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}
- */
-function fetchKeepAlive(_ref2) {
-  let {
-    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.
  * @param {Object} args - The args
@@ -109,11 +78,11 @@ function fetchKeepAlive(_ref2) {
  * @param {string=} args.body - The Stringified body
  * @returns {boolean}
  */
-function beacon(_ref3) {
+function beacon(_ref2) {
   let {
     url,
     body
-  } = _ref3;
+  } = _ref2;
   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
@@ -121,8 +90,7 @@ function beacon(_ref3) {
     return send(url, body);
   } 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
-    // fetchKeepAlive to try to send
+    // we can catch here and return
     return false;
   }
 }

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

@@ -93,13 +93,19 @@ function wrapJsonP(sharedEE) {
     var matches = src.match(CALLBACK_REGEX);
     return matches ? matches[1] : null;
   }
+
+  /**
+   * Traverse a nested object using a '.'-delimited string wherein each substring piece maps to each subsequent object property layer.
+   * @param {string} longKey
+   * @param {object} obj
+   * @returns The final nested object referred to by initial longKey.
+   */
   function discoverValue(longKey, obj) {
-    var matches = longKey.match(VALUE_REGEX);
-    var key = matches[1];
-    var remaining = matches[3];
-    if (!remaining) {
-      return obj[key];
-    }
+    if (!longKey) return obj; // end of object recursion depth when no more key levels
+    const matches = longKey.match(VALUE_REGEX);
+    // if 'longKey' was not undefined, that is it at least had 1 level left, then the regexp would've at least matched 1st group
+    const key = matches[1];
+    const remaining = matches[3];
     return discoverValue(remaining, obj[key]);
   }
   function discoverParent(key) {

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

@@ -25,13 +25,22 @@ class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
+    const agentInit = (0, _config.getConfiguration)(agentIdentifier);
+    const allAjaxIsEnabled = agentInit.ajax.enabled !== false;
+    (0, _registerHandler.registerHandler)('xhr', storeXhr, this.featureName, this.ee);
+    if (!allAjaxIsEnabled) {
+      (0, _drain.drain)(this.agentIdentifier, this.featureName);
+      return; // feature will only collect timeslice metrics & ajax trace nodes if it's not fully enabled
+    }
+
+    const denyList = (0, _config.getRuntime)(agentIdentifier).denyList;
+    (0, _denyList.setDenyList)(denyList);
     let ajaxEvents = [];
     let spaAjaxEvents = {};
     let sentAjaxEvents = [];
-    let scheduler;
     const ee = this.ee;
-    const harvestTimeSeconds = (0, _config.getConfigurationValue)(agentIdentifier, 'ajax.harvestTimeSeconds') || 10;
-    const MAX_PAYLOAD_SIZE = (0, _config.getConfigurationValue)(agentIdentifier, 'ajax.maxPayloadSize') || 1000000;
+    const harvestTimeSeconds = agentInit.ajax.harvestTimeSeconds || 10;
+    const MAX_PAYLOAD_SIZE = agentInit.ajax.maxPayloadSize || 1000000;
 
     // Exposes these methods to browser test files -- future TO DO: can be removed once these fns are extracted from the constructor into class func
     this.storeXhr = storeXhr;
@@ -48,24 +57,22 @@ class Aggregate extends _aggregateBase.AggregateBase {
       delete spaAjaxEvents[interaction.id];
     });
     ee.on('interactionDiscarded', interaction => {
-      if (!spaAjaxEvents[interaction.id] || !allAjaxIsEnabled()) return;
+      if (!spaAjaxEvents[interaction.id]) return;
       spaAjaxEvents[interaction.id].forEach(function (item) {
         // move it from the spaAjaxEvents buffer to the ajaxEvents buffer for harvesting here
         ajaxEvents.push(item);
       });
       delete spaAjaxEvents[interaction.id];
     });
-    if (allAjaxIsEnabled()) (0, _denyList.setDenyList)((0, _config.getConfigurationValue)(agentIdentifier, 'ajax.deny_list'));
-    (0, _registerHandler.registerHandler)('xhr', storeXhr, this.featureName, this.ee);
-    if (allAjaxIsEnabled()) {
-      scheduler = new _harvestScheduler.HarvestScheduler('events', {
-        onFinished: onEventsHarvestFinished,
-        getPayload: prepareHarvest
-      }, this);
-      ee.on("drain-".concat(this.featureName), () => {
-        scheduler.startTimer(harvestTimeSeconds);
-      });
-    }
+    const scheduler = new _harvestScheduler.HarvestScheduler('events', {
+      onFinished: onEventsHarvestFinished,
+      getPayload: prepareHarvest
+    }, this);
+    ee.on("drain-".concat(this.featureName), () => {
+      scheduler.startTimer(harvestTimeSeconds);
+    });
+    (0, _drain.drain)(this.agentIdentifier, this.featureName);
+    return;
     function storeXhr(params, metrics, startTime, endTime, type) {
       metrics.time = startTime;
 
@@ -80,9 +87,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
 
       // store as metric
       aggregator.store('xhr', hash, params, metrics);
-      if (!allAjaxIsEnabled()) {
-        return;
-      }
+      if (!allAjaxIsEnabled) return;
       if (!(0, _denyList.shouldCollectEvent)(params)) {
         if (params.hostname === (0, _config.getInfo)(agentIdentifier).errorBeacon) {
           (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Ajax/Events/Excluded/Agent'], undefined, _features.FEATURE_NAMES.metrics, ee);
@@ -164,7 +169,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       return tooBig ? getPayload(events, maxPayloadSize, ++chunks) : payload;
     }
     function onEventsHarvestFinished(result) {
-      if (result.retry && sentAjaxEvents.length > 0 && allAjaxIsEnabled()) {
+      if (result.retry && sentAjaxEvents.length > 0) {
         ajaxEvents.unshift(...sentAjaxEvents);
         sentAjaxEvents = [];
       }
@@ -213,14 +218,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
         return this.payload.length * 2 > maxPayloadSize;
       };
     }
-    function allAjaxIsEnabled() {
-      var enabled = (0, _config.getConfigurationValue)(agentIdentifier, 'ajax.enabled');
-      if (enabled === false) {
-        return false;
-      }
-      return true;
-    }
-    (0, _drain.drain)(this.agentIdentifier, this.featureName);
   }
 }
 exports.Aggregate = Aggregate;

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

@@ -229,7 +229,7 @@ function computeStackTraceBySourceAndLine(ex) {
       mode: 'sourceline',
       name: className,
       message: ex.message,
-      stackString: getClassName(ex) + ': ' + ex.message + '\n    in evaluated code',
+      stackString: className + ': ' + ex.message + '\n    in evaluated code',
       frames: [{
         func: 'evaluated code'
       }]

package/dist/cjs/features/jserrors/constants.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.NR_ERR_PROP = exports.FEATURE_NAME = void 0;
+exports.FEATURE_NAME = void 0;
 var _features = require("../../loaders/features/features");
 const FEATURE_NAME = _features.FEATURE_NAMES.jserrors;
-exports.FEATURE_NAME = FEATURE_NAME;
-const NR_ERR_PROP = 'nr@seenError';
-exports.NR_ERR_PROP = NR_ERR_PROP;
+exports.FEATURE_NAME = FEATURE_NAME;

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

@@ -6,16 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.Instrument = void 0;
 var _handle = require("../../../common/event-emitter/handle");
 var _now = require("../../../common/timing/now");
-var _getOrSet = require("../../../common/util/get-or-set");
-var _wrap = require("../../../common/wrap");
-require("./debug");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
 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");
+var _uncaughtError = require("./uncaught-error");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -23,51 +20,44 @@ var _stringify = require("../../../common/util/stringify");
 
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
+  #seenErrors = new Set();
   constructor(agentIdentifier, aggregator) {
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
-    // skipNext counter to keep track of uncaught
-    // errors that will be the same as caught errors.
-    this.skipNext = 0;
     try {
       // this try-catch can be removed when IE11 is completely unsupported & gone
       this.removeOnAbort = new AbortController();
     } catch (e) {}
-    const thisInstrument = this;
-    thisInstrument.ee.on('fn-start', function (args, obj, methodName) {
-      if (thisInstrument.abortHandler) thisInstrument.skipNext += 1;
-    });
-    thisInstrument.ee.on('fn-err', function (args, obj, err) {
-      if (thisInstrument.abortHandler && !err[_constants.NR_ERR_PROP]) {
-        (0, _getOrSet.getOrSet)(err, _constants.NR_ERR_PROP, function getVal() {
-          return true;
-        });
-        this.thrown = true;
-        (0, _handle.handle)('err', [err, (0, _now.now)()], undefined, _features.FEATURE_NAMES.jserrors, thisInstrument.ee);
-      }
-    });
-    thisInstrument.ee.on('fn-end', function () {
-      if (!thisInstrument.abortHandler) return;
-      if (!this.thrown && thisInstrument.skipNext > 0) thisInstrument.skipNext -= 1;
+
+    // Capture function errors early in case the spa feature is loaded
+    this.ee.on('fn-err', (args, obj, error) => {
+      if (!this.abortHandler || this.#seenErrors.has(error)) return;
+      this.#seenErrors.add(error);
+      (0, _handle.handle)('err', [this.#castError(error), (0, _now.now)()], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
     });
-    thisInstrument.ee.on('internal-error', function (e) {
-      (0, _handle.handle)('ierr', [e, (0, _now.now)(), true], undefined, _features.FEATURE_NAMES.jserrors, thisInstrument.ee);
+    this.ee.on('internal-error', error => {
+      if (!this.abortHandler) return;
+      (0, _handle.handle)('ierr', [this.#castError(error), (0, _now.now)(), true], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
     });
-
-    // Replace global error handler with our own.
-    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, {
+    _runtime.globalScope.addEventListener('unhandledrejection', promiseRejectionEvent => {
+      if (!this.abortHandler) return;
+      (0, _handle.handle)('err', [this.#castPromiseRejectionEvent(promiseRejectionEvent), (0, _now.now)(), false, {
         unhandledPromiseRejection: 1
       }], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
     }, (0, _eventListenerOpts.eventListenerOpts)(false, this.removeOnAbort?.signal));
-    (0, _wrap.wrapRaf)(this.ee);
-    (0, _wrap.wrapTimer)(this.ee);
-    (0, _wrap.wrapEvents)(this.ee);
-    if ((0, _config.getRuntime)(agentIdentifier).xhrWrappable) (0, _wrap.wrapXhr)(this.ee);
+    _runtime.globalScope.addEventListener('error', errorEvent => {
+      if (!this.abortHandler) return;
+
+      /**
+       * If the spa feature is loaded, errors may already have been captured in the `fn-err` listener above.
+       * This ensures those errors are not captured twice.
+       */
+      if (this.#seenErrors.has(errorEvent.error)) {
+        this.#seenErrors.delete(errorEvent.error);
+        return;
+      }
+      (0, _handle.handle)('err', [this.#castErrorEvent(errorEvent), (0, _now.now)()], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+    }, (0, _eventListenerOpts.eventListenerOpts)(false, this.removeOnAbort?.signal));
     this.abortHandler = this.#abort; // we also use this as a flag to denote that the feature is active or on and handling errors
     this.importAggregator();
   }
@@ -75,66 +65,67 @@ class Instrument extends _instrumentBase.InstrumentBase {
   /** Restoration and resource release tasks to be done if JS error loader is being aborted. Unwind changes to globals. */
   #abort() {
     this.removeOnAbort?.abort();
+    this.#seenErrors.clear();
     this.abortHandler = undefined; // weakly allow this abort op to run only once
   }
 
   /**
-   * FF and Android browsers do not provide error info to the 'error' event callback,
-   * so we must use window.onerror
-   * @param {string} message
-   * @param {string} filename
-   * @param {number} lineno
-   * @param {number} column
-   * @param {Error | *} errorObj
-   * @returns
+   * Any value can be used with the `throw` keyword. This function ensures that the value is
+   * either a proper Error instance or attempts to convert it to an UncaughtError instance.
+   * @param {any} error The value thrown
+   * @returns {Error|UncaughtError} The converted error instance
    */
-  onerrorHandler(message, filename, lineno, column, errorObj) {
-    if (typeof this.origOnerror === 'function') this.origOnerror(...arguments);
-    try {
-      if (this.skipNext) this.skipNext -= 1;else (0, _handle.handle)('err', [errorObj || new UncaughtException(message, filename, lineno), (0, _now.now)()], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
-    } catch (e) {
+  #castError(error) {
+    if (error instanceof Error) {
+      return error;
+    }
+
+    /**
+     * The thrown value may contain a message property. If it does, try to treat the thrown
+     * value as an Error-like object.
+     */
+    if (typeof error?.message !== 'undefined') {
+      return new _uncaughtError.UncaughtError(error.message, error.filename || error.sourceURL, error.lineno || error.line, error.colno || error.col);
+    }
+    return new _uncaughtError.UncaughtError(typeof error === 'string' ? error : (0, _stringify.stringify)(error));
+  }
+
+  /**
+   * Attempts to convert a PromiseRejectionEvent object to an Error object
+   * @param {PromiseRejectionEvent} unhandledRejectionEvent The unhandled promise rejection event
+   * @returns {Error} An Error object with the message as the casted reason
+   */
+  #castPromiseRejectionEvent(promiseRejectionEvent) {
+    let prefix = 'Unhandled Promise Rejection: ';
+    if (promiseRejectionEvent?.reason instanceof Error) {
       try {
-        (0, _handle.handle)('ierr', [e, (0, _now.now)(), true], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
-      } catch (err) {
-        // do nothing
+        promiseRejectionEvent.reason.message = prefix + promiseRejectionEvent.reason.message;
+        return promiseRejectionEvent.reason;
+      } catch (e) {
+        return promiseRejectionEvent.reason;
       }
     }
-    return false; // maintain default behavior of the error event of Window
+    if (typeof promiseRejectionEvent.reason === 'undefined') return new _uncaughtError.UncaughtError(prefix);
+    const error = this.#castError(promiseRejectionEvent.reason);
+    error.message = prefix + error.message;
+    return error;
   }
-}
 
-/**
- *
- * @param {string} message
- * @param {string} filename
- * @param {number} lineno
- */
-exports.Instrument = Instrument;
-function UncaughtException(message, filename, lineno) {
-  this.message = message || 'Uncaught error with no additional information';
-  this.sourceURL = filename;
-  this.line = lineno;
-}
-
-/**
- * Attempts to cast an unhandledPromiseRejection reason (reject(...)) to an Error object
- * @param {*} reason - The reason property from an unhandled promise rejection
- * @returns {Error} - An Error object with the message as the casted reason
- */
-function castReasonToError(reason) {
-  let prefix = 'Unhandled Promise Rejection: ';
-  if (reason instanceof Error) {
-    try {
-      reason.message = prefix + reason.message;
-      return reason;
-    } catch (e) {
-      return reason;
+  /**
+   * Attempts to convert an ErrorEvent object to an Error object
+   * @param {ErrorEvent} errorEvent The error event
+   * @returns {Error|UncaughtError} The error event converted to an Error object
+   */
+  #castErrorEvent(errorEvent) {
+    if (errorEvent.error instanceof Error) {
+      return errorEvent.error;
     }
+
+    /**
+     * Older browsers do not contain the `error` property on the ErrorEvent instance.
+     * https://caniuse.com/mdn-api_errorevent_error
+     */
+    return new _uncaughtError.UncaughtError(errorEvent.message, errorEvent.filename, errorEvent.lineno, errorEvent.colno);
   }
-  if (typeof reason === 'undefined') return new Error(prefix);
-  try {
-    return new Error(prefix + (0, _stringify.stringify)(reason));
-  } catch (err) {
-    return new Error(prefix);
-  }
-}
+}
+exports.Instrument = Instrument;

package/dist/cjs/features/jserrors/instrument/uncaught-error.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.UncaughtError = void 0;
+/**
+ * Represents an uncaught non Error type error. This class does
+ * not extend the Error class to prevent an invalid stack trace
+ * from being created. Use this class to cast thrown errors that
+ * do not use the Error class (strings, etc) to an object.
+ */
+class UncaughtError {
+  constructor(message, filename, lineno, colno) {
+    this.name = 'UncaughtError';
+    this.message = message;
+    this.sourceURL = filename;
+    this.line = lineno;
+    this.column = colno;
+  }
+}
+exports.UncaughtError = UncaughtError;

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

@@ -154,6 +154,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
       // Capture metrics for size of custom attributes
       const jsAttributes = (0, _stringify.stringify)(info.jsAttributes);
       this.storeSupportabilityMetrics('PageSession/Feature/CustomData/Bytes', jsAttributes === '{}' ? 0 : jsAttributes.length);
+
+      // Capture metrics for performance markers and measures
+      if (typeof performance !== 'undefined') {
+        const markers = performance.getEntriesByType('mark');
+        const measures = performance.getEntriesByType('measure');
+        this.storeSupportabilityMetrics('Generic/Performance/Mark/Seen', markers.length);
+        this.storeSupportabilityMetrics('Generic/Performance/Measure/Seen', measures.length);
+      }
     } catch (e) {
       // do nothing
     }