@newrelic/browser-agent 1.263.0 → 1.265.0

package/dist/cjs/features/session_replay/shared/recorder-events.js

@@ -4,30 +4,35 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RecorderEvents = void 0;
+var _eventBuffer = require("../../utils/event-buffer");
 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.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;
   }
 }
 exports.RecorderEvents = RecorderEvents;

package/dist/cjs/features/session_replay/shared/recorder.js

@@ -7,7 +7,7 @@ exports.Recorder = void 0;
 var _rrweb = require("rrweb");
 var _stringify = require("../../../common/util/stringify");
 var _constants = require("../constants");
-var _config = require("../../../common/config/config");
+var _init = require("../../../common/config/init");
 var _recorderEvents = require("./recorder-events");
 var _constants2 = require("../../../common/session/constants");
 var _stylesheetEvaluator = require("./stylesheet-evaluator");
@@ -15,6 +15,7 @@ var _handle = require("../../../common/event-emitter/handle");
 var _constants3 = require("../../metrics/constants");
 var _features = require("../../../loaders/features/features");
 var _utils = require("./utils");
+var _agentConstants = require("../../../common/constants/agent-constants");
 class Recorder {
   /** Each page mutation or event will be stored (raw) in this array. This array will be cleared on each harvest */
   #events;
@@ -37,17 +38,21 @@ class Recorder {
     /** The parent class that instantiated the recorder */
     this.parent = parent;
     /** Config to inform to inline stylesheet contents (true default) */
-    this.shouldInlineStylesheets = (0, _config.getConfigurationValue)(this.parent.agentIdentifier, 'session_replay.inline_stylesheet');
+    this.shouldInlineStylesheets = (0, _init.getConfigurationValue)(this.parent.agentIdentifier, 'session_replay.inline_stylesheet');
     /** A flag that can be set to false by failing conversions to stop the fetching process */
-    this.shouldFix = this.shouldInlineStylesheets && (0, _config.getConfigurationValue)(this.parent.agentIdentifier, 'session_replay.fix_stylesheets');
+    this.shouldFix = this.shouldInlineStylesheets && (0, _init.getConfigurationValue)(this.parent.agentIdentifier, 'session_replay.fix_stylesheets');
     /** The method to stop recording. This defaults to a noop, but is overwritten once the recording library is imported and initialized */
     this.stopRecording = () => {/* no-op until set by rrweb initializer */};
   }
   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',
@@ -80,7 +85,7 @@ class Recorder {
       inline_stylesheet,
       inline_images,
       collect_fonts
-    } = (0, _config.getConfigurationValue)(this.parent.agentIdentifier, 'session_replay');
+    } = (0, _init.getConfigurationValue)(this.parent.agentIdentifier, 'session_replay');
     const customMasker = (text, element) => {
       if (element?.type?.toLowerCase() !== 'password' && (element?.dataset.nrUnmask !== undefined || element?.classList.contains('nr-unmask'))) return text;
       return '*'.repeat(text.length);
@@ -108,7 +113,8 @@ 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 = () => {
       this.recording = false;
@@ -186,11 +192,10 @@ class Recorder {
       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.
-    if ((event.type === _constants.RRWEB_EVENT_TYPES.FullSnapshot && this.currentBufferTarget.hasMeta || payloadSize > _constants.IDEAL_PAYLOAD_SIZE) && this.parent.mode === _constants2.MODE.FULL) {
+    if ((event.type === _constants.RRWEB_EVENT_TYPES.FullSnapshot && this.currentBufferTarget.hasMeta || payloadSize > _agentConstants.IDEAL_PAYLOAD_SIZE) && this.parent.mode === _constants2.MODE.FULL) {
       // if we've made it to the ideal size of ~64kb before the interval timer, we should send early.
       if (this.parent.scheduler) {
         this.parent.scheduler.runHarvest();
@@ -215,8 +220,7 @@ class Recorder {
   }
 
   /** Estimate the payload size */
-  getPayloadSize() {
-    let newBytes = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  getPayloadSize(newBytes = 0) {
     // the query param padding constant gives us some padding for the other metadata to be safely injected
     return this.estimateCompression(this.currentBufferTarget.payloadBytesEstimation + newBytes) + _constants.QUERY_PARAM_PADDING;
   }

package/dist/cjs/features/session_replay/shared/stylesheet-evaluator.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.stylesheetEvaluator = void 0;
-var _config = require("../../../common/config/config");
+var _nreum = require("../../../common/window/nreum");
 var _runtime = require("../../../common/constants/runtime");
 class StylesheetEvaluator {
   #evaluated = new WeakSet();
@@ -62,7 +62,7 @@ class StylesheetEvaluator {
   async #fetchAndOverride(target) {
     if (!target?.href) return;
     try {
-      const stylesheetContents = await _config.originals.FETCH.bind(window)(target.href);
+      const stylesheetContents = await (0, _nreum.gosNREUMOriginals)().o.FETCH.bind(window)(target.href);
       if (!stylesheetContents.ok) {
         this.failedToFix++;
         return;

package/dist/cjs/features/session_replay/shared/utils.js

@@ -6,18 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.buildNRMetaNode = buildNRMetaNode;
 exports.hasReplayPrerequisite = hasReplayPrerequisite;
 exports.isPreloadAllowed = isPreloadAllowed;
-var _config = require("../../../common/config/config");
+var _nreum = require("../../../common/window/nreum");
+var _init = require("../../../common/config/init");
 var _featureGates = require("../../utils/feature-gates");
 var _runtime = require("../../../common/constants/runtime");
 function hasReplayPrerequisite(agentId) {
-  return !!_config.originals.MO &&
+  return !!(0, _nreum.gosNREUMOriginals)().o.MO &&
   // Session Replay cannot work without Mutation Observer
   (0, _featureGates.canEnableSessionTracking)(agentId) &&
   // requires session tracking to be running (hence "session" replay...)
-  (0, _config.getConfigurationValue)(agentId, 'session_trace.enabled') === true; // Session Replay as of now is tightly coupled with Session Trace in the UI
+  (0, _init.getConfigurationValue)(agentId, 'session_trace.enabled') === true; // Session Replay as of now is tightly coupled with Session Trace in the UI
 }
 function isPreloadAllowed(agentId) {
-  return (0, _config.getConfigurationValue)(agentId, 'session_replay.preload') === true && hasReplayPrerequisite(agentId);
+  return (0, _init.getConfigurationValue)(agentId, 'session_replay.preload') === true && hasReplayPrerequisite(agentId);
 }
 function buildNRMetaNode(timestamp, timeKeeper) {
   const correctedTimestamp = timeKeeper.correctAbsoluteTimestamp(timestamp);

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

@@ -6,14 +6,17 @@ Object.defineProperty(exports, "__esModule", {
 exports.Aggregate = void 0;
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
-var _config = require("../../../common/config/config");
+var _info = require("../../../common/config/info");
+var _init = require("../../../common/config/init");
+var _runtime = require("../../../common/config/runtime");
 var _constants = require("../constants");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _storage = require("./trace/storage");
 var _encode = require("../../../common/url/encode");
 var _drain = require("../../../common/drain/drain");
-var _runtime = require("../../../common/constants/runtime");
+var _runtime2 = require("../../../common/constants/runtime");
 var _constants2 = require("../../../common/session/constants");
+var _traverse = require("../../../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 */
 const QUERY_PARAM_PADDING = 5000;
@@ -21,12 +24,12 @@ class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
-    this.agentRuntime = (0, _config.getRuntime)(agentIdentifier);
-    this.agentInfo = (0, _config.getInfo)(agentIdentifier);
+    this.agentRuntime = (0, _runtime.getRuntime)(agentIdentifier);
+    this.agentInfo = (0, _info.getInfo)(agentIdentifier);
 
     /** A buffer to hold on to harvested traces in the case that a retry must be made later */
     this.sentTrace = null;
-    this.harvestTimeSeconds = (0, _config.getConfigurationValue)(agentIdentifier, 'session_trace.harvestTimeSeconds') || 30;
+    this.harvestTimeSeconds = (0, _init.getConfigurationValue)(agentIdentifier, 'session_trace.harvestTimeSeconds') || 30;
     /** Tied to the entitlement flag response from BCS.  Will short circuit operations of the agg if false  */
     this.entitled = undefined;
     /** A flag used to decide if the 30 node threshold should be ignored on the first harvest to ensure sending on the first payload */
@@ -36,15 +39,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
     /** TraceStorage is the mechanism that holds, normalizes and aggregates ST nodes.  It will be accessed and purged when harvests occur */
     this.traceStorage = new _storage.TraceStorage(this);
     /** This agg needs information about sampling (sts) and entitlements (st) to make the appropriate decisions on running */
-    this.waitForFlags(['sts', 'st']).then(_ref => {
-      let [stMode, stEntitled] = _ref;
-      return this.initialize(stMode, stEntitled);
-    });
+    this.waitForFlags(['sts', 'st']).then(([stMode, stEntitled]) => this.initialize(stMode, stEntitled));
   }
 
   /** Sets up event listeners, and initializes this module to run in the correct "mode".  Can be triggered from a few places, but makes an effort to only set up listeners once */
   initialize(stMode, stEntitled, ignoreSession) {
-    var _this = this;
     this.entitled ??= stEntitled;
     if (this.blocked || !this.entitled) return (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
     if (!this.initialized) {
@@ -84,31 +83,17 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }, this);
 
     /** The handlers set up by the Inst file */
-    (0, _registerHandler.registerHandler)('bst', function () {
-      return _this.traceStorage.storeEvent(...arguments);
-    }, this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('bstResource', function () {
-      return _this.traceStorage.storeResources(...arguments);
-    }, this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('bstHist', function () {
-      return _this.traceStorage.storeHist(...arguments);
-    }, this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('bstXhrAgg', function () {
-      return _this.traceStorage.storeXhrAgg(...arguments);
-    }, this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('bstApi', function () {
-      return _this.traceStorage.storeSTN(...arguments);
-    }, this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('trace-jserror', function () {
-      return _this.traceStorage.storeErrorAgg(...arguments);
-    }, this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('pvtAdded', function () {
-      return _this.traceStorage.processPVT(...arguments);
-    }, this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('bst', (...args) => this.traceStorage.storeEvent(...args), this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('bstResource', (...args) => this.traceStorage.storeResources(...args), this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('bstHist', (...args) => this.traceStorage.storeHist(...args), this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('bstXhrAgg', (...args) => this.traceStorage.storeXhrAgg(...args), this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('bstApi', (...args) => this.traceStorage.storeSTN(...args), this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('trace-jserror', (...args) => this.traceStorage.storeErrorAgg(...args), this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('pvtAdded', (...args) => this.traceStorage.processPVT(...args), this.featureName, this.ee);
     if (typeof PerformanceNavigationTiming !== 'undefined') {
-      this.traceStorage.storeTiming(_runtime.globalScope.performance?.getEntriesByType?.('navigation')[0]);
+      this.traceStorage.storeTiming(_runtime2.globalScope.performance?.getEntriesByType?.('navigation')[0]);
     } else {
-      this.traceStorage.storeTiming(_runtime.globalScope.performance?.timing);
+      this.traceStorage.storeTiming(_runtime2.globalScope.performance?.timing, true);
     }
 
     /** Only start actually harvesting if running in full mode at init time */
@@ -132,8 +117,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
 
   /** Called by the harvest scheduler at harvest time to retrieve the payload.  This will only actually return a payload if running in full mode */
-  prepareHarvest() {
-    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  prepareHarvest(options = {}) {
     this.traceStorage.prevStoredEvents.clear(); // release references to past events for GC
     if (!this.timeKeeper?.ready) return; // this should likely never happen, but just to be safe, we should never harvest if we cant correct time
     if (this.blocked || this.mode !== _constants2.MODE.FULL || this.traceStorage.nodeCount === 0) return;
@@ -172,7 +156,7 @@ class Aggregate extends _aggregateBase.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: (0, _encode.obj)({
           ...(agentMetadata.entityGuid && {
             entityGuid: agentMetadata.entityGuid
@@ -181,8 +165,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
           // 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
@@ -197,12 +181,12 @@ class Aggregate extends _aggregateBase.AggregateBase {
           session: "".concat(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
+            '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: (0, _traverse.applyFnToProps)(stns, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string')
     };
   }
 
@@ -212,8 +196,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
   onHarvestFinished(result) {
     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(([name, listOfSTNodes]) => {
         this.traceStorage.restoreNode(name, listOfSTNodes);
       });
       this.sentTrace = null;

package/dist/cjs/features/session_trace/aggregate/trace/storage.js

@@ -97,8 +97,7 @@ class TraceStorage {
       // if PO isn't supported, this checks resourcetiming buffer every harvest.
       this.storeResources(_runtime.globalScope.performance?.getEntriesByType?.('resource'));
     }
-    const stns = Object.entries(this.trace).flatMap(_ref => {
-      let [name, listOfSTNodes] = _ref;
+    const stns = Object.entries(this.trace).flatMap(([name, listOfSTNodes]) => {
       // basically take the "this.trace" map-obj and concat all the list-type values
       if (!(name in toAggregate)) return listOfSTNodes;
       // Special processing for event nodes dealing with user inputs:
@@ -156,7 +155,7 @@ class TraceStorage {
       return name === 'fi' && !!attrs && typeof attrs.fid === 'number';
     }
   }
-  storeTiming(timingEntry) {
+  storeTiming(timingEntry, isAbsoluteTimestamp = false) {
     if (!timingEntry) return;
 
     // loop iterates through prototype also (for FF)
@@ -171,6 +170,9 @@ class TraceStorage {
       // that are in the future (Microsoft Edge seems to sometimes produce these)
       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 _node.TraceNode(key, val, val, 'document', 'timing'));
     }
   }

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

@@ -3,9 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Instrument = void 0;
+exports.SessionTrace = exports.Instrument = void 0;
 var _handle = require("../../../common/event-emitter/handle");
-var _wrap = require("../../../common/wrap");
+var _wrapHistory = require("../../../common/wrap/wrap-history");
+var _wrapEvents = require("../../../common/wrap/wrap-events");
 var _instrumentBase = require("../../utils/instrument-base");
 var CONSTANTS = _interopRequireWildcard(require("../constants"));
 var _features = require("../../../loaders/features/features");
@@ -31,8 +32,7 @@ const {
 } = CONSTANTS;
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = FEATURE_NAME;
-  constructor(agentIdentifier, aggregator) {
-    let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  constructor(agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, FEATURE_NAME, auto);
     const canTrackSession = (0, _featureGates.canEnableSessionTracking)(this.agentIdentifier);
     if (!canTrackSession) {
@@ -40,8 +40,8 @@ class Instrument extends _instrumentBase.InstrumentBase {
       return;
     }
     const thisInstrumentEE = this.ee;
-    (0, _wrap.wrapHistory)(thisInstrumentEE);
-    this.eventsEE = (0, _wrap.wrapEvents)(thisInstrumentEE);
+    (0, _wrapHistory.wrapHistory)(thisInstrumentEE);
+    this.eventsEE = (0, _wrapEvents.wrapEvents)(thisInstrumentEE);
     this.eventsEE.on(FN_START, function (args, target) {
       this.bstStart = (0, _now.now)();
     });
@@ -77,4 +77,5 @@ class Instrument extends _instrumentBase.InstrumentBase {
     });
   }
 }
-exports.Instrument = Instrument;
+exports.Instrument = Instrument;
+const SessionTrace = exports.SessionTrace = Instrument;

package/dist/cjs/features/soft_navigations/aggregate/ajax-node.js

@@ -22,7 +22,7 @@ class AjaxNode extends _belNode.BelNode {
     this.traceId = ajaxEvent.traceId;
     this.spanTimestamp = ajaxEvent.spanTimestamp;
     this.gql = ajaxEvent.gql;
-    this.start = ajaxEvent.startTime;
+    this.start = ajaxEvent.startTime; // 5000 --- 5500 --> 10500
     this.end = ajaxEvent.endTime;
   }
   serialize(parentStartTimestamp) {

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Aggregate = void 0;
-var _config = require("../../../common/config/config");
+var _init = require("../../../common/config/init");
 var _drain = require("../../../common/drain/drain");
 var _handle = require("../../../common/event-emitter/handle");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
@@ -14,30 +14,28 @@ var _timeToFirstByte = require("../../../common/vitals/time-to-first-byte");
 var _features = require("../../../loaders/features/features");
 var _constants = require("../../metrics/constants");
 var _aggregateBase = require("../../utils/aggregate-base");
+var _eventBuffer = require("../../utils/event-buffer");
 var _constants2 = require("../constants");
 var _ajaxNode = require("./ajax-node");
 var _initialPageLoadInteraction = require("./initial-page-load-interaction");
 var _interaction = require("./interaction");
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants2.FEATURE_NAME;
-  constructor(agentIdentifier, aggregator, _ref) {
-    let {
-      domObserver
-    } = _ref;
+  constructor(agentIdentifier, aggregator, {
+    domObserver
+  }) {
     super(agentIdentifier, aggregator, _constants2.FEATURE_NAME);
-    const harvestTimeSeconds = (0, _config.getConfigurationValue)(agentIdentifier, 'soft_navigations.harvestTimeSeconds') || 10;
-    this.interactionsToHarvest = [];
-    this.interactionsAwaitingRetry = [];
+    const harvestTimeSeconds = (0, _init.getConfigurationValue)(agentIdentifier, 'soft_navigations.harvestTimeSeconds') || 10;
+    this.interactionsToHarvest = new _eventBuffer.EventBuffer();
     this.domObserver = domObserver;
     this.initialPageLoadInteraction = new _initialPageLoadInteraction.InitialPageLoadInteraction(agentIdentifier);
-    _timeToFirstByte.timeToFirstByte.subscribe(_ref2 => {
-      let {
-        attrs
-      } = _ref2;
+    _timeToFirstByte.timeToFirstByte.subscribe(({
+      attrs
+    }) => {
       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
       (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['SoftNav/Interaction/InitialPageLoad/Duration/Ms', Math.round(loadEventTime)], undefined, _features.FEATURE_NAMES.metrics, this.ee);
@@ -46,8 +44,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.interactionInProgress = null; // aside from the "page load" interaction, there can only ever be 1 ongoing at a time
 
     this.blocked = false;
-    this.waitForFlags(['spa']).then(_ref3 => {
-      let [spaOn] = _ref3;
+    this.waitForFlags(['spa']).then(([spaOn]) => {
       if (spaOn) {
         this.drain();
         const scheduler = new _harvestScheduler.HarvestScheduler('events', {
@@ -78,18 +75,17 @@ class Aggregate extends _aggregateBase.AggregateBase {
     (0, _registerHandler.registerHandler)('jserror', this.#handleJserror.bind(this), this.featureName, this.ee);
   }
   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;".concat(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
@@ -97,10 +93,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     };
   }
   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
@@ -121,7 +114,7 @@ class Aggregate extends _aggregateBase.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
 
@@ -148,9 +141,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     */
     if (this.interactionInProgress?.isActiveDuring(timestamp)) return this.interactionInProgress;
     let saveIxn;
-    for (let idx = this.interactionsToHarvest.length - 1; idx >= 0; 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[idx];
+      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
@@ -210,10 +203,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
   #registerApiHandlers() {
     const INTERACTION_API = 'api-ixn-';
     const thisClass = this;
-    (0, _registerHandler.registerHandler)(INTERACTION_API + 'get', function (time) {
-      let {
-        waitForEnd
-      } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    (0, _registerHandler.registerHandler)(INTERACTION_API + 'get', function (time, {
+      waitForEnd
+    } = {}) {
       // In here, 'this' refers to the EventContext specific to per InteractionHandle instance spawned by each .interaction() api call.
       // Each api call aka IH instance would therefore retain a reference to either the in-progress interaction *at the time of the call* OR a new api-started interaction.
       this.associatedInteraction = thisClass.getInteractionFor(time);

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

@@ -9,11 +9,11 @@ var _interaction = require("./interaction");
 var _belSerializer = require("../../../common/serialize/bel-serializer");
 var _firstPaint = require("../../../common/vitals/first-paint");
 var _firstContentfulPaint = require("../../../common/vitals/first-contentful-paint");
-var _config = require("../../../common/config/config");
+var _info = require("../../../common/config/info");
 class InitialPageLoadInteraction extends _interaction.Interaction {
   constructor(agentIdentifier) {
     super(agentIdentifier, 'initialPageLoad', 0, null);
-    const agentInfo = (0, _config.getInfo)(agentIdentifier);
+    const agentInfo = (0, _info.getInfo)(agentIdentifier);
     this.queueTime = agentInfo.queueTime;
     this.appTime = agentInfo.applicationTime;
   }

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Interaction = void 0;
-var _config = require("../../../common/config/config");
+var _info = require("../../../common/config/info");
 var _runtime = require("../../../common/constants/runtime");
 var _uniqueId = require("../../../common/ids/unique-id");
 var _belSerializer = require("../../../common/serialize/bel-serializer");
@@ -70,13 +70,12 @@ class Interaction extends _belNode.BelNode {
     else this.#cancel();
     return true;
   }
-  #finish() {
-    let customEndTime = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  #finish(customEndTime = 0) {
     if (this.status !== _constants.INTERACTION_STATUS.IP) return; // disallow this call if the ixn is already done aka not in-progress
     clearTimeout(this.cancellationTimer);
     this.end = Math.max(this.domTimestamp, this.historyTimestamp, customEndTime);
     this.customAttributes = {
-      ...(0, _config.getInfo)(this.agentIdentifier).jsAttributes,
+      ...(0, _info.getInfo)(this.agentIdentifier).jsAttributes,
       ...this.customAttributes
     }; // attrs specific to this interaction should have precedence over the general custom attrs
     this.status = _constants.INTERACTION_STATUS.FIN;
@@ -129,7 +128,7 @@ class Interaction extends _belNode.BelNode {
     // not relative
     addString(this.trigger), addString((0, _cleanUrl.cleanURL)(this.initialPageURL, true)), addString((0, _cleanUrl.cleanURL)(this.oldURL, true)), addString((0, _cleanUrl.cleanURL)(this.newURL, true)), addString(this.customName), ixnType, (0, _belSerializer.nullable)(this.queueTime, _belSerializer.numeric, true) + (0, _belSerializer.nullable)(this.appTime, _belSerializer.numeric, true) + (0, _belSerializer.nullable)(this.oldRoute, addString, true) + (0, _belSerializer.nullable)(this.newRoute, addString, true) + addString(this.id), addString(this.nodeId), (0, _belSerializer.nullable)(this.firstPaint, _belSerializer.numeric, true) + (0, _belSerializer.nullable)(this.firstContentfulPaint, _belSerializer.numeric)];
     const allAttachedNodes = (0, _belSerializer.addCustomAttributes)(this.customAttributes || {}, addString); // start with all custom attributes
-    if ((0, _config.getInfo)(this.agentIdentifier).atts) allAttachedNodes.push('a,' + addString((0, _config.getInfo)(this.agentIdentifier).atts)); // add apm provided attributes
+    if ((0, _info.getInfo)(this.agentIdentifier).atts) allAttachedNodes.push('a,' + addString((0, _info.getInfo)(this.agentIdentifier).atts)); // add apm provided attributes
     /* Querypack encoder+decoder quirkiness:
        - If first ixn node of payload is being processed, we use this node's start to offset. (firstStartTime should be 0--or undefined.)
        - Else for subsequent ixn nodes, we use the first ixn node's start to offset. */