@newrelic/browser-agent 1.237.1 → 1.239.0

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

@@ -1,7 +1,5 @@
 import { InstrumentBase } from '../../utils/instrument-base'
-import { FEATURE_NAME, SUPPORTABILITY_METRIC_CHANNEL } from '../constants'
-import { handle } from '../../../common/event-emitter/handle'
-import { FEATURE_NAMES } from '../../../loaders/features/features'
+import { FEATURE_NAME } from '../constants'
 
 export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME

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

@@ -10,7 +10,6 @@ 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 { drain } from '../../../common/drain/drain'
 import { isBrowserScope } from '../../../common/constants/runtime'
 import { AggregateBase } from '../../utils/aggregate-base'
 
@@ -21,8 +20,8 @@ export class Aggregate extends AggregateBase {
     this.eventsPerMinute = 240
     this.harvestTimeSeconds = getConfigurationValue(this.agentIdentifier, 'page_action.harvestTimeSeconds') || getConfigurationValue(this.agentIdentifier, 'ins.harvestTimeSeconds') || 30
     this.eventsPerHarvest = this.eventsPerMinute * this.harvestTimeSeconds / 60
-    this.referrerUrl
-    this.currentEvents
+    this.referrerUrl = undefined
+    this.currentEvents = undefined
 
     this.events = []
 
@@ -32,17 +31,17 @@ export class Aggregate extends AggregateBase {
 
     register('api-addPageAction', (...args) => this.addPageAction(...args), this.featureName, this.ee)
 
-    var scheduler = new HarvestScheduler('ins', { onFinished: (...args) => this.onHarvestFinished(...args) }, this)
-    scheduler.harvest.on('ins', (...args) => this.onHarvestStarted(...args))
-    this.ee.on(`drain-${this.featureName}`, () => { if (!this.blocked) scheduler.startTimer(this.harvestTimeSeconds, 0) })
-
-    // if rum response determines that customer lacks entitlements for ins endpoint, block it
-    register('block-ins', () => {
-      this.blocked = true
-      scheduler.stopTimer(true)
-    }, this.featureName, this.ee)
+    this.waitForFlags(['ins']).then(([enabled]) => {
+      if (enabled) {
+        const scheduler = new HarvestScheduler('ins', { onFinished: (...args) => this.onHarvestFinished(...args) }, this)
+        scheduler.harvest.on('ins', (...args) => this.onHarvestStarted(...args))
+        scheduler.startTimer(this.harvestTimeSeconds, 0)
+      } else {
+        this.blocked = true
+      }
+    })
 
-    drain(this.agentIdentifier, this.featureName)
+    this.drain()
   }
 
   onHarvestStarted (options) {

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

@@ -9,7 +9,6 @@ import { getConfigurationValue, getInfo, getRuntime } from '../../../common/conf
 import { Harvest } from '../../../common/harvest/harvest'
 import * as CONSTANTS from '../constants'
 import { getActivatedFeaturesFlags } from './initialized-features'
-import { drain } from '../../../common/drain/drain'
 import { activateFeatures } from '../../../common/util/feature-flags'
 import { warn } from '../../../common/util/console'
 import { AggregateBase } from '../../utils/aggregate-base'
@@ -131,7 +130,7 @@ export class Aggregate extends AggregateBase {
 
         try {
           activateFeatures(JSON.parse(responseText), this.agentIdentifier)
-          drain(this.agentIdentifier, this.featureName)
+          this.drain()
         } catch (err) {
           this.ee.abort()
           warn('RUM call failed. Agent shutting down.')

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

@@ -14,11 +14,11 @@ export class Instrument extends InstrumentBase {
 
     if ((typeof PerformanceNavigationTiming === 'undefined' || isiOS) && typeof PerformanceTiming !== 'undefined') {
       // For majority browser versions in which PNT exists, we can get load timings later from the nav entry (in the aggregate portion). At minimum, PT should exist for main window.
-      // *cli Mar'23 - iOS 15.2 & 15.4 testing in Sauce still fails with onTTFB. Hence, all iOS will fallback to this for now. Unknown if this is similar in nature to iOS_below16 bug.
+      // *cli Mar'23 - iOS 15.2 & 15.4 testing in Sauce still fails with onTTFB. Hence, all iOS will fallback to this for now. Unknown if this is similar in nature to iOSBelow16 bug.
       const agentRuntime = getRuntime(agentIdentifier)
 
       agentRuntime[CONSTANTS.TTFB] = Math.max(Date.now() - agentRuntime.offset, 0)
-      onDOMContentLoaded(() => agentRuntime[CONSTANTS.FBTDC] = Math.max(now() - agentRuntime[CONSTANTS.TTFB], 0))
+      onDOMContentLoaded(() => { agentRuntime[CONSTANTS.FBTDC] = Math.max(now() - agentRuntime[CONSTANTS.TTFB], 0) })
       onWindowLoad(() => {
         const timeNow = now()
         agentRuntime[CONSTANTS.FBTWL] = Math.max(timeNow - agentRuntime[CONSTANTS.TTFB], 0)

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

@@ -6,7 +6,7 @@
 import { onFCP, onFID, onLCP, onCLS, onINP } from 'web-vitals'
 import { onFirstPaint } from '../first-paint'
 import { onLongTask } from '../long-tasks'
-import { iOS_below16 } from '../../../common/constants/runtime'
+import { iOSBelow16 } from '../../../common/constants/runtime'
 import { nullable, numeric, getAddStringContext, addCustomAttributes } from '../../../common/serialize/bel-serializer'
 import { mapOwn } from '../../../common/util/map-own'
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
@@ -15,7 +15,6 @@ import { cleanURL } from '../../../common/url/clean-url'
 import { handle } from '../../../common/event-emitter/handle'
 import { getInfo, getConfigurationValue, getRuntime } from '../../../common/config/config'
 import { FEATURE_NAME } from '../constants'
-import { drain } from '../../../common/drain/drain'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { AggregateBase } from '../../utils/aggregate-base'
 
@@ -41,7 +40,7 @@ export class Aggregate extends AggregateBase {
     })
 
     /* First Contentful Paint - As of WV v3, it still imperfectly tries to detect document vis state asap and isn't supposed to report if page starts hidden. */
-    if (iOS_below16) {
+    if (iOSBelow16) {
       try {
         if (!pageStartedHidden) { // see ios-version.js for detail on this following bug case; tldr: buffered flag doesn't work but getEntriesByType does
           const paintEntries = performance.getEntriesByType('paint')
@@ -101,7 +100,7 @@ export class Aggregate extends AggregateBase {
 
     /* Cumulative Layout Shift - We don't have to limit this callback since cls is stored as a state and only sent as attribute on other timings.
       reportAllChanges ensures our tracked cls has the most recent rolling value to attach to 'unload' and 'pagehide'. */
-    onCLS(({ value }) => this.cls = value, { reportAllChanges: true })
+    onCLS(({ value }) => { this.cls = value }, { reportAllChanges: true })
 
     /* Interaction-to-Next-Paint */
     onINP(({ name, value, id }) => this.addTiming(name.toLowerCase(), value, { metricId: id }))
@@ -128,7 +127,7 @@ export class Aggregate extends AggregateBase {
     // send initial data sooner, then start regular
     this.ee.on(`drain-${this.featureName}`, () => { this.scheduler.startTimer(harvestTimeSeconds, initialHarvestSeconds) })
 
-    drain(this.agentIdentifier, this.featureName)
+    this.drain()
   }
 
   // takes an attributes object and appends connection attributes if available
@@ -185,9 +184,9 @@ export class Aggregate extends AggregateBase {
     }
 
     this.timings.push({
-      name: name,
-      value: value,
-      attrs: attrs
+      name,
+      value,
+      attrs
     })
 
     handle('pvtAdded', [name, value, attrs], undefined, FEATURE_NAMES.sessionTrace, this.ee)

package/src/features/session_replay/aggregate/index.component-test.js

@@ -13,6 +13,7 @@ class LocalMemory {
     try {
       return this.state[key]
     } catch (err) {
+      // Error is ignored
       return ''
     }
   }
@@ -22,7 +23,7 @@ class LocalMemory {
       if (value === undefined || value === null) return this.remove(key)
       this.state[key] = value
     } catch (err) {
-      return
+      // Error is ignored
     }
   }
 
@@ -30,7 +31,7 @@ class LocalMemory {
     try {
       delete this.state[key]
     } catch (err) {
-      return
+      // Error is ignored
     }
   }
 }
@@ -102,7 +103,6 @@ describe('Session Replay', () => {
       sr.ee.emit('rumresp-sr', [true])
       await wait(1)
       expect(session.state.sessionReplay).toEqual(sr.mode)
-      return
     })
 
     test('Session SR mode matches SR mode -- OFF', async () => {
@@ -110,7 +110,6 @@ describe('Session Replay', () => {
       sr.ee.emit('rumresp-sr', [true])
       await wait(1)
       expect(session.state.sessionReplay).toEqual(sr.mode)
-      return
     })
   })
 
@@ -127,7 +126,6 @@ describe('Session Replay', () => {
       await wait(1)
       expect(sr.initialized).toEqual(true)
       expect(sr.recording).toEqual(false)
-      return
     })
 
     test('Does not run if cookies_enabled is false', async () => {
@@ -137,7 +135,6 @@ describe('Session Replay', () => {
       await wait(1)
       expect(sr.initialized).toEqual(false)
       expect(sr.recording).toEqual(false)
-      return
     })
 
     test('Does not run if session_trace is disabled', async () => {
@@ -147,7 +144,6 @@ describe('Session Replay', () => {
       await wait(1)
       expect(sr.initialized).toEqual(false)
       expect(sr.recording).toEqual(false)
-      return
     })
   })
 
@@ -157,7 +153,6 @@ describe('Session Replay', () => {
       sr.ee.emit('rumresp-sr', [true])
       await wait(1)
       expect(sr.mode).toEqual(MODE.FULL)
-      return
     })
 
     test('New Session -- Full 1 Error 0 === FULL', async () => {
@@ -165,7 +160,6 @@ describe('Session Replay', () => {
       sr.ee.emit('rumresp-sr', [true])
       await wait(1)
       expect(sr.mode).toEqual(MODE.FULL)
-      return
     })
 
     test('New Session -- Full 0 Error 1 === ERROR', async () => {
@@ -173,7 +167,6 @@ describe('Session Replay', () => {
       sr.ee.emit('rumresp-sr', [true])
       await wait(1)
       expect(sr.mode).toEqual(MODE.ERROR)
-      return
     })
 
     test('New Session -- Full 0 Error 0 === OFF', async () => {
@@ -181,7 +174,6 @@ describe('Session Replay', () => {
       sr.ee.emit('rumresp-sr', [true])
       await wait(1)
       expect(sr.mode).toEqual(MODE.OFF)
-      return
     })
 
     test('Existing Session -- Should inherit mode from session entity and ignore samples', async () => {
@@ -194,7 +186,6 @@ describe('Session Replay', () => {
       sr.ee.emit('rumresp-sr', [true])
       await wait(1)
       expect(sr.mode).toEqual(MODE.FULL)
-      return
     })
   })
 
@@ -206,7 +197,6 @@ describe('Session Replay', () => {
       await wait(1)
       expect(sr.mode).toEqual(MODE.FULL)
       expect(sr.scheduler.started).toEqual(true)
-      return
     })
 
     test('An error AFTER rrweb import changes mode and starts harvester', async () => {
@@ -218,7 +208,6 @@ describe('Session Replay', () => {
       sr.ee.emit('errorAgg')
       expect(sr.mode).toEqual(MODE.FULL)
       expect(sr.scheduler.started).toEqual(true)
-      return
     })
   })
 
@@ -296,7 +285,6 @@ describe('Session Replay', () => {
       const spy = jest.spyOn(sr.scheduler, 'runHarvest')
       setConfiguration(agentIdentifier, { ...init })
       sr.payloadBytesEstimation = (MAX_PAYLOAD_SIZE + 1) / AVG_COMPRESSION
-      const before = Date.now()
       sr.ee.emit('rumresp-sr', [true])
       await wait(1)
       expect(spy).not.toHaveBeenCalled()

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

@@ -10,7 +10,6 @@
  * functionality is validated and a full user experience is curated.
  */
 
-import { drain } from '../../../common/drain/drain'
 import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
 import { FEATURE_NAME } from '../constants'
@@ -20,6 +19,7 @@ import { SESSION_EVENTS, MODE } from '../../../common/session/session-entity'
 import { AggregateBase } from '../../utils/aggregate-base'
 import { sharedChannel } from '../../../common/constants/shared-channel'
 import { obj as encodeObj } from '../../../common/url/encode'
+import { warn } from '../../../common/util/console'
 
 // would be better to get this dynamically in some way
 export const RRWEB_VERSION = '2.0.0-alpha.8'
@@ -127,7 +127,7 @@ export class Aggregate extends AggregateBase {
         Math.random() < getConfigurationValue(this.agentIdentifier, 'session_replay.sampleRate')
       )).then(() => sharedChannel.onReplayReady(this.mode)) // notify watchers that replay started with the mode
 
-      drain(this.agentIdentifier, this.featureName)
+      this.drain()
     }
   }
 
@@ -173,12 +173,14 @@ export class Aggregate extends AggregateBase {
     }
 
     try {
+      // Do not change the webpackChunkName or it will break the webpack nrba-chunking plugin
       recorder = (await import(/* webpackChunkName: "recorder" */'rrweb')).record
     } catch (err) {
       return this.abort()
     }
 
     try {
+      // Do not change the webpackChunkName or it will break the webpack nrba-chunking plugin
       const { gzipSync, strToU8 } = await import(/* webpackChunkName: "compressor" */'fflate')
       gzipper = gzipSync
       u8 = strToU8

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

@@ -8,7 +8,6 @@ import { parseUrl } from '../../../common/url/parse-url'
 import { getConfigurationValue, getRuntime } from '../../../common/config/config'
 import { now } from '../../../common/timing/now'
 import { FEATURE_NAME } from '../constants'
-import { drain } from '../../../common/drain/drain'
 import { HandlerCache } from '../../utils/handler-cache'
 import { MODE, SESSION_EVENTS } from '../../../common/session/session-entity'
 import { getSessionReplayMode } from '../../session_replay/replay-mode'
@@ -50,9 +49,13 @@ export class Aggregate extends AggregateBase {
     this.sentTrace = null
     this.harvestTimeSeconds = getConfigurationValue(agentIdentifier, 'session_trace.harvestTimeSeconds') || 10
     this.maxNodesPerHarvest = getConfigurationValue(agentIdentifier, 'session_trace.maxNodesPerHarvest') || 1000
+    /**
+     * Standalone (mode) refers to the legacy version of ST before the idea of 'session' or the Replay feature existed.
+     * It has some different behavior vs when used in tandem with replay. */
     this.isStandalone = false
     const operationalGate = new HandlerCache() // acts as a controller-intermediary that can enable or disable this feature's collection dynamically
     const sessionEntity = this.agentRuntime.session
+    this.operationalGate = operationalGate
 
     /* --- The following section deals with user sessions concept & contains non-trivial control flow. --- */
     const controlTraceOp = (traceMode) => {
@@ -119,7 +122,7 @@ export class Aggregate extends AggregateBase {
             else if (updatedTraceMode === MODE.FULL && this.#scheduler && !this.#scheduler.started) this.#scheduler.runHarvest({ needResponse: true })
             mostRecentModeKnown = updatedTraceMode
           })
-          this.ee.on(SESSION_EVENTS.PAUSE, () => mostRecentModeKnown = sessionEntity.state.sessionTraceMode)
+          this.ee.on(SESSION_EVENTS.PAUSE, () => { mostRecentModeKnown = sessionEntity.state.sessionTraceMode })
 
           if (!sessionEntity.isNew) { // inherit the same mode as existing session's Trace
             if (sessionEntity.state.sessionReplay === MODE.OFF) this.isStandalone = true
@@ -152,7 +155,7 @@ export class Aggregate extends AggregateBase {
     registerHandler('bstApi', (...args) => operationalGate.settle(() => this.storeSTN(...args)), this.featureName, this.ee)
     registerHandler('errorAgg', (...args) => operationalGate.settle(() => this.storeErrorAgg(...args)), this.featureName, this.ee)
     registerHandler('pvtAdded', (...args) => operationalGate.settle(() => this.processPVT(...args)), this.featureName, this.ee)
-    drain(this.agentIdentifier, this.featureName)
+    this.drain()
   }
 
   startTracing (startupBuffer, dontStartHarvestYet = false) {
@@ -189,16 +192,16 @@ export class Aggregate extends AggregateBase {
   }
 
   #prepareHarvest (options) {
-    /* Standalone refers to the legacy version of ST before the idea of 'session' or the Replay feature existed.
-      It has a different behavior on returning a payload for harvest than when used in tandem with either of those concepts. */
     if (this.isStandalone) {
-      if (now() > MAX_TRACE_DURATION) { // been collecting for over the longest duration we should run for, empty trace object so ST has nothing to send
-        this.#scheduler.stopTimer()
-        this.trace = {}
+      if (this.ptid && now() >= MAX_TRACE_DURATION) {
+        // Perform a final harvest once we hit or exceed the max session trace time
+        options.isFinalHarvest = true
+        this.operationalGate.permanentlyDecide(false)
+        this.#scheduler.stopTimer(true)
+      } else if (this.ptid && this.nodeCount <= REQ_THRESHOLD_TO_SEND && !options.isFinalHarvest) {
+        // Only harvest when more than some threshold of nodes are pending, after the very first harvest, with the exception of the last outgoing harvest.
         return
       }
-      // Only harvest when more than some threshold of nodes are pending, after the very first harvest.
-      if (this.ptid && this.nodeCount <= REQ_THRESHOLD_TO_SEND) return
     } else {
     //   -- *cli May '26 - Update: Not rate limiting backgrounded pages either for now.
     //   if (this.ptid && document.visibilityState === 'hidden' && this.nodeCount <= REQ_THRESHOLD_TO_SEND) return
@@ -209,6 +212,7 @@ export class Aggregate extends AggregateBase {
       if (currentMode === MODE.OFF && Object.keys(this.trace).length === 0) return
       if (currentMode === MODE.ERROR) return // Trace in this mode should never be harvesting, even on unload
     }
+
     return this.takeSTNs(options.retry)
   }
 
@@ -274,8 +278,7 @@ export class Aggregate extends AggregateBase {
     const origin = this.evtOrigin(event.target, target)
     if (event.type in ignoredEvents.global) return true
     if (!!ignoredEvents[origin] && ignoredEvents[origin].ignoreAll) return true
-    if (!!ignoredEvents[origin] && event.type in ignoredEvents[origin]) return true
-    return false
+    return !!(!!ignoredEvents[origin] && event.type in ignoredEvents[origin])
   }
 
   evtName (type) {
@@ -394,7 +397,11 @@ export class Aggregate extends AggregateBase {
     if (this.nodeCount >= this.maxNodesPerHarvest) { // limit the amount of pending data awaiting next harvest
       if (this.isStandalone || this.agentRuntime.session.state.sessionTraceMode !== MODE.ERROR) return
       const openedSpace = this.trimSTNs(ERROR_MODE_SECONDS_WINDOW) // but maybe we could make some space by discarding irrelevant nodes if we're in sessioned Error mode
-      if (openedSpace == 0) return
+      if (openedSpace === 0) return
+    }
+
+    if (this.isStandalone && now() >= MAX_TRACE_DURATION) {
+      return
     }
 
     if (this.trace[stn.n]) this.trace[stn.n].push(stn)
@@ -418,7 +425,7 @@ export class Aggregate extends AggregateBase {
        * ASSUMPTION: all 'end' timings stored are relative to timeOrigin (DOMHighResTimeStamp) and not Unix epoch based. */
       let cutoffIdx = nodeList.findIndex(node => cutoffHighResTime <= node.e)
 
-      if (cutoffIdx == 0) return
+      if (cutoffIdx === 0) return
       else if (cutoffIdx < 0) { // whole list falls outside lookback window and is irrelevant
         cutoffIdx = nodeList.length
         delete this.trace[nameCategory]
@@ -484,8 +491,7 @@ export class Aggregate extends AggregateBase {
 
     function trivial (node) {
       const limit = 4
-      if (node && typeof node.e === 'number' && typeof node.s === 'number' && (node.e - node.s) < limit) return true
-      else return false
+      return !!(node && typeof node.e === 'number' && typeof node.s === 'number' && (node.e - node.s) < limit)
     }
   }
 }

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

@@ -17,7 +17,6 @@ import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
 import { Serializer } from './serializer'
 import { ee } from '../../../common/event-emitter/contextual-ee'
 import * as CONSTANTS from '../constants'
-import { drain } from '../../../common/drain/drain'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { AggregateBase } from '../../utils/aggregate-base'
 
@@ -122,8 +121,8 @@ export class Aggregate extends AggregateBase {
 
     // register plugins
     var pluginApi = {
-      getCurrentNode: getCurrentNode,
-      setCurrentNode: setCurrentNode
+      getCurrentNode,
+      setCurrentNode
     }
 
     register('spa-register', function (init) {
@@ -197,23 +196,21 @@ export class Aggregate extends AggregateBase {
         // If this event was emitted by an XHR, restore the node ID associated with
         // that XHR.
         setCurrentNode(baseEE.context(eventSource).spaNode)
-      } else if (!state.currentNode) {
+      } else if (!state.currentNode && INTERACTION_EVENTS.indexOf(evName) !== -1) {
         // Otherwise, if no interaction is currently active, create a new node ID,
         // and let the aggregator know that we entered a new event handler callback
         // so that it has a chance to possibly start an interaction.
-        if (INTERACTION_EVENTS.indexOf(evName) !== -1) {
-          var ixn = new Interaction(evName, this[FN_START], state.lastSeenUrl, state.lastSeenRouteName, onInteractionFinished, agentIdentifier)
+        var ixn = new Interaction(evName, this[FN_START], state.lastSeenUrl, state.lastSeenRouteName, onInteractionFinished, agentIdentifier)
 
-          // Store the interaction as prevInteraction in case it is prematurely discarded
-          state.prevInteraction = ixn
+        // Store the interaction as prevInteraction in case it is prematurely discarded
+        state.prevInteraction = ixn
 
-          setCurrentNode(ixn.root)
+        setCurrentNode(ixn.root)
 
-          if (evName === 'click') {
-            var value = getActionText(ev.target)
-            if (value) {
-              state.currentNode.attrs.custom.actionText = value
-            }
+        if (evName === 'click') {
+          var value = getActionText(ev.target)
+          if (value) {
+            state.currentNode.attrs.custom.actionText = value
           }
         }
       }
@@ -530,7 +527,7 @@ export class Aggregate extends AggregateBase {
     register(INTERACTION_API + 'get', function (t) {
       var interaction
       if (state?.currentNode?.[INTERACTION]) interaction = this.ixn = state.currentNode[INTERACTION]
-      else if (state?.prevNode?.end === null && state?.prevNode?.[INTERACTION]?.root?.[INTERACTION]?.eventName != 'initialPageLoad') interaction = this.ixn = state.prevNode[INTERACTION]
+      else if (state?.prevNode?.end === null && state?.prevNode?.[INTERACTION]?.root?.[INTERACTION]?.eventName !== 'initialPageLoad') interaction = this.ixn = state.prevNode[INTERACTION]
       else interaction = this.ixn = new Interaction('api', t, state.lastSeenUrl, state.lastSeenRouteName, onInteractionFinished, agentIdentifier)
       if (!state.currentNode) {
         interaction.checkFinish()
@@ -727,12 +724,9 @@ export class Aggregate extends AggregateBase {
 
     function isEnabled () {
       var enabled = getConfigurationValue(agentIdentifier, 'spa.enabled')
-      if (enabled === false) {
-        return false
-      }
-      return true
+      return enabled !== false
     }
 
-    drain(this.agentIdentifier, this.featureName)
+    this.drain()
   }
 }

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

@@ -7,7 +7,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'
-import { now } from '../../../common/timing/now'
 
 var originalSetTimeout = originals.ST
 var originalClearTimeout = originals.CT
@@ -95,7 +94,6 @@ InteractionPrototype.finish = function finishInteraction () {
   var root = interaction.root
   if (root.end !== null) return
   var endTimestamp = Math.max(interaction.lastCb, interaction.lastFinish)
-  var delta = now() - endTimestamp
   var attrs = root.attrs
   var customAttrs = attrs.custom
 

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

@@ -176,7 +176,7 @@ export class Serializer extends SharedContext {
         // (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) {
-          if (v !== void 0) {
+          if (v !== undefined) {
             navTimingNode += seperator + numeric(v - prev)
             seperator = ','
             prev = v

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

@@ -3,6 +3,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'
 
 export class AggregateBase extends FeatureBase {
   constructor (...args) {
@@ -25,6 +26,10 @@ export class AggregateBase extends FeatureBase {
     )
   }
 
+  drain () {
+    drain(this.agentIdentifier, this.featureName)
+  }
+
   /**
    * Checks for additional `jsAttributes` items to support backward compatibility with implementations of the agent where
    * loader configurations may appear after the loader code is executed.

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

@@ -31,7 +31,8 @@ jest.mock('../../loaders/configure/configure', () => ({
 }))
 jest.mock('../../common/window/nreum', () => ({
   __esModule: true,
-  gosCDN: jest.fn().mockReturnValue({})
+  gosCDN: jest.fn().mockReturnValue({}),
+  gosNREUM: jest.fn().mockReturnValue({})
 }))
 
 let agentIdentifier

package/src/features/utils/handler-cache.js

@@ -36,8 +36,9 @@ export class HandlerCache {
    * @returns {void}
    */
   settle (handler) {
-    if (this.#decision === false) return
-    else if (this.#decision === undefined) this.#cache.push(handler)
+    if (this.#decision === false) {
+      // Do nothing
+    } else if (this.#decision === undefined) this.#cache.push(handler)
     else handler()
   }
 

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

@@ -31,19 +31,24 @@ export class InstrumentBase extends FeatureBase {
     this.auto = auto
 
     /** @type {Function | undefined} This should be set by any derived Instrument class if it has things to do when feature fails or is killed. */
-    this.abortHandler
+    this.abortHandler = undefined
+
     /**
      * @type {Class} Holds the reference to the feature's aggregate module counterpart, if and after it has been initialized. This may not be assigned until after page loads!
      * The only purpose of this for now is to expose it to the NREUM interface, as the feature's instrument instance is already exposed.
     */
-    this.featAggregate
+    this.featAggregate = undefined
+
     /**
      * @type {Promise} Assigned immediately after @see importAggregator runs. Serves as a signal for when the inner async fn finishes execution. Useful for features to await
      * one another if there are inter-features dependencies.
     */
-    this.onAggregateImported
+    this.onAggregateImported = undefined
 
-    if (auto) registerDrain(agentIdentifier, featureName)
+    /** used in conjunction with newrelic.start() to defer harvesting in features */
+    if (getConfigurationValue(this.agentIdentifier, `${this.featureName}.autoStart`) === false) this.auto = false
+    /** if the feature requires opt-in (!auto-start), it will get registered once the api has been called */
+    if (this.auto) registerDrain(agentIdentifier, featureName)
   }
 
   /**
@@ -53,7 +58,21 @@ export class InstrumentBase extends FeatureBase {
    * @returns void
    */
   importAggregator (argsObjFromInstrument = {}) {
-    if (this.featAggregate || !this.auto) return
+    if (this.featAggregate) return
+
+    if (!this.auto) {
+      // this feature requires an opt in...
+      // wait for API to be called
+      this.ee.on(`${this.featureName}-opt-in`, () => {
+        // register the feature to drain only once the API has been called, it will drain when importAggregator finishes for all the features
+        // called by the api in that cycle
+        registerDrain(this.agentIdentifier, this.featureName)
+        this.auto = true
+        this.importAggregator()
+      })
+      return
+    }
+
     const enableSessionTracking = isBrowserScope && getConfigurationValue(this.agentIdentifier, 'privacy.cookies_enabled') === true
     let loadedSuccessfully
     this.onAggregateImported = new Promise(resolve => {
@@ -72,7 +91,7 @@ export class InstrumentBase extends FeatureBase {
       }
 
       /**
-       * Note this try-catch differs from the one in Agent.start() in that it's placed later in a page's lifecycle and
+       * Note this try-catch differs from the one in Agent.run() in that it's placed later in a page's lifecycle and
        * it's only responsible for aborting its one specific feature, rather than all.
        */
       try {

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

@@ -33,7 +33,7 @@ jest.mock('../../common/config/config', () => ({
 }))
 jest.mock('../../common/config/config', () => ({
   __esModule: true,
-  getConfigurationValue: jest.fn(),
+  getConfigurationValue: jest.fn().mockReturnValue({}),
   originals: {
     MO: jest.fn()
   }
@@ -79,7 +79,7 @@ test('should construct a new instrument', () => {
 })
 
 test('should not immediately drain', () => {
-  const instrument = new InstrumentBase(agentIdentifier, aggregator, featureName, false)
+  new InstrumentBase(agentIdentifier, aggregator, featureName, false)
 
   expect(registerDrain).not.toHaveBeenCalled()
 })