@newrelic/browser-agent 1.295.0 → 1.296.0-rc.1

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

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.evtName = evtName;
+exports.isTrivial = isTrivial;
+/**
+ * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+function evtName(type) {
+  switch (type) {
+    case 'keydown':
+    case 'keyup':
+    case 'keypress':
+      return 'typing';
+    case 'mousemove':
+    case 'mouseenter':
+    case 'mouseleave':
+    case 'mouseover':
+    case 'mouseout':
+      return 'mousing';
+    case 'touchstart':
+    case 'touchmove':
+    case 'touchend':
+    case 'touchcancel':
+    case 'touchenter':
+    case 'touchleave':
+      return 'touching';
+    case 'scroll':
+    case 'scrollend':
+      return 'scrolling';
+    default:
+      return type;
+  }
+}
+function isTrivial(node) {
+  const limit = 4;
+  return !!(node && typeof node.e === 'number' && typeof node.s === 'number' && node.e - node.s < limit);
+}

package/dist/cjs/features/session_trace/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.START = exports.RESOURCE = exports.PUSH_STATE = exports.MAX_NODES_PER_HARVEST = exports.FN_START = exports.FN_END = exports.FEATURE_NAME = exports.END = exports.BST_RESOURCE = void 0;
+exports.START = exports.RESOURCE = exports.PUSH_STATE = exports.MAX_NODES_PER_HARVEST = exports.FN_START = exports.FN_END = exports.FEATURE_NAME = exports.ERROR_MODE_SECONDS_WINDOW = exports.END = exports.BST_RESOURCE = void 0;
 var _features = require("../../loaders/features/features");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
@@ -18,4 +18,5 @@ const END = exports.END = '-end';
 const FN_START = exports.FN_START = 'fn' + START;
 const FN_END = exports.FN_END = 'fn' + END;
 const PUSH_STATE = exports.PUSH_STATE = 'pushState';
-const MAX_NODES_PER_HARVEST = exports.MAX_NODES_PER_HARVEST = 1000;
+const MAX_NODES_PER_HARVEST = exports.MAX_NODES_PER_HARVEST = 1000;
+const ERROR_MODE_SECONDS_WINDOW = exports.ERROR_MODE_SECONDS_WINDOW = 30 * 1000; // sliding window of nodes to track when simply monitoring (but not harvesting) in error mode

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

@@ -65,8 +65,7 @@ class AggregateBase extends _featureBase.FeatureBase {
   #setupEventStore(entityGuid) {
     if (this.events) return;
     switch (this.featureName) {
-      // SessionTrace + Replay have their own storage mechanisms.
-      case _features.FEATURE_NAMES.sessionTrace:
+      // SessionReplay has its own storage mechanisms.
       case _features.FEATURE_NAMES.sessionReplay:
         break;
       // Jserror and Metric features uses a singleton EventAggregator instead of a regular EventBuffer.

package/dist/cjs/features/utils/event-buffer.js

@@ -26,6 +26,9 @@ class EventBuffer {
     this.maxPayloadSize = maxPayloadSize;
     this.featureAgg = featureAgg;
   }
+  get length() {
+    return this.#buffer.length;
+  }
   isEmpty() {
     return this.#buffer.length === 0;
   }
@@ -58,12 +61,40 @@ class EventBuffer {
     return true;
   }
 
+  /**
+  * Merges events in the buffer that match the given criteria.
+  * @param {Function} matcher - A function that takes an event and returns true if it should be merged.
+  * @param {Object} data - The data to merge into the matching events.
+  * @returns {boolean} true if a match was found and merged; false otherwise.
+  */
+  merge(matcher, data) {
+    if (this.isEmpty() || !matcher) return false;
+    const matchIdx = this.#buffer.findIndex(matcher);
+    if (matchIdx < 0) return false;
+    this.#buffer[matchIdx] = {
+      ...this.#buffer[matchIdx],
+      ...data
+    };
+    return true;
+  }
+
   /**
    * Wipes the main buffer
+   * @param {Object} [opts] - options for clearing the buffer
+   * @param {Number} [opts.clearBeforeTime] - timestamp before which all events should be cleared
+   * @param {String} [opts.timestampKey] - the key in the event object that contains the timestamp to compare against `clearBefore`
+   * @param {Number} [opts.clearBeforeIndex] - index before which all events should be cleared
+   * @returns {void}
    */
