@newrelic/browser-agent 1.263.0 → 1.264.0

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

@@ -7,7 +7,7 @@ exports.Instrument = void 0;
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 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/page_action/instrument/index.js

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Instrument = void 0;
-var _instrumentBase = require("../../utils/instrument-base");
-var _constants = require("../constants");
+var _generic_events = require("../../generic_events");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = _constants.FEATURE_NAME;
+/**
+ * @deprecated This feature has been replaced by Generic Events. Use/Import `GenericEvents` instead. This wrapper will be removed in a future release
+ */
+class Instrument extends _generic_events.GenericEvents {
   constructor(agentIdentifier, aggregator) {
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-    super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
-    this.importAggregator();
+    super(agentIdentifier, aggregator, auto);
   }
 }
 exports.Instrument = Instrument;

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

@@ -26,7 +26,7 @@ var _timeKeeper = require("../../../common/timing/time-keeper");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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.timeToFirstByte = 0;

package/dist/cjs/features/page_view_event/aggregate/initialized-features.js

@@ -24,7 +24,7 @@ function getActivatedFeaturesFlags(agentId) {
         case _features.FEATURE_NAMES.jserrors:
           flagArr.push('err');
           break;
-        case _features.FEATURE_NAMES.pageAction:
+        case _features.FEATURE_NAMES.genericEvents:
           flagArr.push('ins');
           break;
         case _features.FEATURE_NAMES.sessionTrace:

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

@@ -9,7 +9,7 @@ var CONSTANTS = _interopRequireWildcard(require("../constants"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 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/page_view_timing/aggregate/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Aggregate = void 0;
 var _belSerializer = require("../../../common/serialize/bel-serializer");
-var _mapOwn = require("../../../common/util/map-own");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _handle = require("../../../common/event-emitter/handle");
@@ -29,7 +28,7 @@ var _constants2 = require("../../../common/vitals/constants");
  */
 
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = _constants.FEATURE_NAME;
+  static featureName = (() => _constants.FEATURE_NAME)();
   #handleVitalMetric = _ref => {
     let {
       name,
@@ -147,7 +146,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     var timingAttributes = timing.attrs || {};
     var customAttributes = (0, _config.getInfo)(this.agentIdentifier).jsAttributes || {};
     var reservedAttributes = ['size', 'eid', 'cls', 'type', 'fid', 'elTag', 'elUrl', 'net-type', 'net-etype', 'net-rtt', 'net-dlink'];
-    (0, _mapOwn.mapOwn)(customAttributes, function (key, val) {
+    Object.entries(customAttributes || {}).forEach(_ref3 => {
+      let [key, val] = _ref3;
       if (reservedAttributes.indexOf(key) < 0) {
         timingAttributes[key] = val;
       }

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

@@ -17,7 +17,7 @@ var _now = require("../../../common/timing/now");
  */
 
 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/session_replay/aggregate/index.js

@@ -35,8 +35,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * functionality is validated and a full user experience is curated.
  */
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = _constants.FEATURE_NAME;
-  mode = _constants3.MODE.OFF;
+  static featureName = (() => _constants.FEATURE_NAME)();
+  mode = (() => _constants3.MODE.OFF)();
 
   // pass the recorder into the aggregator
   constructor(agentIdentifier, aggregator, args) {

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

@@ -21,7 +21,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * functionality is validated and a full user experience is curated.
  */
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = _constants2.FEATURE_NAME;
+  static featureName = (() => _constants2.FEATURE_NAME)();
   #mode;
   constructor(agentIdentifier, aggregator) {
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;

package/dist/cjs/features/session_replay/shared/stylesheet-evaluator.js

@@ -7,7 +7,7 @@ exports.stylesheetEvaluator = void 0;
 var _config = require("../../../common/config/config");
 var _runtime = require("../../../common/constants/runtime");
 class StylesheetEvaluator {
-  #evaluated = new WeakSet();
+  #evaluated = (() => new WeakSet())();
   #fetchProms = [];
   /**
   * Flipped to true if stylesheets that cannot be natively inlined are detected by the stylesheetEvaluator class

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

@@ -18,7 +18,7 @@ const ERROR_MODE_SECONDS_WINDOW = 30 * 1000; // sliding window of nodes to track
 /** Reserved room for query param attrs */
 const QUERY_PARAM_PADDING = 5000;
 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.agentRuntime = (0, _config.getRuntime)(agentIdentifier);

package/dist/cjs/features/session_trace/aggregate/trace/storage.js

@@ -39,10 +39,10 @@ const toAggregate = {
 class TraceStorage {
   nodeCount = 0;
   trace = {};
-  earliestTimeStamp = Infinity;
+  earliestTimeStamp = (() => Infinity)();
   latestTimeStamp = 0;
   tempStorage = [];
-  prevStoredEvents = new Set();
+  prevStoredEvents = (() => new Set())();
   constructor(parent) {
     this.parent = parent;
   }

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

@@ -30,7 +30,7 @@ const {
   PUSH_STATE
 } = CONSTANTS;
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = FEATURE_NAME;
+  static featureName = (() => FEATURE_NAME)();
   constructor(agentIdentifier, aggregator) {
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     super(agentIdentifier, aggregator, FEATURE_NAME, auto);

package/dist/cjs/features/soft_navigations/aggregate/bel-node.js

@@ -13,7 +13,7 @@ class BelNode {
   end;
   callbackEnd = 0;
   callbackDuration = 0;
-  nodeId = ++nodesSeen;
+  nodeId = (() => ++nodesSeen)();
   constructor(agentIdentifier) {
     if (!agentIdentifier) throw new Error('Interaction is missing core attributes');
     this.agentIdentifier = agentIdentifier;

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

@@ -19,7 +19,7 @@ var _ajaxNode = require("./ajax-node");
 var _initialPageLoadInteraction = require("./initial-page-load-interaction");
 var _interaction = require("./interaction");
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = _constants2.FEATURE_NAME;
+  static featureName = (() => _constants2.FEATURE_NAME)();
   constructor(agentIdentifier, aggregator, _ref) {
     let {
       domObserver

package/dist/cjs/features/soft_navigations/aggregate/interaction.js

@@ -16,10 +16,10 @@ var _belNode = require("./bel-node");
  * link https://github.com/newrelic/nr-querypack/blob/main/schemas/bel/7.qpschema
  **/
 class Interaction extends _belNode.BelNode {
-  id = (0, _uniqueId.generateUuid)(); // unique id that is serialized and used to link interactions with errors
-  initialPageURL = _runtime.initialLocation;
-  oldURL = '' + _runtime.globalScope?.location;
-  newURL = '' + _runtime.globalScope?.location;
+  id = (() => (0, _uniqueId.generateUuid)())(); // unique id that is serialized and used to link interactions with errors
+  initialPageURL = (() => _runtime.initialLocation)();
+  oldURL = (() => '' + _runtime.globalScope?.location)();
+  newURL = (() => '' + _runtime.globalScope?.location)();
   customName;
   customAttributes = {};
   customDataByApi = {};
@@ -27,7 +27,7 @@ class Interaction extends _belNode.BelNode {
   appTime; // only used by initialPageLoad interactions
   newRoute;
   /** Internal state of this interaction: in-progress, finished, or cancelled. */
-  status = _constants.INTERACTION_STATUS.IP;
+  status = (() => _constants.INTERACTION_STATUS.IP)();
   domTimestamp = 0;
   historyTimestamp = 0;
   createdByApi = false;

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

@@ -20,7 +20,7 @@ var _now = require("../../../common/timing/now");
 const UI_WAIT_INTERVAL = 1 / 10 * 1000; // assume 10 fps
 
 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/spa/aggregate/index.js

@@ -7,7 +7,6 @@ exports.Aggregate = void 0;
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _parseUrl = require("../../../common/url/parse-url");
 var _denyList = require("../../../common/deny-list/deny-list");
-var _mapOwn = require("../../../common/util/map-own");
 var _navTiming = require("../../../common/timing/nav-timing");
 var _uniqueId = require("../../../common/ids/unique-id");
 var _interaction = require("./interaction");
@@ -54,7 +53,7 @@ const {
   originalSetTimeout
 } = CONSTANTS;
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = FEATURE_NAME;
+  static featureName = (() => FEATURE_NAME)();
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, FEATURE_NAME);
     const agentRuntime = (0, _config.getRuntime)(agentIdentifier);
@@ -622,7 +621,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
 
       // make sure that newrelic[INTERACTION]() works in end handler
       state.currentNode = root;
-      (0, _mapOwn.mapOwn)(interaction.handlers, function (i, cb) {
+      Object.values(interaction.handlers || {}).forEach(function (cb) {
         cb(attrs.store);
       });
       setCurrentNode(null);

package/dist/cjs/features/spa/aggregate/interaction.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Interaction = Interaction;
 var _config = require("../../../common/config/config");
-var _mapOwn = require("../../../common/util/map-own");
 var _contextualEe = require("../../../common/event-emitter/contextual-ee");
 var _interactionNode = require("./interaction-node");
 /*
@@ -88,7 +87,8 @@ InteractionPrototype.finish = function finishInteraction() {
   if (this.onFinished) {
     this.onFinished(this);
   }
-  (0, _mapOwn.mapOwn)((0, _config.getInfo)(interaction.agentIdentifier).jsAttributes, function (attr, value) {
+  Object.entries((0, _config.getInfo)(interaction.agentIdentifier).jsAttributes || {}).forEach(_ref => {
+    let [attr, value] = _ref;
     if (!(attr in customAttrs)) customAttrs[attr] = value;
   });
   root.end = endTimestamp;

package/dist/cjs/features/spa/aggregate/serializer.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Serializer = void 0;
 var _cleanUrl = require("../../../common/url/clean-url");
-var _mapOwn = require("../../../common/util/map-own");
 var _belSerializer = require("../../../common/serialize/bel-serializer");
 var _sharedContext = require("../../../common/context/shared-context");
 var _config = require("../../../common/config/config");
@@ -132,7 +131,7 @@ class Serializer extends _sharedContext.SharedContext {
         // get all navTiming values except navigationStart
         // (since its the same as interaction.start)
         // and limit to just the first 20 values we know about
-        (0, _mapOwn.mapOwn)(navTiming.slice(1, 21), function (i, v) {
+        Object.values(navTiming.slice(1, 21) || {}).forEach(v => {
           if (v !== undefined) {
             navTimingNode += seperator + (0, _belSerializer.numeric)(v - prev);
             seperator = ',';

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

@@ -31,7 +31,7 @@ const {
   FN_END
 } = CONSTANTS;
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = FEATURE_NAME;
+  static featureName = (() => FEATURE_NAME)();
   constructor(agentIdentifier, aggregator) {
     var _this;
     let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;

package/dist/cjs/features/utils/aggregate-base.js

@@ -41,6 +41,8 @@ class AggregateBase extends _featureBase.FeatureBase {
     });
     return flagsPromise.catch(err => {
       this.ee.emit('internal-error', [err]);
+      this.blocked = true;
+      (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
     });
   }
   drain() {

package/dist/cjs/features/utils/lazy-feature-loader.js

@@ -25,12 +25,12 @@ function lazyFeatureLoader(featureName, featurePart) {
         return Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "ajax-aggregate" */'../ajax/aggregate')));
       case _features.FEATURE_NAMES.jserrors:
         return Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "jserrors-aggregate" */'../jserrors/aggregate')));
+      case _features.FEATURE_NAMES.genericEvents:
+        return Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "generic_events-aggregate" */'../generic_events/aggregate')));
       case _features.FEATURE_NAMES.logging:
         return Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "logging-aggregate" */'../logging/aggregate')));
       case _features.FEATURE_NAMES.metrics:
         return Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "metrics-aggregate" */'../metrics/aggregate')));
-      case _features.FEATURE_NAMES.pageAction:
-        return Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "page_action-aggregate" */'../page_action/aggregate')));
       case _features.FEATURE_NAMES.pageViewEvent:
         return Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "page_view_event-aggregate" */'../page_view_event/aggregate')));
       case _features.FEATURE_NAMES.pageViewTiming:

