@newrelic/browser-agent 1.263.0 → 1.264.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.264.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.263.0...v1.264.0) (2024-08-06)
+
+
+### Features
+
+* Create generic events feature with 1,000 event limit ([#1121](https://github.com/newrelic/newrelic-browser-agent/issues/1121)) ([63ab04f](https://github.com/newrelic/newrelic-browser-agent/commit/63ab04fa9b2a0c347e175c9174f563e73767933b))
+* Report Page Actions with Generic Events Feature ([#1124](https://github.com/newrelic/newrelic-browser-agent/issues/1124)) ([0d52acf](https://github.com/newrelic/newrelic-browser-agent/commit/0d52acf9eaa9a2c170459f03e9edad25375f4c1c))
+
 ## [1.263.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.262.0...v1.263.0) (2024-07-25)
 
 

package/README.md

@@ -78,9 +78,9 @@ const options = {
 The following features may be disabled by adding `init` entries as shown above. Note that the `page_view_event` feature may not be disabled.
 
 - `ajax`
+- `generic_events`
 - `jserrors`
 - `metrics`
-- `page_action`
 - `page_view_timing`
 - `session_replay`
 - `session_trace`
@@ -125,7 +125,7 @@ The following feature modules are available for inclusion in the `features` arra
 import { Ajax } from '@newrelic/browser-agent/features/ajax';
 import { JSErrors } from '@newrelic/browser-agent/features/jserrors';
 import { Metrics } from '@newrelic/browser-agent/features/metrics';
-import { PageAction } from '@newrelic/browser-agent/features/page_action';
+import { GenericEvents } from '@newrelic/browser-agent/features/generic_events';
 import { PageViewEvent } from '@newrelic/browser-agent/features/page_view_event';
 import { PageViewTiming } from '@newrelic/browser-agent/features/page_view_timing';
 import { SessionTrace } from '@newrelic/browser-agent/features/session_trace';

package/dist/cjs/cdn/experimental.js

@@ -8,8 +8,8 @@ var _instrument4 = require("../features/jserrors/instrument");
 var _instrument5 = require("../features/ajax/instrument");
 var _instrument6 = require("../features/session_trace/instrument");
 var _instrument7 = require("../features/session_replay/instrument");
-var _instrument8 = require("../features/soft_navigations/instrument");
-var _instrument9 = require("../features/page_action/instrument");
+var _instrument8 = require("../features/generic_events/instrument");
+var _instrument9 = require("../features/soft_navigations/instrument");
 var _instrument10 = require("../features/logging/instrument");
 /*
  * Copyright 2023 New Relic Corporation. All rights reserved.
@@ -22,11 +22,7 @@ var _instrument10 = require("../features/logging/instrument");
  * It is not production ready, and is not intended to be imported or implemented in any build of the browser agent
  */
 
-// import { Instrument as InstrumentSpa } from '../features/spa/instrument'
-
 new _agent.Agent({
-  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument9.Instrument, _instrument4.Instrument, _instrument10.Instrument,
-  // InstrumentSpa,
-  _instrument8.Instrument],
+  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument4.Instrument, _instrument8.Instrument, _instrument10.Instrument, _instrument9.Instrument],
   loaderType: 'experimental'
 });

package/dist/cjs/cdn/pro.js

@@ -8,7 +8,7 @@ var _instrument4 = require("../features/jserrors/instrument");
 var _instrument5 = require("../features/ajax/instrument");
 var _instrument6 = require("../features/session_trace/instrument");
 var _instrument7 = require("../features/session_replay/instrument");
-var _instrument8 = require("../features/page_action/instrument");
+var _instrument8 = require("../features/generic_events/instrument");
 var _instrument9 = require("../features/logging/instrument");
 /**
  * @file Creates a "Pro" agent loader bundle composed of the core Agent and all available feature modules except `spa`.
@@ -16,6 +16,6 @@ var _instrument9 = require("../features/logging/instrument");
  */
 
 new _agent.Agent({
-  features: [_instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument5.Instrument, _instrument3.Instrument, _instrument8.Instrument, _instrument4.Instrument, _instrument9.Instrument],
+  features: [_instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument5.Instrument, _instrument3.Instrument, _instrument4.Instrument, _instrument8.Instrument, _instrument9.Instrument],
   loaderType: 'pro'
 });

package/dist/cjs/cdn/spa.js

@@ -10,14 +10,14 @@ var _instrument6 = require("../features/session_trace/instrument");
 var _instrument7 = require("../features/session_replay/instrument");
 var _instrument8 = require("../features/soft_navigations/instrument");
 var _instrument9 = require("../features/spa/instrument");
-var _instrument10 = require("../features/page_action/instrument");
+var _instrument10 = require("../features/generic_events/instrument");
 var _instrument11 = require("../features/logging/instrument");
 /**
  * @file Creates a "SPA" agent loader bundle composed of the core agent and all available feature modules.
  */
 
 new _agent.Agent({
-  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument10.Instrument, _instrument4.Instrument, _instrument11.Instrument, _instrument8.Instrument, _instrument9.Instrument // either the softnav or the old spa will be used (not both), but we still need to pack both to avoid dynamic import for instrument files
+  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument4.Instrument, _instrument10.Instrument, _instrument11.Instrument, _instrument8.Instrument, _instrument9.Instrument // either the softnav or the old spa will be used (not both), but we still need to pack both to avoid dynamic import for instrument files
   ],
   loaderType: 'spa'
 });

package/dist/cjs/common/aggregate/aggregator.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Aggregator = void 0;
 var _sharedContext = require("../context/shared-context");
-var _mapOwn = require("../util/map-own");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -36,7 +35,7 @@ class Aggregator extends _sharedContext.SharedContext {
     oldMetrics.count += metrics.count;
 
     // iterate through each new metric and merge
-    (0, _mapOwn.mapOwn)(metrics, function (key, value) {
+    Object.keys(metrics || {}).forEach(key => {
       // count is a special case handled above
       if (key === 'count') return;
       var oldMetric = oldMetrics[key];
@@ -96,7 +95,8 @@ function aggregateMetrics(newMetrics, oldMetrics) {
     count: 0
   };
   oldMetrics.count += 1;
-  (0, _mapOwn.mapOwn)(newMetrics, function (key, value) {
+  Object.entries(newMetrics || {}).forEach(_ref => {
+    let [key, value] = _ref;
     oldMetrics[key] = updateMetric(value, oldMetrics[key]);
   });
   return oldMetrics;

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

@@ -53,6 +53,11 @@ const model = () => {
       allowed_origins: undefined
     },
     feature_flags: [],
+    generic_events: {
+      enabled: true,
+      harvestTimeSeconds: 30,
+      autoStart: true
+    },
     harvest: {
       tooManyRequestsDelay: 60
     },
@@ -73,9 +78,7 @@ const model = () => {
     },
     obfuscate: undefined,
     page_action: {
-      enabled: true,
-      harvestTimeSeconds: 30,
-      autoStart: true
+      enabled: true
     },
     page_view_event: {
       enabled: true,

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

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.263.0";
+const VERSION = exports.VERSION = "1.264.0";
 
 /**
  * Exposes the build type of the agent

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

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.263.0";
+const VERSION = exports.VERSION = "1.264.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/runtime.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.supportsSendBeacon = exports.originTime = exports.loadedAsDeferredBrowserScript = exports.isiOS = exports.isWorkerScope = exports.isIE = exports.isBrowserScope = exports.initiallyHidden = exports.initialLocation = exports.iOSBelow16 = exports.globalScope = exports.ffVersion = void 0;
+exports.supportsSendBeacon = exports.originTime = exports.loadedAsDeferredBrowserScript = exports.isiOS = exports.isWorkerScope = exports.isBrowserScope = exports.initiallyHidden = exports.initialLocation = exports.iOSBelow16 = exports.globalScope = exports.ffVersion = void 0;
 var _now = require("../timing/now");
 /**
  * @file Contains constants about the environment the agent is running
@@ -42,8 +42,6 @@ const ffVersion = exports.ffVersion = (() => {
   }
   return 0;
 })();
-const isIE = exports.isIE = Boolean(isBrowserScope && window.document.documentMode); // deprecated property that only works in IE
-
 const supportsSendBeacon = exports.supportsSendBeacon = !!globalScope.navigator?.sendBeacon;
 
 /**

package/dist/cjs/common/drain/drain.js

@@ -7,7 +7,6 @@ exports.deregisterDrain = deregisterDrain;
 exports.drain = drain;
 exports.registerDrain = registerDrain;
 var _contextualEe = require("../event-emitter/contextual-ee");
-var _mapOwn = require("../util/map-own");
 var _registerHandler = require("../event-emitter/register-handler");
 var _features = require("../../loaders/features/features");
 /*
@@ -119,8 +118,9 @@ function drainGroup(agentIdentifier, group) {
         // eslint-disable-line no-unmodified-loop-condition
         emitEvent(bufferedEventsInGroup[i], groupHandlers);
       }
-      (0, _mapOwn.mapOwn)(groupHandlers, function (eventType, handlerRegistrationList) {
-        (0, _mapOwn.mapOwn)(handlerRegistrationList, function (i, registration) {
+      Object.entries(groupHandlers).forEach(_ref3 => {
+        let [eventType, handlerRegistrationList] = _ref3;
+        Object.values(handlerRegistrationList || {}).forEach(registration => {
           // registration is an array of: [targetEE, eventHandler]
           registration[0].on(eventType, registration[1]);
         });
@@ -141,7 +141,7 @@ function drainGroup(agentIdentifier, group) {
  */
 function emitEvent(evt, groupHandlers) {
   var type = evt[1];
-  (0, _mapOwn.mapOwn)(groupHandlers[type], function (i, registration) {
+  Object.values(groupHandlers[type] || {}).forEach(registration => {
     var sourceEE = evt[0];
     var ee = registration[0];
     if (ee === sourceEE) {

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

@@ -171,11 +171,11 @@ class Harvest extends _sharedContext.SharedContext {
     /* Since workers don't support sendBeacon right now, they can only use XHR method.
         Because they still do permit synch XHR, the idea is that at final harvest time (worker is closing),
         we just make a BLOCKING request--trivial impact--with the remaining data as a temp fill-in for sendBeacon.
-       Following the removal of img-element method, IE will also use sync XHR on page dismissal to ensure final analytics are sent. */
+       Following the removal of img-element method. */
     let result = submitMethod({
       url: fullUrl,
       body,
-      sync: opts.unload && (_runtime.isWorkerScope || _runtime.isIE),
+      sync: opts.unload && _runtime.isWorkerScope,
       headers
     });
     if (!opts.unload && cbFinished && submitMethod === submitData.xhr) {

package/dist/cjs/common/serialize/bel-serializer.js

@@ -7,7 +7,6 @@ exports.addCustomAttributes = addCustomAttributes;
 exports.getAddStringContext = getAddStringContext;
 exports.nullable = nullable;
 exports.numeric = numeric;
-var _mapOwn = require("../util/map-own");
 var _stringify = require("../util/stringify");
 var _obfuscate = require("../util/obfuscate");
 /*
@@ -48,7 +47,8 @@ function getAddStringContext(agentIdentifier) {
 }
 function addCustomAttributes(attrs, addString) {
   var attrParts = [];
-  (0, _mapOwn.mapOwn)(attrs, function (key, val) {
+  Object.entries(attrs || {}).forEach(_ref => {
+    let [key, val] = _ref;
     if (attrParts.length >= MAX_ATTRIBUTES) return;
     var type = 5;
     var serializedValue;

package/dist/cjs/common/session/session-entity.js

@@ -64,7 +64,7 @@ class SessionEntity {
      * if the event was spawned on the current page or an adjacent page, and the behavior tied
      * to storage events is critical to apply only to cross-tab behavior
      * */
-    if (_runtime.isBrowserScope && !_runtime.isIE) {
+    if (_runtime.isBrowserScope) {
       (0, _eventListenerOpts.windowAddEventListener)('storage', event => {
         if (event.key === this.lookupKey) {
           const obj = typeof event.newValue === 'string' ? JSON.parse(event.newValue) : event.newValue;

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

@@ -7,7 +7,6 @@ exports.fromArray = fromArray;
 exports.obj = obj;
 exports.param = param;
 exports.qs = qs;
-var _mapOwn = require("../util/map-own");
 var _stringify = require("../util/stringify");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -23,9 +22,7 @@ var charMap = {
   '%24': '$',
   '%3B': ';'
 };
-var charList = (0, _mapOwn.mapOwn)(charMap, function (k) {
-  return k;
-});
+var charList = Object.keys(charMap);
 var safeEncoded = new RegExp(charList.join('|'), 'g');
 function real(c) {
   return charMap[c];
@@ -48,7 +45,8 @@ function fromArray(qs, maxBytes) {
 function obj(payload, maxBytes) {
   var total = 0;
   var result = '';
-  (0, _mapOwn.mapOwn)(payload, function (feature, dataArray) {
+  Object.entries(payload || {}).forEach(_ref => {
+    let [feature, dataArray] = _ref;
     var intermediate = [];
     var next;
     var i;

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

@@ -30,7 +30,6 @@ function getSubmitMethod() {
   return isFinalHarvest && _runtime.isBrowserScope && _runtime.supportsSendBeacon
   // Use sendBeacon for final harvest
   ? beacon
-  // Only IE does not support sendBeacon for final harvest
   // If not final harvest, or not browserScope, always use xhr post
   : xhr;
 }

package/dist/cjs/common/vitals/vital-metric.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.VitalMetric = void 0;
 class VitalMetric {
-  #subscribers = new Set();
+  #subscribers = (() => new Set())();
   history = [];
   constructor(name, roundingMethod) {
     this.name = name;

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

@@ -24,7 +24,7 @@ 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;

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

@@ -30,7 +30,7 @@ var handlersLen = handlers.length;
 var origRequest = _config.originals.REQ;
 var origXHR = _config.originals.XHR;
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = _constants.FEATURE_NAME;
+  static featureName = (() => _constants.FEATURE_NAME)();
   constructor(agentIdentifier, aggregator) {
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);

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

@@ -0,0 +1,137 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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 _constants = require("../constants");
+var _runtime = 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");
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+class Aggregate extends _aggregateBase.AggregateBase {
+  #agentRuntime;
+  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;
+      if (!ins) {
+        this.blocked = true;
+        (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
+        return;
+      }
+      if ((0, _config.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),
+            timeSinceLoad: timestamp / 1000,
+            actionName: name,
+            referrerUrl: this.referrerUrl,
+            currentUrl: (0, _cleanUrl.cleanURL)('' + location),
+            ...(_runtime.isBrowserScope && {
+              browserWidth: window.document.documentElement?.clientWidth,
+              browserHeight: window.document.documentElement?.clientHeight
+            })
+          });
+        }, this.featureName, this.ee);
+      }
+      this.harvestScheduler = new _harvestScheduler.HarvestScheduler('ins', {
+        onFinished: function () {
+          return _this.onHarvestFinished(...arguments);
+        }
+      }, this);
+      this.harvestScheduler.harvest.on('ins', function () {
+        return _this.onHarvestStarted(...arguments);
+      });
+      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] : {};
+    if (!obj || !Object.keys(obj).length) return;
+    if (!obj.eventType) {
+      (0, _console.warn)(44);
+      return;
+    }
+    for (let key in obj) {
+      let val = obj[key];
+      obj[key] = val && typeof val === 'object' ? (0, _stringify.stringify)(val) : val;
+    }
+    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)()),
+      /** all generic events require a pageUrl */
+      pageUrl: (0, _cleanUrl.cleanURL)((0, _config.getRuntime)(this.agentIdentifier).origin)
+    };
+    const eventAttributes = {
+      /** Agent-level custom attributes */
+      ...((0, _config.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.ee.emit(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen']);
+      this.overflow = [...this.overflow, ...this.events.splice(0, Infinity)];
+      this.harvestScheduler.runHarvest();
+    }
+  }
+}
+exports.Aggregate = Aggregate;

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

@@ -0,0 +1,8 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FEATURE_NAME = void 0;
+var _features = require("../../loaders/features/features");
+const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.genericEvents;

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

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "GenericEvents", {
+  enumerable: true,
+  get: function () {
+    return _index.Instrument;
+  }
+});
+var _index = require("./instrument/index");

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

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Instrument = void 0;
+var _config = require("../../../common/config/config");
+var _drain = require("../../../common/drain/drain");
+var _instrumentBase = require("../../utils/instrument-base");
+var _constants = require("../constants");
+/* Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+class Instrument extends _instrumentBase.InstrumentBase {
+  static featureName = (() => _constants.FEATURE_NAME)();
+  constructor(agentIdentifier, aggregator) {
+    let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+    super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
+    const genericEventSourceConfigs = [(0, _config.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;

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

@@ -12,7 +12,6 @@ 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 _mapOwn = require("../../../common/util/map-own");
 var _config = require("../../../common/config/config");
 var _runtime = require("../../../common/constants/runtime");
 var _constants = require("../constants");
@@ -31,7 +30,7 @@ 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);
@@ -100,7 +99,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
   onHarvestFinished(result) {
     if (result.retry && this.currentBody) {
-      (0, _mapOwn.mapOwn)(this.currentBody, (key, value) => {
+      Object.entries(this.currentBody || {}).forEach(_ref2 => {
+        let [key, value] = _ref2;
         for (var i = 0; i < value.length; i++) {
           var bucket = value[i];
           var name = this.getBucketName(key, bucket.params, bucket.custom);
@@ -230,8 +230,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     let [type, bucketHash, params, newMetrics, localAttrs] = errorInfoArr;
     const allCustomAttrs = {};
     if (softNavOccurredFinished) {
-      Object.entries(softNavCustomAttrs).forEach(_ref2 => {
-        let [k, v] = _ref2;
+      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
       bucketHash += params.browserInteractionId;
@@ -239,14 +239,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
       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(_ref3 => {
-        let [k, v] = _ref3;
+      Object.entries((0, _config.getInfo)(this.agentIdentifier).jsAttributes).forEach(_ref4 => {
+        let [k, v] = _ref4;
         return setCustom(k, v);
       });
       delete params.browserInteractionId;
     }
-    if (localAttrs) Object.entries(localAttrs).forEach(_ref4 => {
-      let [k, v] = _ref4;
+    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
 
@@ -264,8 +264,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.bufferedErrorsUnderSpa[interaction.id].forEach(item => {
       var allCustomAttrs = {};
       const localCustomAttrs = item[4];
-      (0, _mapOwn.mapOwn)(interaction.root.attrs.custom, setCustom); // tack on custom attrs from the interaction
-      (0, _mapOwn.mapOwn)(localCustomAttrs, setCustom);
+      Object.entries(interaction.root.attrs.custom || {}).forEach(setCustom); // tack on custom attrs from the interaction
+      Object.entries(localCustomAttrs || {}).forEach(setCustom);
       var params = item[2];
       if (wasSaved) {
         params.browserInteractionId = interaction.root.attrs.id;
@@ -277,7 +277,8 @@ 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(key, val) {
+      function setCustom(_ref6) {
+        let [key, val] = _ref6;
         allCustomAttrs[key] = val && typeof val === 'object' ? (0, _stringify.stringify)(val) : val;
       }
     });

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

@@ -18,7 +18,7 @@ var _castError = require("../shared/cast-error");
  */
 
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = _constants.FEATURE_NAME;
+  static featureName = (() => _constants.FEATURE_NAME)();
   #replayRunning = false;
   constructor(agentIdentifier, aggregator) {
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;

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

@@ -16,7 +16,7 @@ var _constants2 = require("../constants");
 var _log = require("../shared/log");
 var _utils = require("../shared/utils");
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = _constants2.FEATURE_NAME;
+  static featureName = (() => _constants2.FEATURE_NAME)();
   #agentRuntime;
   #agentInfo;
   constructor(agentIdentifier, aggregator) {

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

@@ -8,7 +8,7 @@ var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 var _utils = require("../shared/utils");
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = _constants.FEATURE_NAME;
+  static featureName = (() => _constants.FEATURE_NAME)();
   constructor(agentIdentifier, aggregator) {
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);

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

@@ -17,7 +17,7 @@ var _runtime = require("../../../common/constants/runtime");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _drain = require("../../../common/drain/drain");
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = _constants.FEATURE_NAME;
+  static featureName = (() => _constants.FEATURE_NAME)();
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
     this.waitForFlags(['err']).then(_ref => {