@newrelic/browser-agent 1.262.0 → 1.264.0

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/logging/aggregate/index.js

@@ -6,7 +6,7 @@ import { warn } from '../../../common/util/console'
 import { stringify } from '../../../common/util/stringify'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { AggregateBase } from '../../utils/aggregate-base'
-import { FEATURE_NAME, LOGGING_EVENT_EMITTER_CHANNEL, LOGGING_IGNORED, LOGGING_LEVEL_FAILURE_MESSAGE, LOG_LEVELS, MAX_PAYLOAD_SIZE } from '../constants'
+import { FEATURE_NAME, LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS, MAX_PAYLOAD_SIZE } from '../constants'
 import { Log } from '../shared/log'
 import { isValidLogLevel } from '../shared/utils'
 
@@ -49,7 +49,7 @@ export class Aggregate extends AggregateBase {
 
     if (!attributes || typeof attributes !== 'object') attributes = {}
     if (typeof level === 'string') level = level.toUpperCase()
-    if (!isValidLogLevel(level)) return warn(LOGGING_LEVEL_FAILURE_MESSAGE + level, Object.values(LOG_LEVELS))
+    if (!isValidLogLevel(level)) return warn(30, level)
 
     try {
       if (typeof message !== 'string') {
@@ -63,13 +63,13 @@ export class Aggregate extends AggregateBase {
         else message = String(message)
       }
     } catch (err) {
-      warn('could not cast log message to string', message)
+      warn(16, message)
       return
     }
-    if (typeof message !== 'string' || !message) return warn(LOGGING_IGNORED + 'invalid message')
+    if (typeof message !== 'string' || !message) return warn(32)
     if (message.length > MAX_PAYLOAD_SIZE) {
       handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', message.length])
-      return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes: ', message.slice(0, 25) + '...')
+      return warn(31, message.slice(0, 25) + '...')
     }
 
     const log = new Log(
@@ -81,7 +81,7 @@ export class Aggregate extends AggregateBase {
     const logBytes = log.message.length + stringify(log.attributes).length + log.level.length + 10 // timestamp == 10 chars
     if (logBytes > MAX_PAYLOAD_SIZE) {
       handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', logBytes])
-      return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes: ', log.message.slice(0, 25) + '...')
+      return warn(31, log.message.slice(0, 25) + '...')
     }
 
     if (this.estimatedBytes + logBytes >= MAX_PAYLOAD_SIZE) {

package/src/features/logging/constants.js

@@ -13,7 +13,3 @@ export const LOGGING_EVENT_EMITTER_CHANNEL = 'log'
 export const FEATURE_NAME = FEATURE_NAMES.logging
 
 export const MAX_PAYLOAD_SIZE = 1000000
-
-export const LOGGING_FAILURE_MESSAGE = 'failed to wrap logger: '
-export const LOGGING_LEVEL_FAILURE_MESSAGE = 'invalid log level: '
-export const LOGGING_IGNORED = 'ignored log: '

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

@@ -96,6 +96,18 @@ export class Aggregate extends AggregateBase {
     // Check if proxy for either chunks or beacon is being used
     if (proxy.assets) this.storeSupportabilityMetrics('Config/AssetsUrl/Changed')
     if (proxy.beacon) this.storeSupportabilityMetrics('Config/BeaconUrl/Changed')
+
+    if (isBrowserScope && window.MutationObserver) {
+      this.storeSupportabilityMetrics('Generic/VideoElement/Added', window.document.querySelectorAll('video').length)
+      const mo = new MutationObserver(records => {
+        records.forEach(record => {
+          record.addedNodes.forEach(addedNode => {
+            if (addedNode instanceof HTMLVideoElement) { this.storeSupportabilityMetrics('Generic/VideoElement/Added', 1) }
+          })
+        })
+      })
+      mo.observe(window.document.body, { childList: true, subtree: true })
+    }
   }
 
   eachSessionChecks () {

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/index.js

@@ -1,7 +1,7 @@
 import { globalScope, isBrowserScope, originTime } from '../../../common/constants/runtime'
 import { addPT, addPN } from '../../../common/timing/nav-timing'
 import { stringify } from '../../../common/util/stringify'
-import { getInfo, getRuntime } from '../../../common/config/config'
+import { getInfo, getRuntime, isConfigured } from '../../../common/config/config'
 import { Harvest } from '../../../common/harvest/harvest'
 import * as CONSTANTS from '../constants'
 import { getActivatedFeaturesFlags } from './initialized-features'
@@ -28,6 +28,11 @@ export class Aggregate extends AggregateBase {
     this.firstByteToDomContent = 0 // our "dom processing" duration
     this.timeKeeper = new TimeKeeper(this.agentIdentifier)
 
+    if (!isConfigured(agentIdentifier)) {
+      this.ee.abort()
+      return warn(43)
+    }
+
     if (isBrowserScope) {
       timeToFirstByte.subscribe(({ value, attrs }) => {
         const navEntry = attrs.navigationEntry
@@ -48,7 +53,6 @@ export class Aggregate extends AggregateBase {
     const agentRuntime = getRuntime(this.agentIdentifier)
     const harvester = new Harvest(this)
 
-    if (!info.beacon) return
     if (info.queueTime) this.aggregator.store('measures', 'qt', { value: info.queueTime })
     if (info.applicationTime) this.aggregator.store('measures', 'ap', { value: info.applicationTime })
 
@@ -126,11 +130,24 @@ export class Aggregate extends AggregateBase {
           if (!this.timeKeeper.ready) throw new Error('TimeKeeper not ready')
 
           agentRuntime.timeKeeper = this.timeKeeper
+
+          // Check if the time diff is such that we need to capture a supportability metric
+          if (this.timeKeeper.localTimeDiff >= 12 * 60 * 60 * 1000) {
+            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/DiffExceed12Hrs'], undefined, FEATURE_NAMES.metrics, this.ee)
+          } else if (this.timeKeeper.localTimeDiff >= 6 * 60 * 60 * 1000) {
+            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/DiffExceed6Hrs'], undefined, FEATURE_NAMES.metrics, this.ee)
+          } else if (this.timeKeeper.localTimeDiff >= 60 * 60 * 1000) {
+            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/DiffExceed1Hrs'], undefined, FEATURE_NAMES.metrics, this.ee)
+          }
         } catch (error) {
-          handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/Failed'], undefined, FEATURE_NAMES.metrics, this.ee)
+          if (error?.message?.indexOf('invalid format') > 0) {
+            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/InvalidFormat'], undefined, FEATURE_NAMES.metrics, this.ee)
+          } else {
+            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/Failed'], undefined, FEATURE_NAMES.metrics, this.ee)
+          }
           drain(this.agentIdentifier, FEATURE_NAMES.metrics, true)
           this.ee.abort()
-          warn('Could not calculate New Relic server time. Agent shutting down.', error)
+          warn(17, error)
           return
         }
 
@@ -141,7 +158,7 @@ export class Aggregate extends AggregateBase {
           this.drain()
         } catch (err) {
           this.ee.abort()
-          warn('RUM call failed. Agent shutting down.', err)
+          warn(18, err)
         }
       }
     })

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/session_replay/aggregate/index.js

@@ -394,7 +394,7 @@ export class Aggregate extends AggregateBase {
 
   /** Abort the feature, once aborted it will not resume */
   abort (reason = {}, data) {
-    warn(`SR aborted -- ${reason.message}`)
+    warn(33, reason.message)
     handle(SUPPORTABILITY_METRIC_CHANNEL, [`SessionReplay/Abort/${reason.sm}`, data], undefined, FEATURE_NAMES.metrics, this.ee)
     this.blocked = true
     this.mode = MODE.OFF

package/src/features/session_replay/shared/recorder.js

@@ -35,7 +35,7 @@ export class Recorder {
     /** Config to inform to inline stylesheet contents (true default) */
     this.shouldInlineStylesheets = getConfigurationValue(this.parent.agentIdentifier, 'session_replay.inline_stylesheet')
     /** A flag that can be set to false by failing conversions to stop the fetching process */
-    this.shouldFix = this.shouldInlineStylesheets
+    this.shouldFix = this.shouldInlineStylesheets && getConfigurationValue(this.parent.agentIdentifier, 'session_replay.fix_stylesheets')
     /** The method to stop recording. This defaults to a noop, but is overwritten once the recording library is imported and initialized */
     this.stopRecording = () => { /* no-op until set by rrweb initializer */ }
   }

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)
@@ -757,7 +756,7 @@ export class Aggregate extends AggregateBase {
       handle(SUPPORTABILITY_METRIC_CHANNEL, [`Spa/Interaction/${smCategory}/Duration/Ms`, Math.max((interaction.root?.end || 0) - (interaction.root?.start || 0), 0)], undefined, FEATURE_NAMES.metrics, baseEE)
 
       scheduler?.scheduleHarvest(0)
-      if (!scheduler) warn('SPA scheduler is not initialized. Saved interaction is not sent!')
+      if (!scheduler) warn(19)
     }
 
     function isEnabled () {

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)
     })
   }
 
@@ -49,7 +51,8 @@ export class AggregateBase extends FeatureBase {
   checkConfiguration () {
     // NOTE: This check has to happen at aggregator load time
     if (!isConfigured(this.agentIdentifier)) {
-      let jsAttributes = { ...gosCDN().info?.jsAttributes }
+      const cdn = gosCDN()
+      let jsAttributes = { ...cdn.info?.jsAttributes }
       try {
         jsAttributes = {
           ...jsAttributes,
@@ -59,9 +62,9 @@ export class AggregateBase extends FeatureBase {
         // do nothing
       }
       configure({ agentIdentifier: this.agentIdentifier }, {
-        ...gosCDN(),
+        ...cdn,
         info: {
-          ...gosCDN().info,
+          ...cdn.info,
           jsAttributes
         },
         runtime: getRuntime(this.agentIdentifier)

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

@@ -85,7 +85,7 @@ export class InstrumentBase extends FeatureBase {
           session = setupAgentSession(this.agentIdentifier)
         }
       } catch (e) {
-        warn('A problem occurred when starting up session manager. This page will not start or extend any session.', e)
+        warn(20, e)
         this.ee.emit('internal-error', [e])
         if (this.featureName === FEATURE_NAMES.sessionReplay) this.abortHandler?.() // SR should stop recording if session DNE
       }
@@ -105,7 +105,7 @@ export class InstrumentBase extends FeatureBase {
         this.featAggregate = new Aggregate(this.agentIdentifier, this.aggregator, argsObjFromInstrument)
         loadedSuccessfully(true)
       } catch (e) {
-        warn(`Downloading and initializing ${this.featureName} failed...`, e)
+        warn(34, e)
         this.abortHandler?.() // undo any important alterations made to the page
         // not supported yet but nice to do: "abort" this agent's EE for this feature specifically
         drain(this.agentIdentifier, this.featureName, true)

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)
   }
 
   /**
@@ -25,7 +21,7 @@ export class AgentBase {
    * @param  {...any} args
    */
   #callMethod (methodName, ...args) {
-    if (typeof this.api?.[methodName] !== 'function') warn(`Call to agent api ${methodName} failed. The API is not currently initialized.`)
+    if (typeof this.api?.[methodName] !== 'function') warn(35, methodName)
     else return this.api[methodName](...args)
   }
 

package/src/loaders/agent.js

@@ -13,7 +13,6 @@ import { Instrument as PageViewEvent } from '../features/page_view_event/instrum
 import { Aggregator } from '../common/aggregate/aggregator'
 import { gosNREUM, setNREUMInitializedAgent } from '../common/window/nreum'
 import { warn } from '../common/util/console'
-import { stringify } from '../common/util/stringify'
 import { globalScope } from '../common/constants/runtime'
 
 /**
@@ -31,7 +30,7 @@ export class Agent extends AgentBase {
     if (!globalScope) {
       // We could not determine the runtime environment. Short-circuite the agent here
       // to avoid possible exceptions later that may cause issues with customer's application.
-      warn('Failed to initialize the agent. Could not determine the runtime environment.')
+      warn(21)
       return
     }
 
@@ -74,12 +73,12 @@ export class Agent extends AgentBase {
 
         const dependencies = getFeatureDependencyNames(InstrumentCtor.featureName)
         const hasAllDeps = dependencies.every(featName => featName in this.features) // any other feature(s) this depends on should've been initialized on prior iterations by priority order
-        if (!hasAllDeps) warn(`${InstrumentCtor.featureName} is enabled but one or more dependent features has not been initialized (${stringify(dependencies)}). This may cause unintended consequences or missing data...`)
+        if (!hasAllDeps) warn(36, InstrumentCtor.featureName)
 
         this.features[InstrumentCtor.featureName] = new InstrumentCtor(this.agentIdentifier, this.sharedAggregator)
       })
     } catch (err) {
-      warn('Failed to initialize all enabled instrument classes (agent aborted) -', err)
+      warn(22, err)
       for (const featName in this.features) { // this.features hold only features that have been instantiated
         this.features[featName].abortHandler?.()
       }