@newrelic/browser-agent 1.264.0 → 1.265.0

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

@@ -7,7 +7,9 @@ exports.Aggregate = void 0;
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _stringify = require("../../../common/util/stringify");
 var _handle = require("../../../common/event-emitter/handle");
-var _config = require("../../../common/config/config");
+var _info = require("../../../common/config/info");
+var _init = require("../../../common/config/init");
+var _runtime = require("../../../common/config/runtime");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _denyList = require("../../../common/deny-list/deny-list");
 var _constants = require("../constants");
@@ -17,6 +19,7 @@ var _aggregateBase = require("../../utils/aggregate-base");
 var _gql = require("./gql");
 var _nreum = require("../../../common/window/nreum");
 var _chunk = _interopRequireDefault(require("./chunk"));
+var _eventBuffer = require("../../utils/event-buffer");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -24,35 +27,33 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  */
 
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = (() => _constants.FEATURE_NAME)();
+  static featureName = _constants.FEATURE_NAME;
   #agentInfo;
   #agentRuntime;
   #agentInit;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
-    this.#agentInfo = (0, _config.getInfo)(agentIdentifier);
-    this.#agentRuntime = (0, _config.getRuntime)(agentIdentifier);
-    this.#agentInit = (0, _config.getConfiguration)(agentIdentifier);
+    this.#agentInfo = (0, _info.getInfo)(agentIdentifier);
+    this.#agentRuntime = (0, _runtime.getRuntime)(agentIdentifier);
+    this.#agentInit = (0, _init.getConfiguration)(agentIdentifier);
     const harvestTimeSeconds = this.#agentInit.ajax.harvestTimeSeconds || 10;
