@newrelic/browser-agent 1.263.0 → 1.265.0

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

@@ -1,27 +1,34 @@
+import { EventBuffer } from '../../utils/event-buffer'
+
 export class RecorderEvents {
-  constructor () {
-    /** The buffer to hold recorder event nodes */
-    this.events = []
-    /** Payload metadata -- Should indicate when a replay blob started recording.  Resets each time a harvest occurs.
+  /** The buffer to hold recorder event nodes */
+  #events = new EventBuffer(Infinity)
+  /** Payload metadata -- Should indicate when a replay blob started recording.  Resets each time a harvest occurs.
      * cycle timestamps are used as fallbacks if event timestamps cannot be used
      */
-    this.cycleTimestamp = Date.now()
-    /** A value which increments with every new mutation node reported. Resets after a harvest is sent */
-    this.payloadBytesEstimation = 0
-    /** Payload metadata -- Should indicate that the payload being sent has a full DOM snapshot. This can happen
-     * -- When the recording library begins recording, it starts by taking a DOM snapshot
-     * -- When visibility changes from "hidden" -> "visible", it must capture a full snapshot for the replay to work correctly across tabs
-    */
-    this.hasSnapshot = false
-    /** Payload metadata -- Should indicate that the payload being sent has a meta node. The meta node should always precede a snapshot node. */
-    this.hasMeta = false
-    /** Payload metadata -- Should indicate that the payload being sent contains an error.  Used for query/filter purposes in UI */
-    this.hasError = false
-    /** Payload metadata -- Denotes whether all stylesheet elements were able to be inlined */
-    this.inlinedAllStylesheets = true
-  }
+  cycleTimestamp = Date.now()
+  /** Payload metadata -- Should indicate that the payload being sent has a full DOM snapshot. This can happen
+   * -- When the recording library begins recording, it starts by taking a DOM snapshot
+   * -- When visibility changes from "hidden" -> "visible", it must capture a full snapshot for the replay to work correctly across tabs
+  */
+  hasSnapshot = false
+  /** Payload metadata -- Should indicate that the payload being sent has a meta node. The meta node should always precede a snapshot node. */
+  hasMeta = false
+  /** Payload metadata -- Should indicate that the payload being sent contains an error.  Used for query/filter purposes in UI */
+  hasError = false
+  /** Payload metadata -- Denotes whether all stylesheet elements were able to be inlined */
+  inlinedAllStylesheets = true
 
   add (event) {
-    this.events.push(event)
+    this.#events.add(event)
+  }
+
+  get events () {
+    return this.#events.buffer
+  }
+
+  /** A value which increments with every new mutation node reported. Resets after a harvest is sent */
+  get payloadBytesEstimation () {
+    return this.#events.bytes
   }
 }

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

@@ -1,7 +1,7 @@
 import { record as recorder } from 'rrweb'
 import { stringify } from '../../../common/util/stringify'
-import { AVG_COMPRESSION, CHECKOUT_MS, IDEAL_PAYLOAD_SIZE, QUERY_PARAM_PADDING, RRWEB_EVENT_TYPES, SR_EVENT_EMITTER_TYPES } from '../constants'
-import { getConfigurationValue } from '../../../common/config/config'
+import { AVG_COMPRESSION, CHECKOUT_MS, QUERY_PARAM_PADDING, RRWEB_EVENT_TYPES, SR_EVENT_EMITTER_TYPES } from '../constants'
+import { getConfigurationValue } from '../../../common/config/init'
 import { RecorderEvents } from './recorder-events'
 import { MODE } from '../../../common/session/constants'
 import { stylesheetEvaluator } from './stylesheet-evaluator'