package/dist/cjs/index.js

@@ -21,12 +21,24 @@ Object.defineProperty(exports, "BrowserAgent", {
     return _browserAgent.BrowserAgent;
   }
 });
+Object.defineProperty(exports, "GenericEvents", {
+  enumerable: true,
+  get: function () {
+    return _generic_events.GenericEvents;
+  }
+});
 Object.defineProperty(exports, "JSErrors", {
   enumerable: true,
   get: function () {
     return _jserrors.JSErrors;
   }
 });
+Object.defineProperty(exports, "Logging", {
+  enumerable: true,
+  get: function () {
+    return _logging.Logging;
+  }
+});
 Object.defineProperty(exports, "Metrics", {
   enumerable: true,
   get: function () {
@@ -57,6 +69,12 @@ Object.defineProperty(exports, "PageViewTiming", {
     return _page_view_timing.PageViewTiming;
   }
 });
+Object.defineProperty(exports, "SessionReplay", {
+  enumerable: true,
+  get: function () {
+    return _session_replay.SessionReplay;
+  }
+});
 Object.defineProperty(exports, "SessionTrace", {
   enumerable: true,
   get: function () {
@@ -74,9 +92,12 @@ var _browserAgent = require("./loaders/browser-agent");
 var _microAgent = require("./loaders/micro-agent");
 var _ajax = require("./features/ajax");
 var _jserrors = require("./features/jserrors");
+var _generic_events = require("./features/generic_events");
+var _logging = require("./features/logging");
 var _metrics = require("./features/metrics");
 var _page_action = require("./features/page_action");
 var _page_view_event = require("./features/page_view_event");
 var _page_view_timing = require("./features/page_view_timing");
 var _session_trace = require("./features/session_trace");
+var _session_replay = require("./features/session_replay");
 var _spa = require("./features/spa");

package/dist/cjs/loaders/agent-base.js

@@ -7,7 +7,6 @@ exports.AgentBase = void 0;
 var _console = require("../common/util/console");
 var _constants = require("../features/session_replay/constants");
 var _uniqueId = require("../common/ids/unique-id");
-var _contextualEe = require("../common/event-emitter/contextual-ee");
 /* eslint-disable n/handle-callback-err */
 
 /**
@@ -19,9 +18,6 @@ class AgentBase {
   constructor() {
     let agentIdentifier = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (0, _uniqueId.generateRandomHexString)(16);
     this.agentIdentifier = agentIdentifier;
-
-    // Assign the observation context to the event emitter, so it knows how to create observation contexts
-    this.ee = _contextualEe.ee.get(agentIdentifier);
   }
 
   /**

package/dist/cjs/loaders/api/api.js

@@ -89,7 +89,7 @@ function setAPI(agentIdentifier, forceDrain) {
   _apiMethods.asyncApiMethods.forEach(fnName => {
     apiInterface[fnName] = apiCall(prefix, fnName, true, 'api');
   });
-  apiInterface.addPageAction = apiCall(prefix, 'addPageAction', true, _features.FEATURE_NAMES.pageAction);
+  apiInterface.addPageAction = apiCall(prefix, 'addPageAction', true, _features.FEATURE_NAMES.genericEvents);
   apiInterface.setPageViewName = function (name, host) {
     if (typeof name !== 'string') return;
     if (name.charAt(0) !== '/') name = '/' + name;

package/dist/cjs/loaders/api/apiAsync.js

@@ -40,7 +40,7 @@ function setAPI(agentIdentifier) {
       start: time + _runtime.originTime,
       origin: 'nr'
     });
-    (0, _handle.handle)('api-addPageAction', [time, 'finished'], undefined, _features.FEATURE_NAMES.pageAction, instanceEE);
+    (0, _handle.handle)('api-addPageAction', [time, 'finished'], undefined, _features.FEATURE_NAMES.genericEvents, instanceEE);
   }
   function addToTrace(t, evt) {
     if (!(evt && typeof evt === 'object' && evt.name && evt.start)) return;

package/dist/cjs/loaders/browser-agent.js

@@ -12,8 +12,9 @@ var _instrument4 = require("../features/jserrors/instrument");
 var _instrument5 = require("../features/ajax/instrument");
 var _instrument6 = require("../features/session_trace/instrument");
 var _instrument7 = require("../features/spa/instrument");
-var _instrument8 = require("../features/page_action/instrument");
-var _instrument9 = require("../features/session_replay/instrument");
+var _instrument8 = require("../features/session_replay/instrument");
+var _instrument9 = require("../features/generic_events/instrument");
+var _instrument10 = require("../features/logging/instrument");
 /**
  * An agent class with all feature modules available. Features may be disabled and enabled via runtime configuration.
  * The BrowserAgent class is the most convenient and reliable option for most use cases.
@@ -22,7 +23,7 @@ class BrowserAgent extends _agent.Agent {
   constructor(args) {
     super({
       ...args,
-      features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument3.Instrument, _instrument8.Instrument, _instrument4.Instrument, _instrument7.Instrument, _instrument9.Instrument],
+      features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument3.Instrument, _instrument4.Instrument, _instrument7.Instrument, _instrument8.Instrument, _instrument9.Instrument, _instrument10.Instrument],
       loaderType: 'browser-agent'
     });
   }

package/dist/cjs/loaders/configure/configure.js

@@ -10,6 +10,7 @@ var _config = require("../../common/config/config");
 var _featureFlags = require("../../common/util/feature-flags");
 var _runtime = require("../../common/constants/runtime");
 var _publicPath = require("./public-path");
+var _contextualEe = require("../../common/event-emitter/contextual-ee");
 let alreadySetOnce = false; // the configure() function can run multiple times in agent lifecycle
 
 /**
@@ -24,11 +25,10 @@ function configure(agent) {
     init,
     info,
     loader_config,
-    runtime = {
-      loaderType
-    },
+    runtime = {},
     exposed = true
   } = opts;
+  runtime.loaderType = loaderType;
   const nr = (0, _nreum.gosCDN)();
   if (!info) {
     init = nr.init;
@@ -62,6 +62,7 @@ function configure(agent) {
   runtime.denyList = [...(updatedInit.ajax.deny_list || []), ...(updatedInit.ajax.block_internal ? internalTrafficList : [])];
   runtime.ptid = agent.agentIdentifier;
   (0, _config.setRuntime)(agent.agentIdentifier, runtime);
+  agent.ee = _contextualEe.ee.get(agent.agentIdentifier);
   if (agent.api === undefined) agent.api = (0, _api.setAPI)(agent.agentIdentifier, forceDrain, agent.runSoftNavOverSpa);
   if (agent.exposed === undefined) agent.exposed = exposed;
   alreadySetOnce = true;

package/dist/cjs/loaders/features/features.js

@@ -6,9 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.featurePriority = exports.FEATURE_NAMES = void 0;
 const FEATURE_NAMES = exports.FEATURE_NAMES = {
   ajax: 'ajax',
+  genericEvents: 'generic_events',
   jserrors: 'jserrors',
   logging: 'logging',
   metrics: 'metrics',
+  /**
+   * @deprecated This feature has been replaced by Generic Events. Use/Import `GenericEvents` instead. This wrapper will be removed in a future release
+   */
   pageAction: 'page_action',
   pageViewEvent: 'page_view_event',
   pageViewTiming: 'page_view_timing',
@@ -30,8 +34,8 @@ const featurePriority = exports.featurePriority = {
   [FEATURE_NAMES.spa]: 5,
   [FEATURE_NAMES.ajax]: 6,
   [FEATURE_NAMES.sessionTrace]: 7,
-  [FEATURE_NAMES.pageAction]: 8,
-  [FEATURE_NAMES.softNav]: 9,
-  [FEATURE_NAMES.sessionReplay]: 10,
-  [FEATURE_NAMES.logging]: 11
+  [FEATURE_NAMES.softNav]: 8,
+  [FEATURE_NAMES.sessionReplay]: 9,
+  [FEATURE_NAMES.logging]: 10,
+  [FEATURE_NAMES.genericEvents]: 11
 };

package/dist/cjs/loaders/micro-agent.js

@@ -17,7 +17,7 @@ var _agentBase = require("./agent-base");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; } // loader files
 // core files
-const nonAutoFeatures = [_features.FEATURE_NAMES.jserrors, _features.FEATURE_NAMES.pageAction, _features.FEATURE_NAMES.metrics];
+const nonAutoFeatures = [_features.FEATURE_NAMES.jserrors, _features.FEATURE_NAMES.genericEvents, _features.FEATURE_NAMES.metrics];
 
 /**
  * A minimal agent class designed to only respond to manual user input. As such, this class does not

package/dist/esm/cdn/experimental.js

@@ -16,13 +16,10 @@ import { Instrument as InstrumentErrors } from '../features/jserrors/instrument'
 import { Instrument as InstrumentXhr } from '../features/ajax/instrument';
 import { Instrument as InstrumentSessionTrace } from '../features/session_trace/instrument';
 import { Instrument as InstrumentSessionReplay } from '../features/session_replay/instrument';
-// import { Instrument as InstrumentSpa } from '../features/spa/instrument'
+import { Instrument as InstrumentGenericEvents } from '../features/generic_events/instrument';
 import { Instrument as InstrumentSoftNav } from '../features/soft_navigations/instrument';
-import { Instrument as InstrumentPageAction } from '../features/page_action/instrument';
 import { Instrument as InstrumentLogs } from '../features/logging/instrument';
 new Agent({
-  features: [InstrumentXhr, InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentSessionReplay, InstrumentMetrics, InstrumentPageAction, InstrumentErrors, InstrumentLogs,
-  // InstrumentSpa,
-  InstrumentSoftNav],
+  features: [InstrumentXhr, InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentSessionReplay, InstrumentMetrics, InstrumentErrors, InstrumentGenericEvents, InstrumentLogs, InstrumentSoftNav],
   loaderType: 'experimental'
 });

package/dist/esm/cdn/pro.js

@@ -11,9 +11,9 @@ import { Instrument as InstrumentErrors } from '../features/jserrors/instrument'
 import { Instrument as InstrumentXhr } from '../features/ajax/instrument';
 import { Instrument as InstrumentSessionTrace } from '../features/session_trace/instrument';
 import { Instrument as InstrumentSessionReplay } from '../features/session_replay/instrument';
-import { Instrument as InstrumentPageAction } from '../features/page_action/instrument';
+import { Instrument as InstrumentGenericEvents } from '../features/generic_events/instrument';
 import { Instrument as InstrumentLogs } from '../features/logging/instrument';
 new Agent({
-  features: [InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentSessionReplay, InstrumentXhr, InstrumentMetrics, InstrumentPageAction, InstrumentErrors, InstrumentLogs],
+  features: [InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentSessionReplay, InstrumentXhr, InstrumentMetrics, InstrumentErrors, InstrumentGenericEvents, InstrumentLogs],
   loaderType: 'pro'
 });

package/dist/esm/cdn/spa.js

@@ -12,10 +12,10 @@ import { Instrument as InstrumentSessionTrace } from '../features/session_trace/
 import { Instrument as InstrumentSessionReplay } from '../features/session_replay/instrument';
 import { Instrument as InstrumentSoftNav } from '../features/soft_navigations/instrument';
 import { Instrument as InstrumentSpa } from '../features/spa/instrument';
-import { Instrument as InstrumentPageAction } from '../features/page_action/instrument';
+import { Instrument as InstrumentGenericEvents } from '../features/generic_events/instrument';
 import { Instrument as InstrumentLogs } from '../features/logging/instrument';
 new Agent({
-  features: [InstrumentXhr, InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentSessionReplay, InstrumentMetrics, InstrumentPageAction, InstrumentErrors, InstrumentLogs, InstrumentSoftNav, InstrumentSpa // 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: [InstrumentXhr, InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentSessionReplay, InstrumentMetrics, InstrumentErrors, InstrumentGenericEvents, InstrumentLogs, InstrumentSoftNav, InstrumentSpa // 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/esm/common/aggregate/aggregator.js

@@ -4,7 +4,6 @@
  */
 
 import { SharedContext } from '../context/shared-context';
-import { mapOwn } from '../util/map-own';
 export class Aggregator extends SharedContext {
   constructor(parent) {
     super(parent);
@@ -30,7 +29,7 @@ export class Aggregator extends SharedContext {
     oldMetrics.count += metrics.count;
 
     // iterate through each new metric and merge
-    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];
@@ -89,7 +88,8 @@ function aggregateMetrics(newMetrics, oldMetrics) {
     count: 0
   };
   oldMetrics.count += 1;
-  mapOwn(newMetrics, function (key, value) {
+  Object.entries(newMetrics || {}).forEach(_ref => {
+    let [key, value] = _ref;
     oldMetrics[key] = updateMetric(value, oldMetrics[key]);
   });
   return oldMetrics;

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

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

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

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.263.0";
+export const VERSION = "1.264.0";
 
 /**
  * Exposes the build type of the agent

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

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.263.0";
+export const VERSION = "1.264.0";
 
 /**
  * Exposes the build type of the agent