@newrelic/browser-agent 1.263.0 → 1.264.0

package/src/cdn/experimental.js

@@ -17,9 +17,8 @@ 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({
@@ -30,10 +29,9 @@ new Agent({
     InstrumentSessionTrace,
     InstrumentSessionReplay,
     InstrumentMetrics,
-    InstrumentPageAction,
     InstrumentErrors,
+    InstrumentGenericEvents,
     InstrumentLogs,
-    // InstrumentSpa,
     InstrumentSoftNav
   ],
   loaderType: 'experimental'

package/src/cdn/pro.js

@@ -12,7 +12,7 @@ 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({
@@ -23,8 +23,8 @@ new Agent({
     InstrumentSessionReplay,
     InstrumentXhr,
     InstrumentMetrics,
-    InstrumentPageAction,
     InstrumentErrors,
+    InstrumentGenericEvents,
     InstrumentLogs
   ],
   loaderType: 'pro'

package/src/cdn/spa.js

@@ -13,7 +13,7 @@ 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({
@@ -24,8 +24,8 @@ new Agent({
     InstrumentSessionTrace,
     InstrumentSessionReplay,
     InstrumentMetrics,
-    InstrumentPageAction,
     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

package/src/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) {
@@ -34,7 +33,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
 
@@ -94,7 +93,7 @@ export class Aggregator extends SharedContext {
 function aggregateMetrics (newMetrics, oldMetrics) {
   if (!oldMetrics) oldMetrics = { count: 0 }
   oldMetrics.count += 1
-  mapOwn(newMetrics, function (key, value) {
+  Object.entries(newMetrics || {}).forEach(([key, value]) => {
     oldMetrics[key] = updateMetric(value, oldMetrics[key])
   })
   return oldMetrics

package/src/common/config/state/init.js

@@ -41,12 +41,13 @@ const model = () => {
       allowed_origins: undefined
     },
     feature_flags: [],
+    generic_events: { enabled: true, harvestTimeSeconds: 30, autoStart: true },
     harvest: { tooManyRequestsDelay: 60 },
     jserrors: { enabled: true, harvestTimeSeconds: 10, autoStart: true },
     logging: { enabled: true, harvestTimeSeconds: 10, autoStart: true, level: LOG_LEVELS.INFO },
     metrics: { enabled: true, autoStart: true },
     obfuscate: undefined,
-    page_action: { enabled: true, harvestTimeSeconds: 30, autoStart: true },
+    page_action: { enabled: true },
     page_view_event: { enabled: true, autoStart: true },
     page_view_timing: { enabled: true, harvestTimeSeconds: 30, long_task: false, autoStart: true },
     privacy: { cookies_enabled: true }, // *cli - per discussion, default should be true

package/src/common/constants/runtime.js

@@ -72,8 +72,6 @@ export const ffVersion = (() => {
   return 0
 })()
 
-export const isIE = Boolean(isBrowserScope && window.document.documentMode) // deprecated property that only works in IE
-
 export const supportsSendBeacon = !!globalScope.navigator?.sendBeacon
 
 /**

package/src/common/drain/drain.js

@@ -4,7 +4,6 @@
  */
 
 import { ee } from '../event-emitter/contextual-ee'
-import { mapOwn } from '../util/map-own'
 import { registerHandler as defaultRegister } from '../event-emitter/register-handler'
 import { featurePriority } from '../../loaders/features/features'
 
@@ -102,8 +101,8 @@ function drainGroup (agentIdentifier, group, activateGroup = true) {
         emitEvent(bufferedEventsInGroup[i], groupHandlers)
       }
 
-      mapOwn(groupHandlers, function (eventType, handlerRegistrationList) {
-        mapOwn(handlerRegistrationList, function (i, registration) {
+      Object.entries(groupHandlers).forEach(([eventType, handlerRegistrationList]) => {
+        Object.values(handlerRegistrationList || {}).forEach((registration) => {
           // registration is an array of: [targetEE, eventHandler]
           registration[0].on(eventType, registration[1])
         })
@@ -125,7 +124,7 @@ function drainGroup (agentIdentifier, group, activateGroup = true) {
  */
 function emitEvent (evt, groupHandlers) {
   var type = evt[1]
-  mapOwn(groupHandlers[type], function (i, registration) {
+  Object.values(groupHandlers[type] || {}).forEach((registration) => {
     var sourceEE = evt[0]
     var ee = registration[0]
     if (ee === sourceEE) {

package/src/common/harvest/harvest.js

@@ -14,7 +14,7 @@ import { Obfuscator } from '../util/obfuscate'
 import { applyFnToProps } from '../util/traverse'
 import { SharedContext } from '../context/shared-context'
 import { VERSION } from '../constants/env'
-import { isWorkerScope, isIE } from '../constants/runtime'
+import { isWorkerScope } from '../constants/runtime'
 import { warn } from '../util/console'
 import { now } from '../timing/now'
 
@@ -137,8 +137,8 @@ export class Harvest extends 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. */
-    let result = submitMethod({ url: fullUrl, body, sync: opts.unload && (isWorkerScope || isIE), headers })
+       Following the removal of img-element method. */
+    let result = submitMethod({ url: fullUrl, body, sync: opts.unload && (isWorkerScope), headers })
 
     if (!opts.unload && cbFinished && submitMethod === submitData.xhr) {
       const harvestScope = this

package/src/common/serialize/bel-serializer.js

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { mapOwn } from '../util/map-own'
 import { stringify } from '../util/stringify'
 import { Obfuscator } from '../util/obfuscate'
 
@@ -47,7 +46,7 @@ export function getAddStringContext (agentIdentifier) {
 export function addCustomAttributes (attrs, addString) {
   var attrParts = []
 
-  mapOwn(attrs, function (key, val) {
+  Object.entries(attrs || {}).forEach(([key, val]) => {
     if (attrParts.length >= MAX_ATTRIBUTES) return
     var type = 5
     var serializedValue

package/src/common/session/session-entity.js

@@ -3,7 +3,7 @@ import { warn } from '../util/console'
 import { stringify } from '../util/stringify'
 import { ee } from '../event-emitter/contextual-ee'
 import { Timer } from '../timer/timer'
-import { isBrowserScope, isIE } from '../constants/runtime'
+import { isBrowserScope } from '../constants/runtime'
 import { DEFAULT_EXPIRES_MS, DEFAULT_INACTIVE_MS, MODE, PREFIX, SESSION_EVENTS, SESSION_EVENT_TYPES } from './constants'
 import { InteractionTimer } from '../timer/interaction-timer'
 import { wrapEvents } from '../wrap'
@@ -57,7 +57,7 @@ export 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 (isBrowserScope && !isIE) {
+    if (isBrowserScope) {
       windowAddEventListener('storage', (event) => {
         if (event.key === this.lookupKey) {
           const obj = typeof event.newValue === 'string' ? JSON.parse(event.newValue) : event.newValue

package/src/common/url/encode.js

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { mapOwn } from '../util/map-own'
 import { stringify } from '../util/stringify'
 
 // Characters that are safe in a qs, but get encoded.
@@ -16,7 +15,7 @@ var charMap = {
   '%3B': ';'
 }
 
-var charList = mapOwn(charMap, function (k) { return k })
+var charList = Object.keys(charMap)
 var safeEncoded = new RegExp(charList.join('|'), 'g')
 
 function real (c) {
@@ -43,7 +42,7 @@ export function obj (payload, maxBytes) {
   var total = 0
   var result = ''
 
-  mapOwn(payload, function (feature, dataArray) {
+  Object.entries(payload || {}).forEach(([feature, dataArray]) => {
     var intermediate = []
     var next
     var i

package/src/common/util/submit-data.js

@@ -20,7 +20,6 @@ export function getSubmitMethod ({ isFinalHarvest = false } = {}) {
   return isFinalHarvest && isBrowserScope && 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/src/features/generic_events/aggregate/index.js

@@ -0,0 +1,133 @@
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { stringify } from '../../../common/util/stringify'
+import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
+import { cleanURL } from '../../../common/url/clean-url'
+import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config'
+import { FEATURE_NAME } from '../constants'
+import { isBrowserScope } from '../../../common/constants/runtime'
+import { AggregateBase } from '../../utils/aggregate-base'
+import { warn } from '../../../common/util/console'
+import { now } from '../../../common/timing/now'
+import { registerHandler } from '../../../common/event-emitter/register-handler'
+import { deregisterDrain } from '../../../common/drain/drain'
+import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
+
+export class Aggregate extends AggregateBase {
+  #agentRuntime
+  static featureName = FEATURE_NAME
+  constructor (agentIdentifier, aggregator) {
+    super(agentIdentifier, aggregator, FEATURE_NAME)
+
+    this.eventsPerHarvest = 1000
+    this.harvestTimeSeconds = getConfigurationValue(this.agentIdentifier, 'generic_events.harvestTimeSeconds')
+
+    this.referrerUrl = (isBrowserScope && document.referrer) ? cleanURL(document.referrer) : undefined
+    this.currentEvents = []
+
+    this.events = []
+    this.overflow = []
+
+    this.#agentRuntime = getRuntime(this.agentIdentifier)
+
+    this.waitForFlags(['ins']).then(([ins]) => {
+      if (!ins) {
+        this.blocked = true
+        deregisterDrain(this.agentIdentifier, this.featureName)
+        return
+      }
+
+      if (getConfigurationValue(this.agentIdentifier, 'page_action.enabled')) {
+        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: cleanURL('' + location),
+            ...(isBrowserScope && {
+              browserWidth: window.document.documentElement?.clientWidth,
+              browserHeight: window.document.documentElement?.clientHeight
+            })
+          })
+        }, this.featureName, this.ee)
+      }
+
+      this.harvestScheduler = new HarvestScheduler('ins', { onFinished: (...args) => this.onHarvestFinished(...args) }, this)
+      this.harvestScheduler.harvest.on('ins', (...args) => this.onHarvestStarted(...args))
+      this.harvestScheduler.startTimer(this.harvestTimeSeconds, 0)
+
+      this.drain()
+    })
+  }
+
+  onHarvestStarted (options) {
+    const { userAttributes, atts } = 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 (obj = {}) {
+    if (!obj || !Object.keys(obj).length) return
+    if (!obj.eventType) {
+      warn(44)
+      return
+    }
+
+    for (let key in obj) {
+      let val = obj[key]
+      obj[key] = (val && typeof val === 'object' ? 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(now()),
+      /** all generic events require a pageUrl */
+      pageUrl: cleanURL(getRuntime(this.agentIdentifier).origin)
+    }
+
+    const eventAttributes = {
+      /** Agent-level custom attributes */
+      ...(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(SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen'])
+      this.overflow = [...this.overflow, ...this.events.splice(0, Infinity)]
+      this.harvestScheduler.runHarvest()
+    }
+  }
+}

package/src/features/generic_events/constants.js

@@ -0,0 +1,3 @@
+import { FEATURE_NAMES } from '../../loaders/features/features'
+
+export const FEATURE_NAME = FEATURE_NAMES.genericEvents

package/src/features/generic_events/index.js

@@ -0,0 +1 @@
+export { Instrument as GenericEvents } from './instrument/index'

package/src/features/generic_events/instrument/index.js

@@ -0,0 +1,22 @@
+/* Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getConfigurationValue } from '../../../common/config/config'
+import { deregisterDrain } from '../../../common/drain/drain'
+import { InstrumentBase } from '../../utils/instrument-base'
+import { FEATURE_NAME } from '../constants'
+
+export class Instrument extends InstrumentBase {
+  static featureName = FEATURE_NAME
+  constructor (agentIdentifier, aggregator, auto = true) {
+    super(agentIdentifier, aggregator, FEATURE_NAME, auto)
+    const genericEventSourceConfigs = [
+      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 deregisterDrain(this.agentIdentifier, this.featureName)
+  }
+}

package/src/features/jserrors/aggregate/index.js

@@ -12,7 +12,6 @@ import { registerHandler as register } from '../../../common/event-emitter/regis
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
 import { stringify } from '../../../common/util/stringify'
 import { handle } from '../../../common/event-emitter/handle'
-import { mapOwn } from '../../../common/util/map-own'
 import { getInfo, getConfigurationValue, getRuntime } from '../../../common/config/config'
 import { globalScope } from '../../../common/constants/runtime'
 
@@ -91,7 +90,7 @@ export class Aggregate extends AggregateBase {
 
   onHarvestFinished (result) {
     if (result.retry && this.currentBody) {
-      mapOwn(this.currentBody, (key, value) => {
+      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)
@@ -264,8 +263,8 @@ export class Aggregate extends AggregateBase {
       var allCustomAttrs = {}
       const localCustomAttrs = item[4]
 
-      mapOwn(interaction.root.attrs.custom, setCustom) // tack on custom attrs from the interaction
-      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) {
@@ -281,7 +280,7 @@ export class Aggregate extends AggregateBase {
 
       this.aggregator.store(item[0], aggregateHash, params, item[3], allCustomAttrs)
 
-      function setCustom (key, val) {
+      function setCustom ([key, val]) {
         allCustomAttrs[key] = (val && typeof val === 'object' ? stringify(val) : val)
       }
     })

package/src/features/page_action/instrument/index.js

@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { InstrumentBase } from '../../utils/instrument-base'
-import { FEATURE_NAME } from '../constants'
+import { GenericEvents } from '../../generic_events'
 
-export class Instrument extends InstrumentBase {
-  static featureName = FEATURE_NAME
+/**
+ * @deprecated This feature has been replaced by Generic Events. Use/Import `GenericEvents` instead. This wrapper will be removed in a future release
+ */
+export class Instrument extends GenericEvents {
   constructor (agentIdentifier, aggregator, auto = true) {
-    super(agentIdentifier, aggregator, FEATURE_NAME, auto)
-    this.importAggregator()
+    super(agentIdentifier, aggregator, auto)
   }
 }

package/src/features/page_view_event/aggregate/initialized-features.js

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

package/src/features/page_view_timing/aggregate/index.js

@@ -4,7 +4,6 @@
  */
 
 import { nullable, numeric, getAddStringContext, addCustomAttributes } from '../../../common/serialize/bel-serializer'
-import { mapOwn } from '../../../common/util/map-own'
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
 import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { handle } from '../../../common/event-emitter/handle'
@@ -138,7 +137,7 @@ export class Aggregate extends AggregateBase {
 
     var reservedAttributes = ['size', 'eid', 'cls', 'type', 'fid', 'elTag', 'elUrl', 'net-type',
       'net-etype', 'net-rtt', 'net-dlink']
-    mapOwn(customAttributes, function (key, val) {
+    Object.entries(customAttributes || {}).forEach(([key, val]) => {
       if (reservedAttributes.indexOf(key) < 0) {
         timingAttributes[key] = val
       }

package/src/features/spa/aggregate/index.js

@@ -6,7 +6,6 @@
 import { registerHandler as register } from '../../../common/event-emitter/register-handler'
 import { parseUrl } from '../../../common/url/parse-url'
 import { shouldCollectEvent } from '../../../common/deny-list/deny-list'
-import { mapOwn } from '../../../common/util/map-own'
 import { navTimingValues as navTiming } from '../../../common/timing/nav-timing'
 import { generateUuid } from '../../../common/ids/unique-id'
 import { Interaction } from './interaction'
@@ -668,7 +667,7 @@ export class Aggregate extends AggregateBase {
 
       // make sure that newrelic[INTERACTION]() works in end handler
       state.currentNode = root
-      mapOwn(interaction.handlers, function (i, cb) {
+      Object.values(interaction.handlers || {}).forEach(function (cb) {
         cb(attrs.store)
       })
       setCurrentNode(null)

package/src/features/spa/aggregate/interaction.js

@@ -4,7 +4,6 @@
  */
 
 import { getInfo, getRuntime, originals } from '../../../common/config/config'
-import { mapOwn } from '../../../common/util/map-own'
 import { ee } from '../../../common/event-emitter/contextual-ee'
 import { InteractionNode } from './interaction-node'
 
@@ -101,7 +100,7 @@ InteractionPrototype.finish = function finishInteraction () {
     this.onFinished(this)
   }
 
-  mapOwn(getInfo(interaction.agentIdentifier).jsAttributes, function (attr, value) {
+  Object.entries(getInfo(interaction.agentIdentifier).jsAttributes || {}).forEach(([attr, value]) => {
     if (!(attr in customAttrs)) customAttrs[attr] = value
   })
 

package/src/features/spa/aggregate/serializer.js

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { cleanURL } from '../../../common/url/clean-url'
-import { mapOwn } from '../../../common/util/map-own'
 import { nullable, numeric, getAddStringContext, addCustomAttributes } from '../../../common/serialize/bel-serializer'
 import { SharedContext } from '../../../common/context/shared-context'
 import { getInfo } from '../../../common/config/config'
@@ -181,7 +180,7 @@ export class Serializer extends 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
-        mapOwn(navTiming.slice(1, 21), function (i, v) {
+        Object.values(navTiming.slice(1, 21) || {}).forEach((v) => {
           if (v !== undefined) {
             navTimingNode += seperator + numeric(v - prev)
             seperator = ','

package/src/features/utils/aggregate-base.js

@@ -2,7 +2,7 @@ import { FeatureBase } from './feature-base'
 import { getInfo, isConfigured, getRuntime } from '../../common/config/config'
 import { configure } from '../../loaders/configure/configure'
 import { gosCDN } from '../../common/window/nreum'
-import { drain } from '../../common/drain/drain'
+import { deregisterDrain, drain } from '../../common/drain/drain'
 import { activatedFeatures } from '../../common/util/feature-flags'
 
 export class AggregateBase extends FeatureBase {
@@ -34,6 +34,8 @@ export class AggregateBase extends FeatureBase {
     })
     return flagsPromise.catch(err => {
       this.ee.emit('internal-error', [err])
+      this.blocked = true
+      deregisterDrain(this.agentIdentifier, this.featureName)
     })
   }
 

package/src/features/utils/lazy-feature-loader.js

@@ -18,12 +18,12 @@ export function lazyFeatureLoader (featureName, featurePart) {
         return import(/* webpackChunkName: "ajax-aggregate" */ '../ajax/aggregate')
       case FEATURE_NAMES.jserrors:
         return import(/* webpackChunkName: "jserrors-aggregate" */ '../jserrors/aggregate')
+      case FEATURE_NAMES.genericEvents:
+        return import(/* webpackChunkName: "generic_events-aggregate" */ '../generic_events/aggregate')
       case FEATURE_NAMES.logging:
         return import(/* webpackChunkName: "logging-aggregate" */ '../logging/aggregate')
       case FEATURE_NAMES.metrics:
         return import(/* webpackChunkName: "metrics-aggregate" */ '../metrics/aggregate')
-      case FEATURE_NAMES.pageAction:
-        return import(/* webpackChunkName: "page_action-aggregate" */ '../page_action/aggregate')
       case FEATURE_NAMES.pageViewEvent:
         return import(/* webpackChunkName: "page_view_event-aggregate" */ '../page_view_event/aggregate')
       case FEATURE_NAMES.pageViewTiming:

package/src/index.js

@@ -4,9 +4,12 @@ export { MicroAgent } from './loaders/micro-agent'
 
 export { Ajax } from './features/ajax'
 export { JSErrors } from './features/jserrors'
+export { GenericEvents } from './features/generic_events'
+export { Logging } from './features/logging'
 export { Metrics } from './features/metrics'
 export { PageAction } from './features/page_action'
 export { PageViewEvent } from './features/page_view_event'
 export { PageViewTiming } from './features/page_view_timing'
 export { SessionTrace } from './features/session_trace'
+export { SessionReplay } from './features/session_replay'
 export { Spa } from './features/spa'

package/src/loaders/agent-base.js

@@ -3,7 +3,6 @@
 import { warn } from '../common/util/console'
 import { SR_EVENT_EMITTER_TYPES } from '../features/session_replay/constants'
 import { generateRandomHexString } from '../common/ids/unique-id'
-import { ee } from '../common/event-emitter/contextual-ee'
 
 /**
  * @typedef {import('./api/interaction-types').InteractionInstance} InteractionInstance
@@ -14,9 +13,6 @@ export class AgentBase {
 
   constructor (agentIdentifier = generateRandomHexString(16)) {
     this.agentIdentifier = agentIdentifier
-
-    // Assign the observation context to the event emitter, so it knows how to create observation contexts
-    this.ee = ee.get(agentIdentifier)
   }
 
   /**

package/src/loaders/api/api.js

@@ -69,7 +69,7 @@ export function setAPI (agentIdentifier, forceDrain, runSoftNavOverSpa = false)
   // Setup stub functions that queue calls for later processing.
   asyncApiMethods.forEach(fnName => { apiInterface[fnName] = apiCall(prefix, fnName, true, 'api') })
 
-  apiInterface.addPageAction = apiCall(prefix, 'addPageAction', true, FEATURE_NAMES.pageAction)
+  apiInterface.addPageAction = apiCall(prefix, 'addPageAction', true, FEATURE_NAMES.genericEvents)
 
   apiInterface.setPageViewName = function (name, host) {
     if (typeof name !== 'string') return

package/src/loaders/api/apiAsync.js

@@ -27,7 +27,7 @@ export function setAPI (agentIdentifier) {
     var time = providedTime ? providedTime - originTime : t
     handle(CUSTOM_METRIC_CHANNEL, ['finished', { time }], undefined, FEATURE_NAMES.metrics, instanceEE)
     addToTrace(t, { name: 'finished', start: time + originTime, origin: 'nr' })
-    handle('api-addPageAction', [time, 'finished'], undefined, FEATURE_NAMES.pageAction, instanceEE)
+    handle('api-addPageAction', [time, 'finished'], undefined, FEATURE_NAMES.genericEvents, instanceEE)
   }
 
   function addToTrace (t, evt) {