-  clear() {
-    this.#buffer = [];
-    this.#rawBytes = 0;
+  clear(opts = {}) {
+    if (opts.clearBeforeTime !== undefined && opts.timestampKey) {
+      this.#buffer = this.#buffer.filter(event => event[opts.timestampKey] >= opts.clearBeforeTime);
+    } else if (opts.clearBeforeIndex !== undefined) {
+      this.#buffer = this.#buffer.slice(opts.clearBeforeIndex);
+    } else {
+      this.#buffer = [];
+    }
+    this.#rawBytes = this.#buffer.length ? (0, _stringify.stringify)(this.#buffer)?.length || 0 : 0; // recalculate raw bytes after clearing
   }
 
   /**

package/dist/cjs/features/utils/event-store-manager.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EventStoreManager = void 0;
 var _agentConstants = require("../../common/constants/agent-constants");
-var _globalEvent = require("../../common/dispatch/global-event");
-var _featureFlags = require("../../common/util/feature-flags");
 var _target = require("../../common/util/target");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
@@ -50,7 +48,24 @@ class EventStoreManager {
     this.appStorageMap.set(targetEntityGuid, eventStorage);
   }
 
-  // This class must contain an union of all methods from all supported storage classes and conceptualize away the target app argument.
+  /** IMPORTANT
+   * This class must contain an union of all methods from all supported storage classes and conceptualize away the target app argument.
+   */
+
+  get length() {
+    return this.#getEventStore().length;
+  }
+
+  /**
+   * Calls the merge method on the underlying storage class.
+   * @param {*} matcher
+   * @param {*} data
+   * @param {*} targetEntityGuid
+   * @returns {boolean} True if the merge was successful
+   */
+  merge(matcher, data, targetEntityGuid) {
+    return this.#getEventStore(targetEntityGuid).merge(matcher, data);
+  }
 
   /**
    * Calls the isEmpty method on the underlying storage class. If target is provided, runs just for the target, otherwise runs for all apps.
@@ -73,14 +88,6 @@ class EventStoreManager {
    * @returns {boolean} True if the event was successfully added
    */
   add(event, targetEntityGuid) {
-    (0, _globalEvent.dispatchGlobalEvent)({
-      agentIdentifier: this.agentRef.agentIdentifier,
-      drained: !!_featureFlags.activatedFeatures?.[this.agentRef.agentIdentifier],
-      type: 'data',
-      name: 'buffer',
-      feature: this.featureAgg.featureName,
-      data: event
-    });
     return this.#getEventStore(targetEntityGuid).add(event);
   }
 

package/dist/esm/common/constants/env.cdn.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.295.0";
+export const VERSION = "1.296.0-rc.1";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/constants/env.npm.js

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.295.0";
+export const VERSION = "1.296.0-rc.1";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/wrap/wrap-events.js

@@ -42,7 +42,8 @@ export function wrapEvents(sharedEE) {
   }
   ee.on(ADD_EVENT_LISTENER + '-start', function (args, target) {
     var originalListener = args[1];
-    if (originalListener === null || typeof originalListener !== 'function' && typeof originalListener !== 'object') {
+    if (originalListener === null || typeof originalListener !== 'function' && typeof originalListener !== 'object' || args[0] === 'newrelic' // ignore our own window events
+    ) {
       return;
     }
     var wrapped = getOrSet(originalListener, flag, function () {

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

@@ -12,7 +12,7 @@ import { MODE, SESSION_EVENTS } from '../../../common/session/constants';
 import { applyFnToProps } from '../../../common/util/traverse';
 import { cleanURL } from '../../../common/url/clean-url';
 import { warn } from '../../../common/util/console';
-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;
 export class Aggregate extends AggregateBase {
@@ -27,8 +27,8 @@ export class Aggregate extends AggregateBase {
     this.everHarvested = false;
     /** If the harvest module is harvesting */
     this.harvesting = false;
-    /** TraceStorage is the mechanism that holds, normalizes and aggregates ST nodes.  It will be accessed and purged when harvests occur */
-    this.events = new TraceStorage(this);
+    /** TraceStorage is a middleware that decides how to format data before passing events to `this.events` */
+    this.traceStorage = new TraceStorage(this);
 
     /* This agg needs information about sampling (sts) and entitlements (st) to make the appropriate decisions on running */
     this.waitForFlags(['sts', 'st']).then(([stMode, stEntitled]) => this.initialize(stMode, stEntitled));
@@ -59,9 +59,9 @@ export class Aggregate extends AggregateBase {
         if (this.sessionId !== sessionState.value || eventType === 'cross-tab' && sessionState.sessionTraceMode === MODE.OFF) this.abort(2);
       });
       if (typeof PerformanceNavigationTiming !== 'undefined') {
-        this.events.storeTiming(globalScope.performance?.getEntriesByType?.('navigation')[0]);
+        this.traceStorage.storeTiming(globalScope.performance?.getEntriesByType?.('navigation')[0]);
       } else {
-        this.events.storeTiming(globalScope.performance?.timing, true);
+        this.traceStorage.storeTiming(globalScope.performance?.timing, true);
       }
     }
 
@@ -75,13 +75,13 @@ export class Aggregate extends AggregateBase {
     this.timeKeeper ??= this.agentRef.runtime.timeKeeper;
 
     /** The handlers set up by the Inst file */
-    registerHandler('bst', (...args) => this.events.storeEvent(...args), this.featureName, this.ee);
-    registerHandler('bstResource', (...args) => this.events.storeResources(...args), this.featureName, this.ee);
-    registerHandler('bstHist', (...args) => this.events.storeHist(...args), this.featureName, this.ee);
-    registerHandler('bstXhrAgg', (...args) => this.events.storeXhrAgg(...args), this.featureName, this.ee);
-    registerHandler('bstApi', (...args) => this.events.storeNode(...args), this.featureName, this.ee);
-    registerHandler('trace-jserror', (...args) => this.events.storeErrorAgg(...args), this.featureName, this.ee);
-    registerHandler('pvtAdded', (...args) => this.events.processPVT(...args), this.featureName, this.ee);
+    registerHandler('bst', (...args) => this.traceStorage.storeEvent(...args), this.featureName, this.ee);
+    registerHandler('bstResource', (...args) => this.traceStorage.storeResources(...args), this.featureName, this.ee);
+    registerHandler('bstHist', (...args) => this.traceStorage.storeHist(...args), this.featureName, this.ee);
+    registerHandler('bstXhrAgg', (...args) => this.traceStorage.storeXhrAgg(...args), this.featureName, this.ee);
+    registerHandler('bstApi', (...args) => this.traceStorage.storeNode(...args), this.featureName, this.ee);
+    registerHandler('trace-jserror', (...args) => this.traceStorage.storeErrorAgg(...args), this.featureName, this.ee);
+    registerHandler('pvtAdded', (...args) => this.traceStorage.processPVT(...args), this.featureName, this.ee);
     if (this.mode !== MODE.FULL) {
       /** A separate handler for noticing errors, and switching to "full" mode if running in "error" mode */
       registerHandler('trace-jserror', () => {
@@ -106,18 +106,12 @@ export class Aggregate extends AggregateBase {
     }
     return true;
   }
-  serializer({
-    stns
-  }) {
+  serializer(stns) {
     if (!stns.length) return; // there are no processed nodes
     this.everHarvested = true;
     return applyFnToProps(stns, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string');
   }
-  queryStringsBuilder({
-    stns,
-    earliestTimeStamp,
-    latestTimeStamp
-  }) {
+  queryStringsBuilder(stns) {
     const firstSessionHarvest = !this.agentRef.runtime.session.state.traceHarvestStarted;
     if (firstSessionHarvest) this.agentRef.runtime.session.write({
       traceHarvestStarted: true
@@ -125,6 +119,8 @@ export class Aggregate extends AggregateBase {
     const hasReplay = this.agentRef.runtime.session.state.sessionReplayMode === 1;
     const endUserId = this.agentRef.info.jsAttributes['enduser.id'];
     const entityGuid = this.agentRef.runtime.appMetadata.agents?.[0]?.entityGuid;
+    const earliestTimeStamp = stns.reduce((earliest, stn) => Math.min(earliest, stn.s), Infinity);
+    const latestTimeStamp = stns.reduce((latest, stn) => Math.max(latest, stn.s), -Infinity);
 
     /* The blob consumer expects the following and will reject if not supplied:
      * browser_monitoring_key
@@ -184,7 +180,7 @@ export class Aggregate extends AggregateBase {
     });
     if (prevMode === MODE.OFF || !this.initialized) return this.initialize(this.mode, this.entitled);
     if (this.initialized) {
-      this.events.trimSTNs(ERROR_MODE_SECONDS_WINDOW); // up until now, Trace would've been just buffering nodes up to max, which needs to be trimmed to last X seconds
+      this.traceStorage.trimSTNsByTime(); // up until now, Trace would've been just buffering nodes up to max, which needs to be trimmed to last X seconds
       this.agentRef.runtime.harvester.triggerHarvestFor(this);
     }
   }
@@ -199,4 +195,8 @@ export class Aggregate extends AggregateBase {
     });
     this.events.clear();
   }
+  postHarvestCleanup(result) {
+    this.traceStorage.clear(); // clear the trace storage state
+    super.postHarvestCleanup(result);
+  }
 }