@@ -9,6 +9,7 @@ import { handle } from '../../../common/event-emitter/handle'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { buildNRMetaNode } from './utils'
+import { IDEAL_PAYLOAD_SIZE } from '../../../common/constants/agent-constants'
 
 export class Recorder {
   /** Each page mutation or event will be stored (raw) in this array. This array will be cleared on each harvest */
@@ -41,7 +42,14 @@ export class Recorder {
   }
 
   getEvents () {
-    if (this.#preloaded[0]?.events.length) return { ...this.#preloaded[0], type: 'preloaded' }
+    if (this.#preloaded[0]?.events.length) {
+      return {
+        ...this.#preloaded[0],
+        events: this.#preloaded[0].events,
+        payloadBytesEstimation: this.#preloaded[0].payloadBytesEstimation,
+        type: 'preloaded'
+      }
+    }
     return {
       events: [...this.#backloggedEvents.events, ...this.#events.events].filter(x => x),
       type: 'standard',
@@ -93,7 +101,8 @@ export class Recorder {
         this.parent.ee.emit('internal-error', [err])
         /** returning true informs rrweb to swallow the error instead of throwing it to the window */
         return true
-      }
+      },
+      recordAfter: 'DOMContentLoaded'
     })
 
     this.stopRecording = () => {
@@ -176,9 +185,7 @@ export class Recorder {
     if (event.type === RRWEB_EVENT_TYPES.FullSnapshot) {
       this.currentBufferTarget.hasSnapshot = true
     }
-
     this.currentBufferTarget.add(event)
-    this.currentBufferTarget.payloadBytesEstimation += eventBytes
 
     // We are making an effort to try to keep payloads manageable for unloading.  If they reach the unload limit before their interval,
     // it will send immediately.  This often happens on the first snapshot, which can be significantly larger than the other payloads.

package/src/features/session_replay/shared/stylesheet-evaluator.js

@@ -1,4 +1,4 @@
-import { originals } from '../../../common/config/config'
+import { gosNREUMOriginals } from '../../../common/window/nreum'
 import { isBrowserScope } from '../../../common/constants/runtime'
 
 class StylesheetEvaluator {
@@ -57,7 +57,7 @@ class StylesheetEvaluator {
   async #fetchAndOverride (target) {
     if (!target?.href) return
     try {
-      const stylesheetContents = await originals.FETCH.bind(window)(target.href)
+      const stylesheetContents = await gosNREUMOriginals().o.FETCH.bind(window)(target.href)
       if (!stylesheetContents.ok) {
         this.failedToFix++
         return

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

@@ -1,9 +1,10 @@
-import { getConfigurationValue, originals } from '../../../common/config/config'
+import { gosNREUMOriginals } from '../../../common/window/nreum'
+import { getConfigurationValue } from '../../../common/config/init'
 import { canEnableSessionTracking } from '../../utils/feature-gates'
 import { originTime } from '../../../common/constants/runtime'
 
 export function hasReplayPrerequisite (agentId) {
-  return !!originals.MO && // Session Replay cannot work without Mutation Observer
+  return !!gosNREUMOriginals().o.MO && // Session Replay cannot work without Mutation Observer
   canEnableSessionTracking(agentId) && // requires session tracking to be running (hence "session" replay...)
   getConfigurationValue(agentId, 'session_trace.enabled') === true // Session Replay as of now is tightly coupled with Session Trace in the UI
 }

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

@@ -1,6 +1,8 @@
 import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
-import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config'
+import { getInfo } from '../../../common/config/info'
+import { getConfigurationValue } from '../../../common/config/init'
+import { getRuntime } from '../../../common/config/runtime'
 import { FEATURE_NAME } from '../constants'
 import { AggregateBase } from '../../utils/aggregate-base'
 import { TraceStorage } from './trace/storage'
@@ -8,6 +10,7 @@ import { obj as encodeObj } from '../../../common/url/encode'
 import { deregisterDrain } from '../../../common/drain/drain'
 import { globalScope } from '../../../common/constants/runtime'
 import { MODE, SESSION_EVENTS } from '../../../common/session/constants'
+import { applyFnToProps } from '../../../common/util/traverse'
 
 const ERROR_MODE_SECONDS_WINDOW = 30 * 1000 // sliding window of nodes to track when simply monitoring (but not harvesting) in error mode
 /** Reserved room for query param attrs */
@@ -92,7 +95,7 @@ export class Aggregate extends AggregateBase {
     if (typeof PerformanceNavigationTiming !== 'undefined') {
       this.traceStorage.storeTiming(globalScope.performance?.getEntriesByType?.('navigation')[0])
     } else {
-      this.traceStorage.storeTiming(globalScope.performance?.timing)
+      this.traceStorage.storeTiming(globalScope.performance?.timing, true)
     }
 
     /** Only start actually harvesting if running in full mode at init time */
@@ -151,15 +154,21 @@ export class Aggregate extends AggregateBase {
         type: 'BrowserSessionChunk',
         app_id: this.agentInfo.applicationID,
         protocol_version: '0',
-        timestamp: this.timeKeeper.convertRelativeTimestamp(earliestTimeStamp),
+        timestamp: Math.floor(this.timeKeeper.correctAbsoluteTimestamp(
+          this.timeKeeper.convertRelativeTimestamp(earliestTimeStamp)
+        )),
         attributes: encodeObj({
           ...(agentMetadata.entityGuid && { entityGuid: agentMetadata.entityGuid }),
           harvestId: `${this.agentRuntime.session?.state.value}_${this.agentRuntime.ptid}_${this.agentRuntime.harvestCount}`,
           // this section of attributes must be controllable and stay below the query param padding limit -- see QUERY_PARAM_PADDING
           // if not, data could be lost to truncation at time of sending, potentially breaking parsing / API behavior in NR1
           // trace payload metadata
-          'trace.firstTimestamp': this.timeKeeper.convertRelativeTimestamp(earliestTimeStamp),
-          'trace.lastTimestamp': this.timeKeeper.convertRelativeTimestamp(latestTimeStamp),
+          'trace.firstTimestamp': Math.floor(this.timeKeeper.correctAbsoluteTimestamp(
+            this.timeKeeper.convertRelativeTimestamp(earliestTimeStamp)
+          )),
+          'trace.lastTimestamp': Math.floor(this.timeKeeper.correctAbsoluteTimestamp(
+            this.timeKeeper.convertRelativeTimestamp(latestTimeStamp)
+          )),
           'trace.nodes': stns.length,
           'trace.originTimestamp': this.timeKeeper.correctedOriginTime,
           // other payload metadata
@@ -169,11 +178,11 @@ export class Aggregate extends AggregateBase {
           ptid: `${this.ptid}`,
           session: `${this.sessionId}`,
           // customer-defined data should go last so that if it exceeds the query param padding limit it will be truncated instead of important attrs
-          ...(endUserId && { 'enduser.id': endUserId })
+          ...(endUserId && { 'enduser.id': this.obfuscator.obfuscateString(endUserId) })
           // The Query Param is being arbitrarily limited in length here.  It is also applied when estimating the size of the payload in getPayloadSize()
         }, QUERY_PARAM_PADDING).substring(1) // remove the leading '&'
       },
-      body: stns
+      body: applyFnToProps(stns, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string')
     }
   }
 

package/src/features/session_trace/aggregate/trace/storage.js

@@ -148,7 +148,7 @@ export class TraceStorage {
     }
   }
 
-  storeTiming (timingEntry) {
+  storeTiming (timingEntry, isAbsoluteTimestamp = false) {
     if (!timingEntry) return
 
     // loop iterates through prototype also (for FF)
@@ -164,6 +164,11 @@ export class TraceStorage {
       if (!(typeof val === 'number' && val >= 0)) continue
 
       val = Math.round(val)
+      if (this.parent.timeKeeper && this.parent.timeKeeper.ready && isAbsoluteTimestamp) {
+        val = this.parent.timeKeeper.convertAbsoluteTimestamp(
+          Math.floor(this.parent.timeKeeper.correctAbsoluteTimestamp(val))
+        )
+      }
       this.storeSTN(new TraceNode(key, val, val, 'document', 'timing'))
     }
   }

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

@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { handle } from '../../../common/event-emitter/handle'
-import { wrapHistory, wrapEvents } from '../../../common/wrap'
+import { wrapHistory } from '../../../common/wrap/wrap-history'
+import { wrapEvents } from '../../../common/wrap/wrap-events'
 import { InstrumentBase } from '../../utils/instrument-base'
 import * as CONSTANTS from '../constants'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
@@ -61,3 +62,5 @@ export class Instrument extends InstrumentBase {
     this.importAggregator({ resourceObserver: observer })
   }
 }
+
+export const SessionTrace = Instrument

package/src/features/soft_navigations/aggregate/ajax-node.js

@@ -18,7 +18,7 @@ export class AjaxNode extends BelNode {
     this.spanTimestamp = ajaxEvent.spanTimestamp
     this.gql = ajaxEvent.gql
 
-    this.start = ajaxEvent.startTime
+    this.start = ajaxEvent.startTime // 5000 --- 5500 --> 10500
     this.end = ajaxEvent.endTime
   }
 

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

@@ -1,4 +1,4 @@
-import { getConfigurationValue } from '../../../common/config/config'
+import { getConfigurationValue } from '../../../common/config/init'
 import { deregisterDrain } from '../../../common/drain/drain'
 import { handle } from '../../../common/event-emitter/handle'
 import { registerHandler } from '../../../common/event-emitter/register-handler'
@@ -8,6 +8,7 @@ import { timeToFirstByte } from '../../../common/vitals/time-to-first-byte'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { AggregateBase } from '../../utils/aggregate-base'
+import { EventBuffer } from '../../utils/event-buffer'
 import { API_TRIGGER_NAME, FEATURE_NAME, INTERACTION_STATUS } from '../constants'
 import { AjaxNode } from './ajax-node'
 import { InitialPageLoadInteraction } from './initial-page-load-interaction'
@@ -19,8 +20,7 @@ export class Aggregate extends AggregateBase {
     super(agentIdentifier, aggregator, FEATURE_NAME)
 
     const harvestTimeSeconds = getConfigurationValue(agentIdentifier, 'soft_navigations.harvestTimeSeconds') || 10
-    this.interactionsToHarvest = []
-    this.interactionsAwaitingRetry = []
+    this.interactionsToHarvest = new EventBuffer()
     this.domObserver = domObserver
 
     this.initialPageLoadInteraction = new InitialPageLoadInteraction(agentIdentifier)
@@ -28,7 +28,7 @@ export class Aggregate extends AggregateBase {
       const loadEventTime = attrs.navigationEntry.loadEventEnd
       this.initialPageLoadInteraction.forceSave = true
       this.initialPageLoadInteraction.done(loadEventTime)
-      this.interactionsToHarvest.push(this.initialPageLoadInteraction)
+      this.interactionsToHarvest.add(this.initialPageLoadInteraction)
       this.initialPageLoadInteraction = null
       // Report metric on the initial page load time
       handle(SUPPORTABILITY_METRIC_CHANNEL, ['SoftNav/Interaction/InitialPageLoad/Duration/Ms', Math.round(loadEventTime)], undefined, FEATURE_NAMES.metrics, this.ee)
@@ -69,28 +69,26 @@ export class Aggregate extends AggregateBase {
   }
 
   onHarvestStarted (options) {
-    if (this.interactionsToHarvest.length === 0 || this.blocked) return
+    if (!this.interactionsToHarvest.hasData || this.blocked) return
     // The payload depacker takes the first ixn of a payload (if there are multiple ixns) and positively offset the subsequent ixns timestamps by that amount.
     // In order to accurately portray the real start & end times of the 2nd & onward ixns, we hence need to negatively offset their start timestamps with that of the 1st ixn.
     let firstIxnStartTime = 0 // the very 1st ixn does not require any offsetting
     const serializedIxnList = []
-    for (const interaction of this.interactionsToHarvest) {
+    for (const interaction of this.interactionsToHarvest.buffer) {
       serializedIxnList.push(interaction.serialize(firstIxnStartTime))
       if (!firstIxnStartTime) firstIxnStartTime = Math.floor(interaction.start)
     }
     const payload = `bel.7;${serializedIxnList.join(';')}`
 
-    if (options.retry) this.interactionsAwaitingRetry = this.interactionsToHarvest
-    this.interactionsToHarvest = []
+    if (options.retry) this.interactionsToHarvest.hold()
+    else this.interactionsToHarvest.clear()
 
     return { body: { e: payload } }
   }
 
   onHarvestFinished (result) {
-    if (result.sent && result.retry && this.interactionsAwaitingRetry.length > 0) {
-      this.interactionsToHarvest = [...this.interactionsAwaitingRetry, ...this.interactionsToHarvest]
-    }
-    this.interactionsAwaitingRetry = []
+    if (result.sent && result.retry && this.interactionsToHarvest.held.hasData) this.interactionsToHarvest.unhold()
+    else this.interactionsToHarvest.held.clear()
   }
 
   startUIInteraction (eventName, startedAt, sourceElem) { // this is throttled by instrumentation so that it isn't excessively called
@@ -113,7 +111,7 @@ export class Aggregate extends AggregateBase {
   setClosureHandlers () {
     this.interactionInProgress.on('finished', () => {
       const ref = this.interactionInProgress
-      this.interactionsToHarvest.push(this.interactionInProgress)
+      this.interactionsToHarvest.add(this.interactionInProgress)
       this.interactionInProgress = null
       this.domObserver.disconnect() // can stop observing whenever our interaction logic completes a cycle
 
@@ -143,8 +141,8 @@ export class Aggregate extends AggregateBase {
     */
     if (this.interactionInProgress?.isActiveDuring(timestamp)) return this.interactionInProgress
     let saveIxn
-    for (let idx = this.interactionsToHarvest.length - 1; idx >= 0; idx--) { // reverse search for the latest completed interaction for efficiency
-      const finishedInteraction = this.interactionsToHarvest[idx]
+    for (let idx = this.interactionsToHarvest.buffer.length - 1; idx >= 0; idx--) { // reverse search for the latest completed interaction for efficiency
+      const finishedInteraction = this.interactionsToHarvest.buffer[idx]
       if (finishedInteraction.isActiveDuring(timestamp)) {
         if (finishedInteraction.trigger !== 'initialPageLoad') return finishedInteraction
         // It's possible that a complete interaction occurs before page is fully loaded, so we need to consider if a route-change ixn may have overlapped this iPL

package/src/features/soft_navigations/aggregate/initial-page-load-interaction.js

@@ -3,7 +3,7 @@ import { Interaction } from './interaction'
 import { numeric } from '../../../common/serialize/bel-serializer'
 import { firstPaint } from '../../../common/vitals/first-paint'
 import { firstContentfulPaint } from '../../../common/vitals/first-contentful-paint'
-import { getInfo } from '../../../common/config/config'
+import { getInfo } from '../../../common/config/info'
 
 export class InitialPageLoadInteraction extends Interaction {
   constructor (agentIdentifier) {

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

@@ -1,4 +1,4 @@
-import { getInfo } from '../../../common/config/config'
+import { getInfo } from '../../../common/config/info'
 import { globalScope, initialLocation } from '../../../common/constants/runtime'
 import { generateUuid } from '../../../common/ids/unique-id'
 import { addCustomAttributes, getAddStringContext, nullable, numeric } from '../../../common/serialize/bel-serializer'

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

@@ -1,14 +1,16 @@
-import { originals } from '../../../common/config/config'
+import { gosNREUMOriginals } from '../../../common/window/nreum'
 import { isBrowserScope } from '../../../common/constants/runtime'
 import { handle } from '../../../common/event-emitter/handle'
 import { windowAddEventListener } from '../../../common/event-listener/event-listener-opts'
 import { debounce } from '../../../common/util/invoke'
-import { wrapEvents, wrapHistory } from '../../../common/wrap'
+import { wrapEvents } from '../../../common/wrap/wrap-events'
+import { wrapHistory } from '../../../common/wrap/wrap-history'
 import { InstrumentBase } from '../../utils/instrument-base'
 import { FEATURE_NAME, INTERACTION_TRIGGERS } from '../constants'
 import { now } from '../../../common/timing/now'
 
-/** The minimal time after a UI event for which no further events will be processed - i.e. a throttling rate to reduce spam.
+/**
+ * The minimal time after a UI event for which no further events will be processed - i.e. a throttling rate to reduce spam.
  * This also give some time for the new interaction to complete without being discarded by a subsequent UI event and wrongly attributed.
  * This value is still subject to change and critique, as it is derived from beyond worst case time to next frame of a page.
  */
@@ -18,7 +20,7 @@ export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME
   constructor (agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, FEATURE_NAME, auto)
-    if (!isBrowserScope || !originals.MO) return // soft navigations is not supported outside web env or browsers without the mutation observer API
+    if (!isBrowserScope || !gosNREUMOriginals().o.MO) return // soft navigations is not supported outside web env or browsers without the mutation observer API
 
     const historyEE = wrapHistory(this.ee)
     const eventsEE = wrapEvents(this.ee)
@@ -34,7 +36,7 @@ export class Instrument extends InstrumentBase {
     windowAddEventListener('popstate', trackURLChangeEvent, true, this.removeOnAbort?.signal)
 
     let oncePerFrame = false // attempt to reduce dom noice since the observer runs very frequently with below options
-    const domObserver = new originals.MO((domChanges, observer) => {
+    const domObserver = new (gosNREUMOriginals().o).MO((domChanges, observer) => {
       if (oncePerFrame) return
       oncePerFrame = true
       requestAnimationFrame(() => { // waiting for next frame to time when any visuals are supposedly updated
@@ -65,3 +67,5 @@ export class Instrument extends InstrumentBase {
     }
   }
 }
+
+export const SoftNav = Instrument

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

@@ -6,11 +6,11 @@
 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'
-import { getConfigurationValue, getRuntime } from '../../../common/config/config'
+import { getConfigurationValue } from '../../../common/config/init'
+import { getRuntime } from '../../../common/config/runtime'
 import { eventListenerOpts } from '../../../common/event-listener/event-listener-opts'
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
 import { Serializer } from './serializer'
@@ -26,6 +26,7 @@ import { handle } from '../../../common/event-emitter/handle'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { deregisterDrain } from '../../../common/drain/drain'
 import { warn } from '../../../common/util/console'
+import { EventBuffer } from '../../utils/event-buffer'
 
 const {
   FEATURE_NAME, INTERACTION_EVENTS, MAX_TIMER_BUDGET, FN_START, FN_END, CB_START, INTERACTION_API, REMAINING,
@@ -51,8 +52,7 @@ export class Aggregate extends AggregateBase {
       childTime: 0,
       depth: 0,
       harvestTimeSeconds: getConfigurationValue(agentIdentifier, 'spa.harvestTimeSeconds') || 10,
-      interactionsToHarvest: [],
-      interactionsSent: [],
+      interactionsToHarvest: new EventBuffer(),
       // The below feature flag is used to disable the SPA ajax fix for specific customers, see https://new-relic.atlassian.net/browse/NR-172169
       disableSpaFix: (getConfigurationValue(agentIdentifier, 'feature_flags') || []).indexOf('disable-spa-fix') > -1
     }
@@ -668,7 +668,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)
@@ -676,26 +676,18 @@ export class Aggregate extends AggregateBase {
 
     const classThis = this
     function onHarvestStarted (options) {
-      if (state.interactionsToHarvest.length === 0 || classThis.blocked) return {}
-      var payload = serializer.serializeMultiple(state.interactionsToHarvest, 0, navTiming)
+      if (!state.interactionsToHarvest.hasData || classThis.blocked) return {}
+      var payload = serializer.serializeMultiple(state.interactionsToHarvest.buffer, 0, navTiming)
 
-      if (options.retry) {
-        state.interactionsToHarvest.forEach(function (interaction) {
-          state.interactionsSent.push(interaction)
-        })
-      }
-      state.interactionsToHarvest = []
+      if (options.retry) state.interactionsToHarvest.hold()
+      else state.interactionsToHarvest.clear()
 
       return { body: { e: payload } }
     }
 
     function onHarvestFinished (result) {
-      if (result.sent && result.retry && state.interactionsSent.length > 0) {
-        state.interactionsSent.forEach(function (interaction) {
-          state.interactionsToHarvest.unshift(interaction)
-        })
-        state.interactionsSent = []
-      }
+      if (result.sent && result.retry && state.interactionsToHarvest.held.hasData) state.interactionsToHarvest.unhold()
+      else state.interactionsToHarvest.held.clear()
     }
 
     baseEE.on('spa-jserror', function (type, name, params, metrics) {
@@ -748,7 +740,7 @@ export class Aggregate extends AggregateBase {
         interaction.root.attrs.firstContentfulPaint = firstContentfulPaint.current.value
       }
       baseEE.emit('interactionDone', [interaction, true])
-      state.interactionsToHarvest.push(interaction)
+      state.interactionsToHarvest.add(interaction)
 
       let smCategory
       if (interaction.root?.attrs?.trigger === 'initialPageLoad') smCategory = 'InitialPageLoad'

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

@@ -3,13 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getInfo, getRuntime, originals } from '../../../common/config/config'
-import { mapOwn } from '../../../common/util/map-own'
+import { getInfo } from '../../../common/config/info'
+import { getRuntime } from '../../../common/config/runtime'
+import { gosNREUMOriginals } from '../../../common/window/nreum'
 import { ee } from '../../../common/event-emitter/contextual-ee'
 import { InteractionNode } from './interaction-node'
 
-var originalSetTimeout = originals.ST
-var originalClearTimeout = originals.CT
+var originalSetTimeout = gosNREUMOriginals().o.ST
+var originalClearTimeout = gosNREUMOriginals().o.CT
 
 var lastId = {}
 
@@ -101,7 +102,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,10 +3,9 @@
  * 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'
+import { getInfo } from '../../../common/config/info'
 
 export class Serializer extends SharedContext {
   constructor (parent) {
@@ -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/spa/constants.js

@@ -1,4 +1,4 @@
-import { originals } from '../../common/config/config'
+import { gosNREUMOriginals } from '../../common/window/nreum'
 import { FEATURE_NAMES } from '../../loaders/features/features'
 
 export const FEATURE_NAME = FEATURE_NAMES.spa
@@ -25,7 +25,7 @@ export const FETCH_DONE = 'fetch-done'
 export const FETCH_BODY = 'fetch-body-'
 export const JSONP_END = 'jsonp-end'
 
-export const originalSetTimeout = originals.ST
+export const originalSetTimeout = gosNREUMOriginals().o.ST
 
 export const START = '-start'
 export const END = '-end'

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

@@ -2,15 +2,19 @@
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
 */
-import {
-  wrapMutation, wrapPromise, wrapHistory, wrapTimer, wrapFetch, wrapXhr, wrapJsonP
-} from '../../../common/wrap'
 import { eventListenerOpts } from '../../../common/event-listener/event-listener-opts'
 import { InstrumentBase } from '../../utils/instrument-base'
 import * as CONSTANTS from '../constants'
 import { isBrowserScope } from '../../../common/constants/runtime'
 import { now } from '../../../common/timing/now'
 import { handle } from '../../../common/event-emitter/handle'
+import { wrapJsonP } from '../../../common/wrap/wrap-jsonp'
+import { wrapPromise } from '../../../common/wrap/wrap-promise'
+import { wrapTimer } from '../../../common/wrap/wrap-timer'
+import { wrapXhr } from '../../../common/wrap/wrap-xhr'
+import { wrapFetch } from '../../../common/wrap/wrap-fetch'
+import { wrapHistory } from '../../../common/wrap/wrap-history'
+import { wrapMutation } from '../../../common/wrap/wrap-mutation'
 
 const {
   FEATURE_NAME, START, END, BODY, CB_END, JS_TIME, FETCH, FN_START, CB_START, FN_END
@@ -112,3 +116,5 @@ export class Instrument extends InstrumentBase {
     this.abortHandler = undefined // weakly allow this abort op to run only once
   }
 }
+
+export const Spa = Instrument

package/src/features/utils/agent-session.js

@@ -1,4 +1,6 @@
-import { getConfiguration, getInfo, getRuntime } from '../../common/config/config'
+import { getInfo } from '../../common/config/info'
+import { getConfiguration } from '../../common/config/init'
+import { getRuntime } from '../../common/config/runtime'
 import { drain } from '../../common/drain/drain'
 import { ee } from '../../common/event-emitter/contextual-ee'
 import { registerHandler } from '../../common/event-emitter/register-handler'