@newrelic/browser-agent 1.253.0 → 1.254.0

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

@@ -20,6 +20,7 @@ var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _nreum = require("../../../common/window/nreum");
+var _drain = require("../../../common/drain/drain");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -53,26 +54,26 @@ class Aggregate extends _aggregateBase.AggregateBase {
     (0, _registerHandler.registerHandler)('softNavFlush', (interactionId, wasFinished, softNavAttrs) => this.onSoftNavNotification(interactionId, wasFinished, softNavAttrs), this.featureName, this.ee); // when an ixn is done or cancelled
 
     const harvestTimeSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'jserrors.harvestTimeSeconds') || 10;
-    const scheduler = new _harvestScheduler.HarvestScheduler('jserrors', {
-      onFinished: function () {
-        return _this.onHarvestFinished(...arguments);
-      }
-    }, this);
-    scheduler.harvest.on('jserrors', function () {
-      return _this.onHarvestStarted(...arguments);
-    });
 
-    // Don't start harvesting until "drain" for this feat has been called (which currently requires RUM response).
-    this.ee.on("drain-".concat(this.featureName), () => {
-      if (!this.blocked) scheduler.startTimer(harvestTimeSeconds); // and only if ingest will accept jserror payloads
+    // 0 == off, 1 == on
+    this.waitForFlags(['err']).then(_ref => {
+      let [errFlag] = _ref;
+      if (errFlag) {
+        const scheduler = new _harvestScheduler.HarvestScheduler('jserrors', {
+          onFinished: function () {
+            return _this.onHarvestFinished(...arguments);
+          }
+        }, this);
+        scheduler.harvest.on('jserrors', function () {
+          return _this.onHarvestStarted(...arguments);
+        });
+        scheduler.startTimer(harvestTimeSeconds);
+        this.drain();
+      } else {
+        this.blocked = true; // if rum response determines that customer lacks entitlements for spa endpoint, this feature shouldn't harvest
+        (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
+      }
     });
-
-    // If RUM-call's response determines that customer lacks entitlements for the /jserror ingest endpoint, don't harvest at all.
-    (0, _registerHandler.registerHandler)('block-err', () => {
-      this.blocked = true;
-      scheduler.stopTimer(true);
-    }, this.featureName, this.ee);
-    this.drain();
   }
   onHarvestStarted(options) {
     // this gets rid of dependency in AJAX module
@@ -222,8 +223,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     let [type, bucketHash, params, newMetrics, localAttrs] = errorInfoArr;
     const allCustomAttrs = {};
     if (softNavOccurredFinished) {
-      Object.entries(softNavCustomAttrs).forEach(_ref => {
-        let [k, v] = _ref;
+      Object.entries(softNavCustomAttrs).forEach(_ref2 => {
+        let [k, v] = _ref2;
         return setCustom(k, v);
       }); // when an ixn finishes, it'll include stuff in jsAttributes + attrs specific to the ixn
       bucketHash += params.browserInteractionId;
@@ -231,14 +232,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
       delete params._softNavFinished;
     } else {
       // interaction was cancelled -> error should not be associated OR there was no interaction
-      Object.entries((0, _config.getInfo)(this.agentIdentifier).jsAttributes).forEach(_ref2 => {
-        let [k, v] = _ref2;
+      Object.entries((0, _config.getInfo)(this.agentIdentifier).jsAttributes).forEach(_ref3 => {
+        let [k, v] = _ref3;
         return setCustom(k, v);
       });
       delete params.browserInteractionId;
     }
-    if (localAttrs) Object.entries(localAttrs).forEach(_ref3 => {
-      let [k, v] = _ref3;
+    if (localAttrs) Object.entries(localAttrs).forEach(_ref4 => {
+      let [k, v] = _ref4;
       return setCustom(k, v);
     }); // local custom attrs are applied in either case with the highest precedence
 

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

@@ -15,35 +15,34 @@ var _load = require("../../../common/window/load");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
 var _runtime = require("../../../common/constants/runtime");
 var _aggregateBase = require("../../utils/aggregate-base");
+var _drain = require("../../../common/drain/drain");
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
-    let scheduler;
-
-    // If RUM-call's response determines that customer lacks entitlements for the /jserror ingest endpoint, don't harvest at all.
-    (0, _registerHandler.registerHandler)('block-err', () => {
-      this.blocked = true;
-      if (scheduler) scheduler.aborted = true; // RUM response may or may not have happened already before scheduler initialization below
-    }, this.featureName, this.ee);
+    this.waitForFlags(['err']).then(_ref => {
+      let [errFlag] = _ref;
+      if (errFlag) {
+        // *cli, Mar 23 - Per NR-94597, this feature should only harvest ONCE at the (potential) EoL time of the page.
+        const scheduler = new _harvestScheduler.HarvestScheduler('jserrors', {
+          onUnload: () => this.unload()
+        }, this);
+        // this is needed to ensure EoL is "on" and sent
+        scheduler.harvest.on('jserrors', () => ({
+          body: this.aggregator.take(['cm', 'sm'])
+        }));
+        this.drain();
+      } else {
+        this.blocked = true; // if rum response determines that customer lacks entitlements for spa endpoint, this feature shouldn't harvest
+        (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
+      }
+    });
 
     // Allow features external to the metrics feature to capture SMs and CMs through the event emitter
     (0, _registerHandler.registerHandler)(_constants.SUPPORTABILITY_METRIC_CHANNEL, this.storeSupportabilityMetrics.bind(this), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)(_constants.CUSTOM_METRIC_CHANNEL, this.storeEventMetrics.bind(this), this.featureName, this.ee);
     this.singleChecks(); // checks that are run only one time, at script load
     this.eachSessionChecks(); // the start of every time user engages with page
-
-    this.ee.on("drain-".concat(this.featureName), () => {
-      // *cli, Mar 23 - Per NR-94597, this feature should only harvest ONCE at the (potential) EoL time of the page.
-      scheduler = new _harvestScheduler.HarvestScheduler('jserrors', {
-        onUnload: () => this.unload()
-      }, this);
-      scheduler.harvest.on('jserrors', () => ({
-        body: this.aggregator.take(['cm', 'sm'])
-      }));
-    }); // this is needed to ensure EoL is "on" and sent
-
-    this.drain();
   }
   storeSupportabilityMetrics(name, value) {
     if (this.blocked) return;
@@ -67,6 +66,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
       distMethod,
       loaderType
     } = (0, _config.getRuntime)(this.agentIdentifier);
+    const {
+      proxy,
+      privacy,
+      page_view_timing
+    } = (0, _config.getConfiguration)(this.agentIdentifier);
     if (loaderType) this.storeSupportabilityMetrics("Generic/LoaderType/".concat(loaderType, "/Detected"));
     if (distMethod) this.storeSupportabilityMetrics("Generic/DistMethod/".concat(distMethod, "/Detected"));
     if (_runtime.isBrowserScope) {
@@ -82,6 +86,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
           this.storeSupportabilityMetrics('Framework/' + framework + '/Detected');
         });
       });
+      if (!privacy.cookies_enabled) this.storeSupportabilityMetrics('Config/SessionTracking/Disabled');
+      if (page_view_timing.long_task) this.storeSupportabilityMetrics('Config/LongTask/Enabled');
     } else if (_runtime.isWorkerScope) {
       this.storeSupportabilityMetrics('Generic/Runtime/Worker/Detected');
     } else {
@@ -100,13 +106,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (rules.length > 0 && !(0, _obfuscate.validateRules)(rules)) this.storeSupportabilityMetrics('Generic/Obfuscate/Invalid');
 
     // Check if proxy for either chunks or beacon is being used
-    const {
-      proxy,
-      privacy
-    } = (0, _config.getConfiguration)(this.agentIdentifier);
     if (proxy.assets) this.storeSupportabilityMetrics('Config/AssetsUrl/Changed');
     if (proxy.beacon) this.storeSupportabilityMetrics('Config/BeaconUrl/Changed');
-    if (!(_runtime.isBrowserScope && privacy.cookies_enabled)) this.storeSupportabilityMetrics('Config/SessionTracking/Disabled');
   }
   eachSessionChecks() {
     if (!_runtime.isBrowserScope) return;

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

@@ -13,6 +13,7 @@ var _config = require("../../../common/config/config");
 var _constants = require("../constants");
 var _runtime = require("../../../common/constants/runtime");
 var _aggregateBase = require("../../utils/aggregate-base");
+var _drain = require("../../../common/drain/drain");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -37,8 +38,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
       return _this.addPageAction(...arguments);
     }, this.featureName, this.ee);
     this.waitForFlags(['ins']).then(_ref => {
-      let [enabled] = _ref;
-      if (enabled) {
+      let [insFlag] = _ref;
+      if (insFlag) {
         const scheduler = new _harvestScheduler.HarvestScheduler('ins', {
           onFinished: function () {
             return _this.onHarvestFinished(...arguments);
@@ -48,11 +49,12 @@ class Aggregate extends _aggregateBase.AggregateBase {
           return _this.onHarvestStarted(...arguments);
         });
         scheduler.startTimer(this.harvestTimeSeconds, 0);
+        this.drain();
       } else {
-        this.blocked = true;
+        this.blocked = true; // if rum response determines that customer lacks entitlements for ins endpoint, this feature shouldn't harvest
+        (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
       }
     });
-    this.drain();
   }
   onHarvestStarted(options) {
     const {

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

@@ -17,6 +17,10 @@ var _aggregateBase = require("../../utils/aggregate-base");
 var _firstContentfulPaint = require("../../../common/vitals/first-contentful-paint");
 var _firstPaint = require("../../../common/vitals/first-paint");
 var _timeToFirstByte = require("../../../common/vitals/time-to-first-byte");
+var _drain = require("../../../common/drain/drain");
+var _features = require("../../../loaders/features/features");
+var _handle = require("../../../common/event-emitter/handle");
+var _constants2 = require("../../metrics/constants");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 class Aggregate extends _aggregateBase.AggregateBase {
@@ -125,7 +129,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
       cbFinished: _ref3 => {
         let {
           status,
-          responseText
+          responseText,
+          xhr,
+          fullUrl
         } = _ref3;
         if (status >= 400 || status === 0) {
           // Adding retry logic for the rum call will be a separate change
@@ -133,7 +139,21 @@ class Aggregate extends _aggregateBase.AggregateBase {
           return;
         }
         try {
-          (0, _featureFlags.activateFeatures)(JSON.parse(responseText), this.agentIdentifier);
+          this.timeKeeper.processRumRequest(xhr, fullUrl);
+        } catch (error) {
+          (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/Failed'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
+          (0, _drain.drain)(this.agentIdentifier, _features.FEATURE_NAMES.metrics, true);
+          this.ee.abort();
+          (0, _console.warn)('Could not calculate New Relic server time. Agent shutting down.');
+          return;
+        }
+        try {
+          const {
+            app,
+            ...flags
+          } = JSON.parse(responseText);
+          agentRuntime.appMetadata = app;
+          (0, _featureFlags.activateFeatures)(flags, this.agentIdentifier);
           this.drain();
         } catch (err) {
           this.ee.abort();

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

@@ -43,17 +43,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.timings = [];
     this.timingsSent = [];
     this.curSessEndRecorded = false;
-    _firstPaint.firstPaint.subscribe(this.#handleVitalMetric);
-    _firstContentfulPaint.firstContentfulPaint.subscribe(this.#handleVitalMetric);
-    _firstInputDelay.firstInputDelay.subscribe(this.#handleVitalMetric);
-    _largestContentfulPaint.largestContentfulPaint.subscribe(this.#handleVitalMetric);
-    _interactionToNextPaint.interactionToNextPaint.subscribe(this.#handleVitalMetric);
-    _timeToFirstByte.timeToFirstByte.subscribe(_ref2 => {
-      let {
-        entries
-      } = _ref2;
-      this.addTiming('load', Math.round(entries[0].loadEventEnd));
-    });
     if ((0, _config.getConfigurationValue)(this.agentIdentifier, 'page_view_timing.long_task') === true) _longTask.longTask.subscribe(this.#handleVitalMetric);
 
     /* It's important that CWV api, like "onLCP", is called before this scheduler is initialized. The reason is because they listen to the same
@@ -63,9 +52,19 @@ class Aggregate extends _aggregateBase.AggregateBase {
     (0, _registerHandler.registerHandler)('winPagehide', msTimestamp => this.recordPageUnload(msTimestamp), this.featureName, this.ee);
     const initialHarvestSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'page_view_timing.initialHarvestSeconds') || 10;
     const harvestTimeSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'page_view_timing.harvestTimeSeconds') || 30;
-    // send initial data sooner, then start regular
-    this.ee.on("drain-".concat(this.featureName), () => {
-      this.scheduler = new _harvestScheduler.HarvestScheduler('events', {
+    this.waitForFlags([]).then(() => {
+      _firstPaint.firstPaint.subscribe(this.#handleVitalMetric);
+      _firstContentfulPaint.firstContentfulPaint.subscribe(this.#handleVitalMetric);
+      _firstInputDelay.firstInputDelay.subscribe(this.#handleVitalMetric);
+      _largestContentfulPaint.largestContentfulPaint.subscribe(this.#handleVitalMetric);
+      _interactionToNextPaint.interactionToNextPaint.subscribe(this.#handleVitalMetric);
+      _timeToFirstByte.timeToFirstByte.subscribe(_ref2 => {
+        let {
+          entries
+        } = _ref2;
+        this.addTiming('load', Math.round(entries[0].loadEventEnd));
+      });
+      const scheduler = new _harvestScheduler.HarvestScheduler('events', {
         onFinished: function () {
           return _this.onHarvestFinished(...arguments);
         },
@@ -73,9 +72,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
           return _this.prepareHarvest(...arguments);
         }
       }, this);
-      this.scheduler.startTimer(harvestTimeSeconds, initialHarvestSeconds);
+      scheduler.startTimer(harvestTimeSeconds, initialHarvestSeconds);
+      this.drain();
     });
-    this.drain();
   }
 
   /**

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

@@ -21,6 +21,7 @@ var _now = require("../../../common/timing/now");
 var _constants3 = require("../../../common/session/constants");
 var _stringify = require("../../../common/util/stringify");
 var _stylesheetEvaluator = require("../shared/stylesheet-evaluator");
+var _drain = require("../../../common/drain/drain");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; } /*
  * Copyright 2023 New Relic Corporation. All rights reserved.
@@ -130,11 +131,15 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.waitForFlags(['sr']).then(_ref => {
       let [flagOn] = _ref;
       this.entitled = flagOn;
-      if (!this.entitled && this.recorder?.recording) {
-        this.abort(_constants.ABORT_REASONS.ENTITLEMENTS);
-        (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['SessionReplay/EnabledNotEntitled/Detected'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
+      if (!this.entitled) {
+        (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
+        if (this.recorder?.recording) {
+          this.abort(_constants.ABORT_REASONS.ENTITLEMENTS);
+          (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['SessionReplay/EnabledNotEntitled/Detected'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
+        }
         return;
       }
+      this.drain();
       this.initializeRecording(Math.random() * 100 < error_sampling_rate, Math.random() * 100 < sampling_rate);
     }).then(() => {
       if (this.mode === _constants3.MODE.OFF) args?.recorder?.stopRecording(); // stop any conservative preload recording launched by instrument
@@ -151,7 +156,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (mask_text_selector !== '*') (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Config/SessionReplay/MaskTextSelector/Modified'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
     (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Config/SessionReplay/SamplingRate/Value', sampling_rate], undefined, _features.FEATURE_NAMES.metrics, this.ee);
     (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Config/SessionReplay/ErrorSamplingRate/Value', error_sampling_rate], undefined, _features.FEATURE_NAMES.metrics, this.ee);
-    this.drain();
   }
   switchToFull() {
     this.mode = _constants3.MODE.FULL;
@@ -322,6 +326,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     const lastEventTimestamp = events[events.length - 1]?.timestamp; // from rrweb node
     const firstTimestamp = firstEventTimestamp || recorderEvents.cycleTimestamp; // from rrweb node || from when the harvest cycle started
     const lastTimestamp = lastEventTimestamp || agentOffset + relativeNow;
+    const agentMetadata = agentRuntime.appMetadata?.agents?.[0] || {};
     return {
       qs: {
         browser_monitoring_key: info.licenseKey,
@@ -334,6 +339,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
           ...(!!this.gzipper && !!this.u8 && {
             content_encoding: 'gzip'
           }),
+          ...(agentMetadata.entityGuid && {
+            entityGuid: agentMetadata.entityGuid
+          }),
           'replay.firstTimestamp': firstTimestamp,
           'replay.firstTimestampOffset': firstTimestamp - agentOffset,
           'replay.lastTimestamp': lastTimestamp,

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

@@ -123,7 +123,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (!sessionEntity) {
       // Since session manager isn't around, do the old Trace behavior of waiting for RUM response to decide feature activation.
       this.isStandalone = true;
-      (0, _registerHandler.registerHandler)('rumresp-stn', on => controlTraceOp(on), this.featureName, this.ee);
+      this.waitForFlags(['stn']).then(_ref => {
+        let [on] = _ref;
+        return controlTraceOp(on);
+      }, this.featureName, this.ee);
     } else {
       (0, _registerHandler.registerHandler)('errorAgg', () => {
         seenAnError = true;
@@ -140,8 +143,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
       };
 
       // CAUTION: everything inside this promise runs post-load; event subscribers must be pre-load aka synchronous with constructor
-      this.waitForFlags(['stn', 'sr']).then(async _ref => {
-        let [traceOn, replayOn] = _ref;
+      this.waitForFlags(['stn', 'sr']).then(async _ref2 => {
+        let [traceOn, replayOn] = _ref2;
         if (!replayOn) {
           // When sr = 0 from BCS, also do the old Trace behavior:
           this.isStandalone = true;
@@ -171,7 +174,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
             if (replayMode === _constants2.MODE.OFF) this.isStandalone = true; // without SR, Traces are still subject to old harvest limits
 
             let startingMode;
-            if (traceOn === true) {
+            if (traceOn) {
               // CASE: both trace (entitlement+sampling) & replay (entitlement) flags are true from RUM
               startingMode = _constants2.MODE.FULL; // always full capture regardless of replay sampling decisions
             } else {
@@ -259,8 +262,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     if (result.sent && result.retry && this.sentTrace) {
       // merge previous trace back into buffer to retry for next harvest
-      Object.entries(this.sentTrace).forEach(_ref2 => {
-        let [name, listOfSTNodes] = _ref2;
+      Object.entries(this.sentTrace).forEach(_ref3 => {
+        let [name, listOfSTNodes] = _ref3;
         if (this.nodeCount >= this.maxNodesPerHarvest) return;
         this.nodeCount += listOfSTNodes.length;
         this.trace[name] = this.trace[name] ? listOfSTNodes.concat(this.trace[name]) : listOfSTNodes;
@@ -506,8 +509,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.storeResources(window.performance.getEntriesByType('resource'));
     }
     let earliestTimeStamp = Infinity;
-    const stns = Object.entries(this.trace).flatMap(_ref3 => {
-      let [name, listOfSTNodes] = _ref3;
+    const stns = Object.entries(this.trace).flatMap(_ref4 => {
+      let [name, listOfSTNodes] = _ref4;
       // basically take the "this.trace" map-obj and concat all the list-type values
       const oldestNodeTS = listOfSTNodes.reduce((acc, next) => !acc || next.s < acc ? next.s : acc, undefined);
       if (oldestNodeTS < earliestTimeStamp) earliestTimeStamp = oldestNodeTS;

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Aggregate = void 0;
 var _config = require("../../../common/config/config");
+var _drain = require("../../../common/drain/drain");
 var _handle = require("../../../common/event-emitter/handle");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
@@ -28,15 +29,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.interactionsToHarvest = [];
     this.interactionsAwaitingRetry = [];
     this.domObserver = domObserver;
-    this.scheduler = new _harvestScheduler.HarvestScheduler('events', {
-      onFinished: this.onHarvestFinished.bind(this),
-      retryDelay: harvestTimeSeconds,
-      onUnload: () => this.interactionInProgress?.done() // return any held ajax or jserr events so they can be sent with EoL harvest
-    }, {
-      agentIdentifier,
-      ee: this.ee
-    });
-    this.scheduler.harvest.on('events', this.onHarvestStarted.bind(this));
     this.initialPageLoadInteraction = new _initialPageLoadInteraction.InitialPageLoadInteraction(agentIdentifier);
     _timeToFirstByte.timeToFirstByte.subscribe(_ref2 => {
       let {
@@ -56,7 +48,22 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.blocked = false;
     this.waitForFlags(['spa']).then(_ref3 => {
       let [spaOn] = _ref3;
-      if (spaOn) this.scheduler.startTimer(harvestTimeSeconds, 0);else this.blocked = true; // if rum response determines that customer lacks entitlements for spa endpoint, this feature shouldn't harvest
+      if (spaOn) {
+        this.drain();
+        const scheduler = new _harvestScheduler.HarvestScheduler('events', {
+          onFinished: this.onHarvestFinished.bind(this),
+          retryDelay: harvestTimeSeconds,
+          onUnload: () => this.interactionInProgress?.done() // return any held ajax or jserr events so they can be sent with EoL harvest
+        }, {
+          agentIdentifier,
+          ee: this.ee
+        });
+        scheduler.harvest.on('events', this.onHarvestStarted.bind(this));
+        scheduler.startTimer(harvestTimeSeconds, 0);
+      } else {
+        this.blocked = true; // if rum response determines that customer lacks entitlements for spa endpoint, this feature shouldn't harvest
+        (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
+      }
     });
 
     // By default, a complete UI driven interaction requires event -> URL change -> DOM mod in that exact order.
@@ -69,11 +76,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.#registerApiHandlers();
     (0, _registerHandler.registerHandler)('ajax', this.#handleAjaxEvent.bind(this), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('jserror', this.#handleJserror.bind(this), this.featureName, this.ee);
-    this.drain();
   }
   onHarvestStarted(options) {
     if (this.interactionsToHarvest.length === 0 || 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

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

@@ -25,6 +25,7 @@ var _bundleId = require("../../../common/ids/bundle-id");
 var _runtime = require("../../../common/constants/runtime");
 var _handle = require("../../../common/event-emitter/handle");
 var _constants2 = require("../../metrics/constants");
+var _drain = require("../../../common/drain/drain");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /*
@@ -74,6 +75,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       // 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: ((0, _config.getConfigurationValue)(agentIdentifier, 'feature_flags') || []).indexOf('disable-spa-fix') > -1
     };
+    let scheduler;
     this.serializer = new _serializer.Serializer(this);
     const {
       state,
@@ -92,14 +94,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     const jsonpEE = baseEE.get('jsonp');
     const xhrEE = baseEE.get('xhr');
     const tracerEE = baseEE.get('tracer');
-    const scheduler = new _harvestScheduler.HarvestScheduler('events', {
-      onFinished: onHarvestFinished,
-      retryDelay: state.harvestTimeSeconds
-    }, {
-      agentIdentifier,
-      ee: baseEE
-    });
-    scheduler.harvest.on('events', onHarvestStarted);
 
     // childTime is used when calculating exclusive time for a cb duration.
     //
@@ -133,11 +127,23 @@ class Aggregate extends _aggregateBase.AggregateBase {
     //  | click ending:                   |   65  |    50    |        |           |           |
     // click fn-end                       |   70  |    0     |    0   |     70    |     20    |
 
-    // if rum response determines that customer lacks entitlements for spa endpoint, block it
-    (0, _registerHandler.registerHandler)('block-spa', () => {
-      blocked = true;
-      scheduler.stopTimer(true);
-    }, this.featureName, baseEE);
+    this.waitForFlags(['spa']).then(_ref => {
+      let [spaFlag] = _ref;
+      if (spaFlag) {
+        scheduler = this.scheduler = new _harvestScheduler.HarvestScheduler('events', {
+          onFinished: onHarvestFinished,
+          retryDelay: state.harvestTimeSeconds
+        }, {
+          agentIdentifier,
+          ee: baseEE
+        });
+        this.scheduler.harvest.on('events', onHarvestStarted);
+        this.drain();
+      } else {
+        this.blocked = true;
+        (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
+      }
+    });
     if (!isEnabled()) return;
     state.initialPageLoad = new _interaction.Interaction('initialPageLoad', 0, state.lastSeenUrl, state.lastSeenRouteName, onInteractionFinished, agentIdentifier);
     state.initialPageLoad.save = true;
@@ -683,7 +689,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
       var enabled = (0, _config.getConfigurationValue)(agentIdentifier, 'spa.enabled');
       return enabled !== false;
     }
-    this.drain();
   }
 }
 exports.Aggregate = Aggregate;

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

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AggregateBase = void 0;
-var _registerHandler = require("../../common/event-emitter/register-handler");
 var _featureBase = require("./feature-base");
 var _config = require("../../common/config/config");
 var _configure = require("../../loaders/configure/configure");
 var _nreum = require("../../common/window/nreum");
 var _drain = require("../../common/drain/drain");
+var _featureFlags = require("../../common/util/feature-flags");
 class AggregateBase extends _featureBase.FeatureBase {
   constructor() {
     super(...arguments);
@@ -19,13 +19,26 @@ class AggregateBase extends _featureBase.FeatureBase {
   /**
    * New handler for waiting for multiple flags. Useful when expecting multiple flags simultaneously (ex. stn vs sr)
    * @param {string[]} flagNames
-   * @returns
+   * @returns {Promise}
    */
   waitForFlags() {
     let flagNames = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    return Promise.all(flagNames.map(fName => new Promise(resolve => {
-      (0, _registerHandler.registerHandler)("rumresp-".concat(fName), isOn => resolve(isOn), this.featureName, this.ee);
-    })));
+    return new Promise((resolve, reject) => {
+      if (_featureFlags.activatedFeatures[this.agentIdentifier]) {
+        resolve(buildOutput(_featureFlags.activatedFeatures[this.agentIdentifier]));
+      } else {
+        this.ee.on('rumresp', function () {
+          let resp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+          resolve(buildOutput(resp));
+        });
+      }
+      function buildOutput(ref) {
+        return flagNames.map(flag => {
+          if (!ref[flag]) return 0;
+          return ref[flag];
+        });
+      }
+    });
   }
   drain() {
     (0, _drain.drain)(this.agentIdentifier, this.featureName);

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FeatureBase = void 0;
 var _contextualEe = require("../../common/event-emitter/contextual-ee");
+var _timeKeeper = require("../../common/timing/time-keeper");
 class FeatureBase {
   constructor(agentIdentifier, aggregator, featureName) {
     /** @type {string} */
@@ -21,6 +22,7 @@ class FeatureBase {
      * @type {boolean}
      */
     this.blocked = false;
+    this.timeKeeper = _timeKeeper.TimeKeeper.getTimeKeeperByAgentIdentifier(this.agentIdentifier);
   }
 }
 exports.FeatureBase = FeatureBase;

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

@@ -122,6 +122,7 @@ class InstrumentBase extends _featureBase.FeatureBase {
         // not supported yet but nice to do: "abort" this agent's EE for this feature specifically
         (0, _drain.drain)(this.agentIdentifier, this.featureName, true);
         loadedSuccessfully(false);
+        if (this.ee) this.ee.abort();
       }
     };
 

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

@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.AgentBase = void 0;
 var _console = require("../common/util/console");
 var _constants = require("../features/session_replay/constants");
-var _observationContextManager = require("../common/context/observation-context-manager");
 var _uniqueId = require("../common/ids/unique-id");
-var _contextualEe = require("../common/event-emitter/contextual-ee");
+var _timeKeeper = require("../common/timing/time-keeper");
 /* eslint-disable n/handle-callback-err */
 
 /**
@@ -17,14 +16,10 @@ var _contextualEe = require("../common/event-emitter/contextual-ee");
 
 class AgentBase {
   agentIdentifier;
-  observationContext = new _observationContextManager.ObservationContextManager();
+  timeKeeper = new _timeKeeper.TimeKeeper(this);
   constructor() {
     let agentIdentifier = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : (0, _uniqueId.generateRandomHexString)(16);
     this.agentIdentifier = agentIdentifier;
-
-    // Assign the observation context to the event emitter, so it knows how to create observation contexts
-    const eventEmitter = _contextualEe.ee.get(agentIdentifier);
-    eventEmitter.observationContext = this.observationContext;
   }
 
   /**