-    this.MAX_PAYLOAD_SIZE = this.#agentInit.ajax.maxPayloadSize || 1000000;
     (0, _denyList.setDenyList)(this.#agentRuntime.denyList);
-    this.ajaxEvents = [];
+    this.ajaxEvents = new _eventBuffer.EventBuffer();
     this.spaAjaxEvents = {};
-    this.sentAjaxEvents = [];
     const classThis = this;
 
     // --- v Used by old spa feature
     this.ee.on('interactionDone', (interaction, wasSaved) => {
-      if (!this.spaAjaxEvents[interaction.id]) return;
+      if (!this.spaAjaxEvents[interaction.id]?.hasData) return;
       if (!wasSaved) {
         // if the ixn was saved, then its ajax reqs are part of the payload whereas if it was discarded, it should still be harvested in the ajax feature itself
-        this.spaAjaxEvents[interaction.id].forEach(item => this.ajaxEvents.push(item));
+        this.ajaxEvents.merge(this.spaAjaxEvents[interaction.id]);
       }
       delete this.spaAjaxEvents[interaction.id];
     });
     // --- ^
     // --- v Used by new soft nav
-    (0, _registerHandler.registerHandler)('returnAjax', event => this.ajaxEvents.push(event), this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('returnAjax', event => this.ajaxEvents.add(event), this.featureName, this.ee);
     // --- ^
     (0, _registerHandler.registerHandler)('xhr', function () {
       // the EE-drain system not only switches "this" but also passes a new EventContext with info. Should consider platform refactor to another system which passes a mutable context around separately and predictably to avoid problems like this.
@@ -112,7 +113,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (ctx.dt) {
       event.spanId = ctx.dt.spanId;
       event.traceId = ctx.dt.traceId;
-      event.spanTimestamp = this.#agentRuntime.timeKeeper.correctAbsoluteTimestamp(ctx.dt.timestamp);
+      event.spanTimestamp = Math.floor(this.#agentRuntime.timeKeeper.correctAbsoluteTimestamp(ctx.dt.timestamp));
     }
 
     // parsed from the AJAX body, looking for operationName param & parsing query for operationType
@@ -128,31 +129,27 @@ class Aggregate extends _aggregateBase.AggregateBase {
     } else if (ctx.spaNode) {
       // For old spa (when running), if the ajax happened inside an interaction, hold it until the interaction finishes
       const interactionId = ctx.spaNode.interaction.id;
-      this.spaAjaxEvents[interactionId] = this.spaAjaxEvents[interactionId] || [];
-      this.spaAjaxEvents[interactionId].push(event);
+      this.spaAjaxEvents[interactionId] ??= new _eventBuffer.EventBuffer();
+      this.spaAjaxEvents[interactionId].add(event);
     } else {
-      this.ajaxEvents.push(event);
+      this.ajaxEvents.add(event);
     }
   }
   prepareHarvest(options) {
     options = options || {};
-    if (this.ajaxEvents.length === 0) return null;
-    const payload = this.#getPayload(this.ajaxEvents);
+    if (this.ajaxEvents.buffer.length === 0) return null;
+    const payload = this.#getPayload(this.ajaxEvents.buffer);
     const payloadObjs = [];
     for (let i = 0; i < payload.length; i++) payloadObjs.push({
       body: {
         e: payload[i]
       }
     });
-    if (options.retry) this.sentAjaxEvents = this.ajaxEvents;
-    this.ajaxEvents = [];
+    if (options.retry) this.ajaxEvents.hold();else this.ajaxEvents.clear();
     return payloadObjs;
   }
   onEventsHarvestFinished(result) {
-    if (result.retry && this.sentAjaxEvents.length > 0) {
-      this.ajaxEvents.unshift(...this.sentAjaxEvents);
-      this.sentAjaxEvents = [];
-    }
+    if (result.retry && this.ajaxEvents.held.hasData) this.ajaxEvents.unhold();else this.ajaxEvents.held.clear();
   }
   #getPayload(events, numberOfChunks) {
     numberOfChunks = numberOfChunks || 1;

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

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MAX_PAYLOAD_SIZE = exports.FEATURE_NAME = void 0;
+exports.FEATURE_NAME = void 0;
 var _features = require("../../loaders/features/features");
-const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.ajax;
-const MAX_PAYLOAD_SIZE = exports.MAX_PAYLOAD_SIZE = 1000000;
+const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.ajax;

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

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DT = void 0;
-var _config = require("../../../common/config/config");
+var _init = require("../../../common/config/init");
+var _loaderConfig = require("../../../common/config/loader-config");
 var _uniqueId = require("../../../common/ids/unique-id");
 var _parseUrl = require("../../../common/url/parse-url");
 var _runtime = require("../../../common/constants/runtime");
@@ -22,7 +23,7 @@ class DT {
     if (!this.shouldGenerateTrace(parsedOrigin)) {
       return null;
     }
-    var loaderConfig = (0, _config.getLoaderConfig)(this.agentIdentifier);
+    var loaderConfig = (0, _loaderConfig.getLoaderConfig)(this.agentIdentifier);
     if (!loaderConfig) {
       return null;
     }
@@ -90,9 +91,9 @@ class DT {
   isAllowedOrigin(parsedOrigin) {
     var allowed = false;
     var dtConfig = {};
-    var dt = (0, _config.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
+    var dt = (0, _init.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
     if (dt) {
-      dtConfig = (0, _config.getConfiguration)(this.agentIdentifier).distributed_tracing;
+      dtConfig = (0, _init.getConfiguration)(this.agentIdentifier).distributed_tracing;
     }
     if (parsedOrigin.sameOrigin) {
       allowed = true;
@@ -108,7 +109,7 @@ class DT {
     return allowed;
   }
   isDtEnabled() {
-    var dt = (0, _config.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
+    var dt = (0, _init.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
     if (dt) {
       return !!dt.enabled;
     }
@@ -117,21 +118,21 @@ class DT {
 
   // exclude the newrelic header for same-origin calls
   excludeNewrelicHeader() {
-    var dt = (0, _config.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
+    var dt = (0, _init.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
     if (dt) {
       return !!dt.exclude_newrelic_header;
     }
     return false;
   }
   useNewrelicHeaderForCors() {
-    var dt = (0, _config.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
+    var dt = (0, _init.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
     if (dt) {
       return dt.cors_use_newrelic_header !== false;
     }
     return false;
   }
   useTraceContextHeadersForCors() {
-    var dt = (0, _config.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
+    var dt = (0, _init.getConfigurationValue)(this.agentIdentifier, 'distributed_tracing');
     if (dt) {
       return !!dt.cors_use_tracecontext_headers;
     }

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

@@ -3,14 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Instrument = void 0;
-var _config = require("../../../common/config/config");
+exports.Instrument = exports.Ajax = void 0;
+var _nreum = require("../../../common/window/nreum");
+var _loaderConfig = require("../../../common/config/loader-config");
 var _handle = require("../../../common/event-emitter/handle");
 var _id = require("../../../common/ids/id");
 var _runtime = require("../../../common/constants/runtime");
 var _dataSize = require("../../../common/util/data-size");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
-var _wrap = require("../../../common/wrap");
+var _wrapXhr = require("../../../common/wrap/wrap-xhr");
+var _wrapFetch = require("../../../common/wrap/wrap-fetch");
 var _parseUrl = require("../../../common/url/parse-url");
 var _distributedTracing = require("./distributed-tracing");
 var _responseSize = require("./response-size");
@@ -27,12 +29,11 @@ var _denyList = require("../../../common/deny-list/deny-list");
 
 var handlers = ['load', 'error', 'abort', 'timeout'];
 var handlersLen = handlers.length;
-var origRequest = _config.originals.REQ;
-var origXHR = _config.originals.XHR;
+var origRequest = (0, _nreum.gosNREUMOriginals)().o.REQ;
+var origXHR = (0, _nreum.gosNREUMOriginals)().o.XHR;
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = (() => _constants.FEATURE_NAME)();
-  constructor(agentIdentifier, aggregator) {
-    let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  static featureName = _constants.FEATURE_NAME;
+  constructor(agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
     this.dt = new _distributedTracing.DT(agentIdentifier);
     this.handler = (type, args, ctx, group) => (0, _handle.handle)(type, args, ctx, group, this.ee);
@@ -68,8 +69,8 @@ class Instrument extends _instrumentBase.InstrumentBase {
     } catch (err) {
       // do nothing
     }
-    (0, _wrap.wrapFetch)(this.ee);
-    (0, _wrap.wrapXhr)(this.ee);
+    (0, _wrapFetch.wrapFetch)(this.ee);
+    (0, _wrapXhr.wrapXhr)(this.ee);
     subscribeToEvents(agentIdentifier, this.ee, this.handler, this.dt);
     this.importAggregator();
   }
@@ -128,7 +129,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     this.metrics = {};
   }
   function onOpenXhrEnd(args, xhr) {
-    var loaderConfig = (0, _config.getLoaderConfig)(agentIdentifier);
+    var loaderConfig = (0, _loaderConfig.getLoaderConfig)(agentIdentifier);
     if (loaderConfig.xpid && this.sameOrigin) {
       xhr.setRequestHeader('X-NewRelic-ID', loaderConfig.xpid);
     }
@@ -347,7 +348,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     if ((0, _denyList.hasUndefinedHostname)(params)) return; // don't bother with XHR of url with no hostname
 
     metrics.duration = (0, _now.now)() - this.startTime;
-    if (!this.loadCaptureCalled && xhr.readyState === 4) {
+    if (!this.loadCazptureCalled && xhr.readyState === 4) {
       captureXhrData(this, xhr);
     } else if (params.status == null) {
       params.status = 0;
@@ -381,4 +382,5 @@ function addUrl(ctx, url) {
   params.pathname = parsed.pathname;
   ctx.parsedOrigin = parsed;
   ctx.sameOrigin = parsed.sameOrigin;
-}
+}
+const Ajax = exports.Ajax = Instrument;

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

@@ -7,15 +7,20 @@ exports.Aggregate = void 0;
 var _stringify = require("../../../common/util/stringify");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _cleanUrl = require("../../../common/url/clean-url");
-var _config = require("../../../common/config/config");
+var _info = require("../../../common/config/info");
+var _init = require("../../../common/config/init");
+var _runtime = require("../../../common/config/runtime");
 var _constants = require("../constants");
-var _runtime = require("../../../common/constants/runtime");
+var _runtime2 = require("../../../common/constants/runtime");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _console = require("../../../common/util/console");
 var _now = require("../../../common/timing/now");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _drain = require("../../../common/drain/drain");
 var _constants2 = require("../../metrics/constants");
+var _eventBuffer = require("../../utils/event-buffer");
+var _traverse = require("../../../common/util/traverse");
+var _agentConstants = require("../../../common/constants/agent-constants");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -23,36 +28,31 @@ var _constants2 = require("../../metrics/constants");
 
 class Aggregate extends _aggregateBase.AggregateBase {
   #agentRuntime;
-  static featureName = (() => _constants.FEATURE_NAME)();
+  static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
-    var _this;
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
-    _this = this;
     this.eventsPerHarvest = 1000;
-    this.harvestTimeSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'generic_events.harvestTimeSeconds');
-    this.referrerUrl = _runtime.isBrowserScope && document.referrer ? (0, _cleanUrl.cleanURL)(document.referrer) : undefined;
-    this.currentEvents = [];
-    this.events = [];
-    this.overflow = [];
-    this.#agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
-    this.waitForFlags(['ins']).then(_ref => {
-      let [ins] = _ref;
+    this.harvestTimeSeconds = (0, _init.getConfigurationValue)(this.agentIdentifier, 'generic_events.harvestTimeSeconds');
+    this.referrerUrl = _runtime2.isBrowserScope && document.referrer ? (0, _cleanUrl.cleanURL)(document.referrer) : undefined;
+    this.events = new _eventBuffer.EventBuffer();
+    this.#agentRuntime = (0, _runtime.getRuntime)(this.agentIdentifier);
+    this.waitForFlags(['ins']).then(([ins]) => {
       if (!ins) {
         this.blocked = true;
         (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
         return;
       }
-      if ((0, _config.getConfigurationValue)(this.agentIdentifier, 'page_action.enabled')) {
+      if ((0, _init.getConfigurationValue)(this.agentIdentifier, 'page_action.enabled')) {
         (0, _registerHandler.registerHandler)('api-addPageAction', (timestamp, name, attributes) => {
           this.addEvent({
             ...attributes,
             eventType: 'PageAction',
-            timestamp: this.#agentRuntime.timeKeeper.convertRelativeTimestamp(timestamp),
+            timestamp: Math.floor(this.#agentRuntime.timeKeeper.correctAbsoluteTimestamp(this.#agentRuntime.timeKeeper.convertRelativeTimestamp(timestamp))),
             timeSinceLoad: timestamp / 1000,
             actionName: name,
             referrerUrl: this.referrerUrl,
             currentUrl: (0, _cleanUrl.cleanURL)('' + location),
-            ...(_runtime.isBrowserScope && {
+            ...(_runtime2.isBrowserScope && {
               browserWidth: window.document.documentElement?.clientWidth,
               browserHeight: window.document.documentElement?.clientHeight
             })
@@ -60,47 +60,16 @@ class Aggregate extends _aggregateBase.AggregateBase {
         }, this.featureName, this.ee);
       }
       this.harvestScheduler = new _harvestScheduler.HarvestScheduler('ins', {
-        onFinished: function () {
-          return _this.onHarvestFinished(...arguments);
-        }
+        onFinished: (...args) => this.onHarvestFinished(...args)
       }, this);
-      this.harvestScheduler.harvest.on('ins', function () {
-        return _this.onHarvestStarted(...arguments);
-      });
+      this.harvestScheduler.harvest.on('ins', (...args) => this.onHarvestStarted(...args));
       this.harvestScheduler.startTimer(this.harvestTimeSeconds, 0);
       this.drain();
     });
   }
-  onHarvestStarted(options) {
-    const {
-      userAttributes,
-      atts
-    } = (0, _config.getInfo)(this.agentIdentifier);
-    const harvestEvents = this.overflow.length ? this.overflow.splice(0, Infinity) : this.events.splice(0, Infinity);
-    var payload = {
-      qs: {
-        ua: userAttributes,
-        at: atts
-      },
-      body: {
-        ins: harvestEvents
-      }
-    };
-    if (options.retry) {
-      this.currentEvents = harvestEvents;
-    }
-    return payload;
-  }
-  onHarvestFinished(result) {
-    if (result && result.sent && result.retry && this.currentEvents.length) {
-      this.events = this.currentEvents.concat(this.events);
-      this.currentEvents = [];
-    }
-  }
 
   // WARNING: Insights times are in seconds. EXCEPT timestamp, which is in ms.
-  addEvent() {
-    let obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  addEvent(obj = {}) {
     if (!obj || !Object.keys(obj).length) return;
     if (!obj.eventType) {
       (0, _console.warn)(44);
@@ -112,24 +81,46 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     const defaultEventAttributes = {
       /** should be overridden by the event-specific attributes, but just in case -- set it to now() */
-      timestamp: this.#agentRuntime.timeKeeper.convertRelativeTimestamp((0, _now.now)()),
+      timestamp: Math.floor(this.#agentRuntime.timeKeeper.correctAbsoluteTimestamp(this.#agentRuntime.timeKeeper.convertRelativeTimestamp((0, _now.now)()))),
       /** all generic events require a pageUrl */
-      pageUrl: (0, _cleanUrl.cleanURL)((0, _config.getRuntime)(this.agentIdentifier).origin)
+      pageUrl: (0, _cleanUrl.cleanURL)((0, _runtime.getRuntime)(this.agentIdentifier).origin)
     };
     const eventAttributes = {
       /** Agent-level custom attributes */
-      ...((0, _config.getInfo)(this.agentIdentifier).jsAttributes || {}),
+      ...((0, _info.getInfo)(this.agentIdentifier).jsAttributes || {}),
       /** Fallbacks for required properties in-case the event did not supply them, should take precedence over agent-level custom attrs */
       ...defaultEventAttributes,
       /** Event-specific attributes take precedence over agent-level custom attributes and fallbacks */
       ...obj
     };
-    this.events.push(eventAttributes);
-
-    // check if we've reached the harvest limit...
-    if (this.events.length >= this.eventsPerHarvest) {
+    this.events.add(eventAttributes);
+    this.checkEventLimits();
+  }
+  onHarvestStarted(options) {
+    const {
+      userAttributes,
+      atts
+    } = (0, _info.getInfo)(this.agentIdentifier);
+    if (!this.events.hasData) return;
+    var payload = {
+      qs: {
+        ua: userAttributes,
+        at: atts
+      },
+      body: (0, _traverse.applyFnToProps)({
+        ins: this.events.buffer
+      }, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string')
+    };
+    if (options.retry) this.events.hold();
+    return payload;
+  }
+  onHarvestFinished(result) {
+    if (result && result?.sent && result?.retry && this.events.held.hasData) this.events.unhold();else this.events.held.clear();
+  }
+  checkEventLimits() {
+    // check if we've reached any harvest limits...
+    if (this.events.bytes > _agentConstants.IDEAL_PAYLOAD_SIZE) {
       this.ee.emit(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen']);
-      this.overflow = [...this.overflow, ...this.events.splice(0, Infinity)];
       this.harvestScheduler.runHarvest();
     }
   }

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

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FEATURE_NAME = void 0;
+exports.MAX_PAYLOAD_SIZE = exports.IDEAL_PAYLOAD_SIZE = exports.FEATURE_NAME = void 0;
 var _features = require("../../loaders/features/features");
-const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.genericEvents;
+const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.genericEvents;
+const IDEAL_PAYLOAD_SIZE = exports.IDEAL_PAYLOAD_SIZE = 64000;
+const MAX_PAYLOAD_SIZE = exports.MAX_PAYLOAD_SIZE = 1000000;

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

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Instrument = void 0;
-var _config = require("../../../common/config/config");
+exports.Instrument = exports.GenericEvents = void 0;
+var _init = require("../../../common/config/init");
 var _drain = require("../../../common/drain/drain");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
@@ -13,15 +13,15 @@ var _constants = require("../constants");
  */
 
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = (() => _constants.FEATURE_NAME)();
-  constructor(agentIdentifier, aggregator) {
-    let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  static featureName = _constants.FEATURE_NAME;
+  constructor(agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
-    const genericEventSourceConfigs = [(0, _config.getConfigurationValue)(this.agentIdentifier, 'page_action.enabled')
+    const genericEventSourceConfigs = [(0, _init.getConfigurationValue)(this.agentIdentifier, 'page_action.enabled')
     // other future generic event source configs to go here, like M&Ms, PageResouce, etc.
     ];
     /** If any of the sources are active, import the aggregator. otherwise deregister */
     if (genericEventSourceConfigs.some(x => x)) this.importAggregator();else (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
   }
 }
-exports.Instrument = Instrument;
+exports.Instrument = Instrument;
+const GenericEvents = exports.GenericEvents = Instrument;

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

@@ -12,14 +12,17 @@ var _registerHandler = require("../../../common/event-emitter/register-handler")
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _stringify = require("../../../common/util/stringify");
 var _handle = require("../../../common/event-emitter/handle");
-var _config = require("../../../common/config/config");
-var _runtime = require("../../../common/constants/runtime");
+var _info = require("../../../common/config/info");
+var _init = require("../../../common/config/init");
+var _runtime = require("../../../common/config/runtime");
+var _runtime2 = require("../../../common/constants/runtime");
 var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _nreum = require("../../../common/window/nreum");
 var _drain = require("../../../common/drain/drain");
 var _now = require("../../../common/timing/now");
+var _traverse = require("../../../common/util/traverse");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -30,11 +33,9 @@ var _now = require("../../../common/timing/now");
  */
 
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = (() => _constants.FEATURE_NAME)();
+  static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
-    var _this;
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
-    _this = this;
     this.stackReported = {};
     this.observedAt = {};
     this.pageviewReported = {};
@@ -44,28 +45,19 @@ class Aggregate extends _aggregateBase.AggregateBase {
 
     // this will need to change to match whatever ee we use in the instrument
     this.ee.on('interactionDone', (interaction, wasSaved) => this.onInteractionDone(interaction, wasSaved));
-    (0, _registerHandler.registerHandler)('err', function () {
-      return _this.storeError(...arguments);
-    }, this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('ierr', function () {
-      return _this.storeError(...arguments);
-    }, this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('err', (...args) => this.storeError(...args), this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('ierr', (...args) => this.storeError(...args), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('softNavFlush', (interactionId, wasFinished, softNavAttrs) => this.onSoftNavNotification(interactionId, wasFinished, softNavAttrs), this.featureName, this.ee); // when an ixn is done or cancelled
 
-    const harvestTimeSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'jserrors.harvestTimeSeconds') || 10;
+    const harvestTimeSeconds = (0, _init.getConfigurationValue)(this.agentIdentifier, 'jserrors.harvestTimeSeconds') || 10;
 
     // 0 == off, 1 == on
-    this.waitForFlags(['err']).then(_ref => {
-      let [errFlag] = _ref;
+    this.waitForFlags(['err']).then(([errFlag]) => {
       if (errFlag) {
         const scheduler = new _harvestScheduler.HarvestScheduler('jserrors', {
-          onFinished: function () {
-            return _this.onHarvestFinished(...arguments);
-          }
+          onFinished: (...args) => this.onHarvestFinished(...args)
         }, this);
-        scheduler.harvest.on('jserrors', function () {
-          return _this.onHarvestStarted(...arguments);
-        });
+        scheduler.harvest.on('jserrors', (...args) => this.onHarvestStarted(...args));
         scheduler.startTimer(harvestTimeSeconds);
         this.drain();
       } else {
@@ -76,7 +68,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
   onHarvestStarted(options) {
     // this gets rid of dependency in AJAX module
-    var body = this.aggregator.take(['err', 'ierr', 'xhr']);
+    var body = (0, _traverse.applyFnToProps)(this.aggregator.take(['err', 'ierr', 'xhr']), this.obfuscator.obfuscateString.bind(this.obfuscator), 'string');
     if (options.retry) {
       this.currentBody = body;
     }
@@ -84,7 +76,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       body,
       qs: {}
     };
-    var releaseIds = (0, _stringify.stringify)((0, _config.getRuntime)(this.agentIdentifier).releaseIds);
+    var releaseIds = (0, _stringify.stringify)((0, _runtime.getRuntime)(this.agentIdentifier).releaseIds);
     if (releaseIds !== '{}') {
       payload.qs.ri = releaseIds;
     }
@@ -99,8 +91,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
   onHarvestFinished(result) {
     if (result.retry && this.currentBody) {
-      Object.entries(this.currentBody || {}).forEach(_ref2 => {
-        let [key, value] = _ref2;
+      Object.entries(this.currentBody || {}).forEach(([key, value]) => {
         for (var i = 0; i < value.length; i++) {
           var bucket = value[i];
           var name = this.getBucketName(key, bucket.params, bucket.custom);
@@ -143,7 +134,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (!err) return;
     // are we in an interaction
     time = time || (0, _now.now)();
-    const agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
+    const agentRuntime = (0, _runtime.getRuntime)(this.agentIdentifier);
     let filterOutput;
     if (!internal && agentRuntime.onerror) {
       filterOutput = agentRuntime.onerror(err);
@@ -159,7 +150,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     const params = {
       stackHash: (0, _stringHashCode.stringHashCode)(canonicalStackString),
       exceptionClass: stackInfo.name,
-      request_uri: _runtime.globalScope?.location.pathname
+      request_uri: _runtime2.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).
@@ -176,7 +167,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (!this.stackReported[bucketHash]) {
       this.stackReported[bucketHash] = true;
       params.stack_trace = (0, _formatStackTrace.truncateSize)(stackInfo.stackString);
-      this.observedAt[bucketHash] = agentRuntime.timeKeeper.convertRelativeTimestamp(time);
+      this.observedAt[bucketHash] = Math.floor(agentRuntime.timeKeeper.correctAbsoluteTimestamp(agentRuntime.timeKeeper.convertRelativeTimestamp(time)));
     } else {
       params.browser_stack_hash = (0, _stringHashCode.stringHashCode)(stackInfo.stackString);
     }
@@ -192,7 +183,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.pageviewReported[bucketHash] = true;
     }
     params.firstOccurrenceTimestamp = this.observedAt[bucketHash];
-    params.timestamp = agentRuntime.timeKeeper.convertRelativeTimestamp(time);
+    params.timestamp = Math.floor(agentRuntime.timeKeeper.correctAbsoluteTimestamp(agentRuntime.timeKeeper.convertRelativeTimestamp(time)));
     var type = internal ? 'ierr' : 'err';
     var newMetrics = {
       time
@@ -225,30 +216,20 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.#storeJserrorForHarvest(jsErrorEvent, params.browserInteractionId !== undefined, params._softNavAttributes);
     }
   }
-  #storeJserrorForHarvest(errorInfoArr, softNavOccurredFinished) {
-    let softNavCustomAttrs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  #storeJserrorForHarvest(errorInfoArr, softNavOccurredFinished, softNavCustomAttrs = {}) {
     let [type, bucketHash, params, newMetrics, localAttrs] = errorInfoArr;
     const allCustomAttrs = {};
     if (softNavOccurredFinished) {
-      Object.entries(softNavCustomAttrs).forEach(_ref3 => {
-        let [k, v] = _ref3;
-        return setCustom(k, v);
-      }); // when an ixn finishes, it'll include stuff in jsAttributes + attrs specific to the ixn
+      Object.entries(softNavCustomAttrs).forEach(([k, v]) => setCustom(k, v)); // when an ixn finishes, it'll include stuff in jsAttributes + attrs specific to the ixn
       bucketHash += params.browserInteractionId;
       delete params._softNavAttributes; // cleanup temp properties from synchronous evaluation; this is harmless when async from soft nav (properties DNE)
       delete params._softNavFinished;
     } else {
       // interaction was cancelled -> error should not be associated OR there was no interaction
-      Object.entries((0, _config.getInfo)(this.agentIdentifier).jsAttributes).forEach(_ref4 => {
-        let [k, v] = _ref4;
-        return setCustom(k, v);
-      });
+      Object.entries((0, _info.getInfo)(this.agentIdentifier).jsAttributes).forEach(([k, v]) => setCustom(k, v));
       delete params.browserInteractionId;
     }
-    if (localAttrs) Object.entries(localAttrs).forEach(_ref5 => {
-      let [k, v] = _ref5;
-      return setCustom(k, v);
-    }); // local custom attrs are applied in either case with the highest precedence
+    if (localAttrs) Object.entries(localAttrs).forEach(([k, v]) => setCustom(k, v)); // local custom attrs are applied in either case with the highest precedence
 
     const jsAttributesHash = (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(allCustomAttrs));
     const aggregateHash = bucketHash + ':' + jsAttributesHash;
@@ -277,8 +258,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       var jsAttributesHash = (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(allCustomAttrs));
       var aggregateHash = hash + ':' + jsAttributesHash;
       this.aggregator.store(item[0], aggregateHash, params, item[3], allCustomAttrs);
-      function setCustom(_ref6) {
-        let [key, val] = _ref6;
+      function setCustom([key, val]) {
         allCustomAttrs[key] = val && typeof val === 'object' ? (0, _stringify.stringify)(val) : val;
       }
     });