@newrelic/browser-agent 1.287.0 → 1.288.1

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.288.1](https://github.com/newrelic/newrelic-browser-agent/compare/v1.288.0...v1.288.1) (2025-04-18)
+
+
+### Bug Fixes
+
+* Call handle directly for submitting SM from SR recorder ([#1453](https://github.com/newrelic/newrelic-browser-agent/issues/1453)) ([4920580](https://github.com/newrelic/newrelic-browser-agent/commit/49205807b6038afb32e3f04ebabedfe5fc11456b))
+* Ensure event buffer always exists ([#1452](https://github.com/newrelic/newrelic-browser-agent/issues/1452)) ([56e75b2](https://github.com/newrelic/newrelic-browser-agent/commit/56e75b243b87d1d44e8014ac0ad5f408f0d145c5))
+
+## [1.288.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.287.0...v1.288.0) (2025-04-16)
+
+
+### Features
+
+* Introduce isFirstOfSession attribute on InitialPageLoad events ([#1432](https://github.com/newrelic/newrelic-browser-agent/issues/1432)) ([8d7bdd6](https://github.com/newrelic/newrelic-browser-agent/commit/8d7bdd63abe0b6d9dfccc46f63845bde0fd099a4))
+* Prevent storing session data past session expiry ([#1426](https://github.com/newrelic/newrelic-browser-agent/issues/1426)) ([5819b64](https://github.com/newrelic/newrelic-browser-agent/commit/5819b649792b6227d49173ecb326f918b1f39bdb))
+
+
+### Bug Fixes
+
+* Reset `notified` when replay stops recording ([#1435](https://github.com/newrelic/newrelic-browser-agent/issues/1435)) ([7dd8b62](https://github.com/newrelic/newrelic-browser-agent/commit/7dd8b6217763c57c382737b6ff90667066437b75))
+* Solve race condition in logging abort ([#1445](https://github.com/newrelic/newrelic-browser-agent/issues/1445)) ([ab315dc](https://github.com/newrelic/newrelic-browser-agent/commit/ab315dc009a45911911f5d176978fac0cf066be3))
+
 ## [1.287.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.286.0...v1.287.0) (2025-04-10)
 
 

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

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.287.0";
+const VERSION = exports.VERSION = "1.288.1";
 
 /**
  * Exposes the build type of the agent

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

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.287.0";
+const VERSION = exports.VERSION = "1.288.1";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/session/session-entity.js

@@ -38,7 +38,8 @@ const model = {
   loggingMode: _constants3.LOGGING_MODE.OFF,
   serverTimeDiff: null,
   // set by TimeKeeper; "undefined" value will not be stringified and stored but "null" will
-  custom: {}
+  custom: {},
+  numOfResets: 0
 };
 class SessionEntity {
   /**
@@ -84,7 +85,8 @@ class SessionEntity {
   setup({
     value = (0, _uniqueId.generateRandomHexString)(16),
     expiresMs = _constants.DEFAULT_EXPIRES_MS,
-    inactiveMs = _constants.DEFAULT_INACTIVE_MS
+    inactiveMs = _constants.DEFAULT_INACTIVE_MS,
+    numOfResets = 0
   }) {
     /** Ensure that certain properties are preserved across a reset if already set */
     const persistentAttributes = {
@@ -113,6 +115,7 @@ class SessionEntity {
     // this gets ignored if the value is falsy, allowing for session entities that do not expire
     if (expiresMs) {
       this.state.expiresAt = initialRead?.expiresAt || this.getFutureTimestamp(expiresMs);
+      this.state.numOfResets = initialRead?.numOfResets || numOfResets;
       this.expiresTimer = new _timer.Timer({
         // When the inactive timer ends, collect a SM and reset the session
         onEnd: () => {
@@ -247,7 +250,8 @@ class SessionEntity {
         key: this.key,
         storage: this.storage,
         expiresMs: this.expiresMs,
-        inactiveMs: this.inactiveMs
+        inactiveMs: this.inactiveMs,
+        numOfResets: ++this.state.numOfResets
       });
       return this.read();
     } catch (e) {
@@ -266,6 +270,9 @@ class SessionEntity {
       inactiveAt: this.getFutureTimestamp(this.inactiveMs)
     });
   }
+  isAfterSessionExpiry(timestamp) {
+    return this.state.numOfResets > 0 || typeof timestamp === 'number' && typeof this.state.expiresAt === 'number' && timestamp >= this.state.expiresAt;
+  }
 
   /**
    * @param {number} timestamp

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

@@ -160,8 +160,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
   abort(reason = {}) {
     this.reportSupportabilityMetric("Logging/Abort/".concat(reason.sm));
     this.blocked = true;
-    this.events.clear();
-    this.events.clearSave();
+    if (this.events) {
+      this.events.clear();
+      this.events.clearSave();
+    }
     this.updateLoggingMode(_constants.LOGGING_MODE.OFF);
     this.deregisterDrain();
   }

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

@@ -50,7 +50,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.recorder = args?.recorder;
     this.errorNoticed = args?.errorNoticed || false;
     this.harvestOpts.raw = true;
-    this.isSessionTrackingEnabled = (0, _featureGates.canEnableSessionTracking)(this.agentIdentifier) && this.agentRef.runtime.session;
+    this.isSessionTrackingEnabled = (0, _featureGates.canEnableSessionTracking)(this.agentIdentifier) && !!this.agentRef.runtime.session;
     this.reportSupportabilityMetric('Config/SessionReplay/Enabled');
 
     // The SessionEntity class can emit a message indicating the session was cleared and reset (expiry, inactivity). This feature must abort and never resume if that occurs.

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

@@ -117,6 +117,7 @@ class Recorder {
     });
     this.stopRecording = () => {
       this.recording = false;
+      this.notified = false;
       this.parent.ee.emit(_constants.SR_EVENT_EMITTER_TYPES.REPLAY_RUNNING, [false, this.parent.mode]);
       stop?.();
     };
@@ -164,6 +165,10 @@ class Recorder {
   /** Store a payload in the buffer (this.#events).  This should be the callback to the recording lib noticing a mutation */
   store(event, isCheckout) {
     if (!event) return;
+    if (this.parent.agentRef.runtime?.session?.isAfterSessionExpiry(event.timestamp)) {
+      (0, _handle.handle)(_constants3.SUPPORTABILITY_METRIC_CHANNEL, ['Session/Expired/SessionReplay/Seen'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
+      return;
+    }
     if (!(this.parent instanceof _aggregateBase.AggregateBase) && this.#preloaded.length) this.currentBufferTarget = this.#preloaded[this.#preloaded.length - 1];else this.currentBufferTarget = this.#events;
     if (this.parent.blocked) return;
     if (!this.notified) {

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

@@ -53,6 +53,9 @@ class TraceStorage {
   constructor(parent) {
     this.parent = parent;
   }
+  isAfterSessionExpiry(entryTimestamp) {
+    return this.parent.agentRef.runtime?.session?.isAfterSessionExpiry((this.parent.timeKeeper?.ready && this.parent.timeKeeper.convertRelativeTimestamp(entryTimestamp)) ?? undefined);
+  }
 
   /** Central function called by all the other store__ & addToTrace API to append a trace node. */
   storeSTN(stn) {
@@ -63,6 +66,10 @@ class TraceStorage {
       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 (this.isAfterSessionExpiry(stn.s)) {
+      this.parent.reportSupportabilityMetric('Session/Expired/SessionTrace/Seen');
+      return;
+    }
     if (this.trace[stn.n]) this.trace[stn.n].push(stn);else this.trace[stn.n] = [stn];
     if (stn.s < this.earliestTimeStamp) this.earliestTimeStamp = stn.s;
     if (stn.s > this.latestTimeStamp) this.latestTimeStamp = stn.s;

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

@@ -30,16 +30,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.initialPageLoadInteraction = new _initialPageLoadInteraction.InitialPageLoadInteraction(agentRef.agentIdentifier);
     this.initialPageLoadInteraction.onDone.push(() => {
       // this ensures the .end() method also works with iPL
+      if (agentRef.runtime.session?.isNew) this.initialPageLoadInteraction.customAttributes.isFirstOfSession = true; // mark the hard page load as first of its session
       this.initialPageLoadInteraction.forceSave = true; // unless forcibly ignored, iPL always finish by default
       const ixn = this.initialPageLoadInteraction;
-      /** this.events (ixns to harvest) has already been set up, use it immediately */
-      if (this.interactionsToHarvest) this.interactionsToHarvest.add(ixn);else {
-        /** this.events (ixns to harvest) hasnt been initialized yet... wait for it */
-        this.ee.on('entity-added', () => {
-          this.interactionsToHarvest = this.events;
-          this.interactionsToHarvest.add(ixn);
-        });
-      }
+      this.interactionsToHarvest.add(ixn);
       this.initialPageLoadInteraction = null;
     });
     _timeToFirstByte.timeToFirstByte.subscribe(({

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

@@ -127,6 +127,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (agentRef.init.spa.enabled !== true) return;
     state.initialPageLoad = new _interaction.Interaction('initialPageLoad', 0, state.lastSeenUrl, state.lastSeenRouteName, onInteractionFinished, agentRef);
     state.initialPageLoad.save = true;
+    if (agentRef.runtime.session?.isNew) state.initialPageLoad.root.attrs.custom.isFirstOfSession = true; // mark the hard page load as first of its session
     state.prevInteraction = state.initialPageLoad;
     state.currentNode = state.initialPageLoad.root; // hint
     // ensure that checkFinish calls are safe during initialPageLoad

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

@@ -39,11 +39,13 @@ class AggregateBase extends _featureBase.FeatureBase {
     this.harvestOpts = {}; // features aggregate classes can define custom opts for when their harvest is called
 
     const agentEntityGuid = this.agentRef?.runtime?.appMetadata?.agents?.[0]?.entityGuid;
-    if (agentEntityGuid) {
-      this.#setupEventStore(agentEntityGuid); // if there's no entity guid, wont dont anything, and will wait for rum flags
-    } else {
+    this.#setupEventStore(agentEntityGuid);
+    if (!agentEntityGuid) {
+      /** wait for the entity guid from the rum response and use to it to further configure things to set the default entity to share an indexed entity with entityGuid */
       this.ee.on('entity-added', entity => {
-        this.#setupEventStore(entity.entityGuid);
+        // not all event managers have this fn, like ST and SR
+        // this allows the lookup to work for the default and an entityGuid without creating two separate buffers
+        this.events?.setEventStore?.(entity.entityGuid);
       });
     }
   }
@@ -54,7 +56,7 @@ class AggregateBase extends _featureBase.FeatureBase {
    * @returns {void}
    */
   #setupEventStore(entityGuid) {
-    if (this.events || !entityGuid) return;
+    if (this.events) return;
     switch (this.featureName) {
       // SessionTrace + Replay have their own storage mechanisms.
       case _features.FEATURE_NAMES.sessionTrace:

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

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.EventStoreManager = void 0;
 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.
  * SPDX-License-Identifier: Apache-2.0
  */
 
+const DEFAULT_KEY = 'NR_CONTAINER_AGENT'; // this is the default entity guid used for the default storage instance
 /**
  * This layer allows multiple browser entity apps, or "target", to each have their own segregated storage instance.
  * The purpose is so the harvester can send data to different apps within the same agent. Each feature should have a manager if it needs this capability.
@@ -19,14 +21,16 @@ class EventStoreManager {
   /**
    * @param {object} agentRef - reference to base agent class
    * @param {EventBuffer|EventAggregator} storageClass - the type of storage to use in this manager; 'EventBuffer' (1), 'EventAggregator' (2)
+   * @param {string} [defaultEntityGuid] - the entity guid to use as the default storage instance; if not provided, a new one is created
+   * @param {string} featureName - the name of the feature this manager is for; used for event dispatching
    */
   constructor(agentRef, storageClass, defaultEntityGuid, featureName) {
     this.agentRef = agentRef;
     this.entityManager = agentRef.runtime.entityManager;
     this.StorageClass = storageClass;
-    this.appStorageMap = new Map();
-    this.defaultEntity = this.#getEventStore(defaultEntityGuid);
+    this.appStorageMap = new Map([[DEFAULT_KEY, new this.StorageClass()]]);
     this.featureName = featureName;
+    this.setEventStore(defaultEntityGuid);
   }
 
   /**
@@ -34,11 +38,17 @@ class EventStoreManager {
    * @param {string=} targetEntityGuid the lookup
    * @returns {*} ALWAYS returns a storage instance
    */
-  #getEventStore(targetEntityGuid) {
-    if (!targetEntityGuid) return this.defaultEntity;
-    if (!this.appStorageMap.has(targetEntityGuid)) this.appStorageMap.set(targetEntityGuid, new this.StorageClass());
+  #getEventStore(targetEntityGuid = DEFAULT_KEY) {
+    if (!this.appStorageMap.has(targetEntityGuid)) this.setEventStore(targetEntityGuid);
     return this.appStorageMap.get(targetEntityGuid);
   }
+  setEventStore(targetEntityGuid) {
+    /** we should already have an event store for the default */
+    if (!targetEntityGuid) return;
+    /** if the target is the container agent, SHARE the default storage -- otherwise create a new event store */
+    const eventStorage = (0, _target.isContainerAgentTarget)(this.entityManager.get(targetEntityGuid), this.agentRef) ? this.appStorageMap.get(DEFAULT_KEY) : new this.StorageClass();
+    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.
 

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.287.0";
+export const VERSION = "1.288.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.287.0";
+export const VERSION = "1.288.1";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/session/session-entity.js

@@ -32,7 +32,8 @@ const model = {
   loggingMode: LOGGING_MODE.OFF,
   serverTimeDiff: null,
   // set by TimeKeeper; "undefined" value will not be stringified and stored but "null" will
-  custom: {}
+  custom: {},
+  numOfResets: 0
 };
 export class SessionEntity {
   /**
@@ -78,7 +79,8 @@ export class SessionEntity {
   setup({
     value = generateRandomHexString(16),
     expiresMs = DEFAULT_EXPIRES_MS,
-    inactiveMs = DEFAULT_INACTIVE_MS
+    inactiveMs = DEFAULT_INACTIVE_MS,
+    numOfResets = 0
   }) {
     /** Ensure that certain properties are preserved across a reset if already set */
     const persistentAttributes = {
@@ -107,6 +109,7 @@ export class SessionEntity {
     // this gets ignored if the value is falsy, allowing for session entities that do not expire
     if (expiresMs) {
       this.state.expiresAt = initialRead?.expiresAt || this.getFutureTimestamp(expiresMs);
+      this.state.numOfResets = initialRead?.numOfResets || numOfResets;
       this.expiresTimer = new Timer({
         // When the inactive timer ends, collect a SM and reset the session
         onEnd: () => {
@@ -241,7 +244,8 @@ export class SessionEntity {
         key: this.key,
         storage: this.storage,
         expiresMs: this.expiresMs,
-        inactiveMs: this.inactiveMs
+        inactiveMs: this.inactiveMs,
+        numOfResets: ++this.state.numOfResets
       });
       return this.read();
     } catch (e) {
@@ -260,6 +264,9 @@ export class SessionEntity {
       inactiveAt: this.getFutureTimestamp(this.inactiveMs)
     });
   }
+  isAfterSessionExpiry(timestamp) {
+    return this.state.numOfResets > 0 || typeof timestamp === 'number' && typeof this.state.expiresAt === 'number' && timestamp >= this.state.expiresAt;
+  }
 
   /**
    * @param {number} timestamp

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

@@ -153,8 +153,10 @@ export class Aggregate extends AggregateBase {
   abort(reason = {}) {
     this.reportSupportabilityMetric("Logging/Abort/".concat(reason.sm));
     this.blocked = true;
-    this.events.clear();
-    this.events.clearSave();
+    if (this.events) {
+      this.events.clear();
+      this.events.clearSave();
+    }
     this.updateLoggingMode(LOGGING_MODE.OFF);
     this.deregisterDrain();
   }

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

@@ -45,7 +45,7 @@ export class Aggregate extends AggregateBase {
     this.recorder = args?.recorder;
     this.errorNoticed = args?.errorNoticed || false;
     this.harvestOpts.raw = true;
-    this.isSessionTrackingEnabled = canEnableSessionTracking(this.agentIdentifier) && this.agentRef.runtime.session;
+    this.isSessionTrackingEnabled = canEnableSessionTracking(this.agentIdentifier) && !!this.agentRef.runtime.session;
     this.reportSupportabilityMetric('Config/SessionReplay/Enabled');
 
     // The SessionEntity class can emit a message indicating the session was cleared and reset (expiry, inactivity). This feature must abort and never resume if that occurs.

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

@@ -110,6 +110,7 @@ export class Recorder {
     });
     this.stopRecording = () => {
       this.recording = false;
+      this.notified = false;
       this.parent.ee.emit(SR_EVENT_EMITTER_TYPES.REPLAY_RUNNING, [false, this.parent.mode]);
       stop?.();
     };
@@ -157,6 +158,10 @@ export class Recorder {
   /** Store a payload in the buffer (this.#events).  This should be the callback to the recording lib noticing a mutation */
   store(event, isCheckout) {
     if (!event) return;
+    if (this.parent.agentRef.runtime?.session?.isAfterSessionExpiry(event.timestamp)) {
+      handle(SUPPORTABILITY_METRIC_CHANNEL, ['Session/Expired/SessionReplay/Seen'], undefined, FEATURE_NAMES.metrics, this.ee);
+      return;
+    }
     if (!(this.parent instanceof AggregateBase) && this.#preloaded.length) this.currentBufferTarget = this.#preloaded[this.#preloaded.length - 1];else this.currentBufferTarget = this.#events;
     if (this.parent.blocked) return;
     if (!this.notified) {

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

@@ -46,6 +46,9 @@ export class TraceStorage {
   constructor(parent) {
     this.parent = parent;
   }
+  isAfterSessionExpiry(entryTimestamp) {
+    return this.parent.agentRef.runtime?.session?.isAfterSessionExpiry((this.parent.timeKeeper?.ready && this.parent.timeKeeper.convertRelativeTimestamp(entryTimestamp)) ?? undefined);
+  }
 
   /** Central function called by all the other store__ & addToTrace API to append a trace node. */
   storeSTN(stn) {
@@ -56,6 +59,10 @@ export class TraceStorage {
       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 (this.isAfterSessionExpiry(stn.s)) {
+      this.parent.reportSupportabilityMetric('Session/Expired/SessionTrace/Seen');
+      return;
+    }
     if (this.trace[stn.n]) this.trace[stn.n].push(stn);else this.trace[stn.n] = [stn];
     if (stn.s < this.earliestTimeStamp) this.earliestTimeStamp = stn.s;
     if (stn.s > this.latestTimeStamp) this.latestTimeStamp = stn.s;

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

@@ -23,16 +23,10 @@ export class Aggregate extends AggregateBase {
     this.initialPageLoadInteraction = new InitialPageLoadInteraction(agentRef.agentIdentifier);
     this.initialPageLoadInteraction.onDone.push(() => {
       // this ensures the .end() method also works with iPL
+      if (agentRef.runtime.session?.isNew) this.initialPageLoadInteraction.customAttributes.isFirstOfSession = true; // mark the hard page load as first of its session
       this.initialPageLoadInteraction.forceSave = true; // unless forcibly ignored, iPL always finish by default
       const ixn = this.initialPageLoadInteraction;
-      /** this.events (ixns to harvest) has already been set up, use it immediately */
-      if (this.interactionsToHarvest) this.interactionsToHarvest.add(ixn);else {
-        /** this.events (ixns to harvest) hasnt been initialized yet... wait for it */
-        this.ee.on('entity-added', () => {
-          this.interactionsToHarvest = this.events;
-          this.interactionsToHarvest.add(ixn);
-        });
-      }
+      this.interactionsToHarvest.add(ixn);
       this.initialPageLoadInteraction = null;
     });
     timeToFirstByte.subscribe(({

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

@@ -118,6 +118,7 @@ export class Aggregate extends AggregateBase {
     if (agentRef.init.spa.enabled !== true) return;
     state.initialPageLoad = new Interaction('initialPageLoad', 0, state.lastSeenUrl, state.lastSeenRouteName, onInteractionFinished, agentRef);
     state.initialPageLoad.save = true;
+    if (agentRef.runtime.session?.isNew) state.initialPageLoad.root.attrs.custom.isFirstOfSession = true; // mark the hard page load as first of its session
     state.prevInteraction = state.initialPageLoad;
     state.currentNode = state.initialPageLoad.root; // hint
     // ensure that checkFinish calls are safe during initialPageLoad

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

@@ -32,11 +32,13 @@ export class AggregateBase extends FeatureBase {
     this.harvestOpts = {}; // features aggregate classes can define custom opts for when their harvest is called
 
     const agentEntityGuid = this.agentRef?.runtime?.appMetadata?.agents?.[0]?.entityGuid;
-    if (agentEntityGuid) {
-      this.#setupEventStore(agentEntityGuid); // if there's no entity guid, wont dont anything, and will wait for rum flags
-    } else {
+    this.#setupEventStore(agentEntityGuid);
+    if (!agentEntityGuid) {
+      /** wait for the entity guid from the rum response and use to it to further configure things to set the default entity to share an indexed entity with entityGuid */
       this.ee.on('entity-added', entity => {
-        this.#setupEventStore(entity.entityGuid);
+        // not all event managers have this fn, like ST and SR
+        // this allows the lookup to work for the default and an entityGuid without creating two separate buffers
+        this.events?.setEventStore?.(entity.entityGuid);
       });
     }
   }
@@ -47,7 +49,7 @@ export class AggregateBase extends FeatureBase {
    * @returns {void}
    */
   #setupEventStore(entityGuid) {
-    if (this.events || !entityGuid) return;
+    if (this.events) return;
     switch (this.featureName) {
       // SessionTrace + Replay have their own storage mechanisms.
       case FEATURE_NAMES.sessionTrace:

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

@@ -4,7 +4,8 @@
  */
 import { dispatchGlobalEvent } from '../../common/dispatch/global-event';
 import { activatedFeatures } from '../../common/util/feature-flags';
-
+import { isContainerAgentTarget } from '../../common/util/target';
+const DEFAULT_KEY = 'NR_CONTAINER_AGENT'; // this is the default entity guid used for the default storage instance
 /**
  * This layer allows multiple browser entity apps, or "target", to each have their own segregated storage instance.
  * The purpose is so the harvester can send data to different apps within the same agent. Each feature should have a manager if it needs this capability.
@@ -13,14 +14,16 @@ export class EventStoreManager {
   /**
    * @param {object} agentRef - reference to base agent class
    * @param {EventBuffer|EventAggregator} storageClass - the type of storage to use in this manager; 'EventBuffer' (1), 'EventAggregator' (2)
+   * @param {string} [defaultEntityGuid] - the entity guid to use as the default storage instance; if not provided, a new one is created
+   * @param {string} featureName - the name of the feature this manager is for; used for event dispatching
    */
   constructor(agentRef, storageClass, defaultEntityGuid, featureName) {
     this.agentRef = agentRef;
     this.entityManager = agentRef.runtime.entityManager;
     this.StorageClass = storageClass;
-    this.appStorageMap = new Map();
-    this.defaultEntity = this.#getEventStore(defaultEntityGuid);
+    this.appStorageMap = new Map([[DEFAULT_KEY, new this.StorageClass()]]);
     this.featureName = featureName;
+    this.setEventStore(defaultEntityGuid);
   }
 
   /**
@@ -28,11 +31,17 @@ export class EventStoreManager {
    * @param {string=} targetEntityGuid the lookup
    * @returns {*} ALWAYS returns a storage instance
    */
-  #getEventStore(targetEntityGuid) {
-    if (!targetEntityGuid) return this.defaultEntity;
-    if (!this.appStorageMap.has(targetEntityGuid)) this.appStorageMap.set(targetEntityGuid, new this.StorageClass());
+  #getEventStore(targetEntityGuid = DEFAULT_KEY) {
+    if (!this.appStorageMap.has(targetEntityGuid)) this.setEventStore(targetEntityGuid);
     return this.appStorageMap.get(targetEntityGuid);
   }
+  setEventStore(targetEntityGuid) {
+    /** we should already have an event store for the default */
+    if (!targetEntityGuid) return;
+    /** if the target is the container agent, SHARE the default storage -- otherwise create a new event store */
+    const eventStorage = isContainerAgentTarget(this.entityManager.get(targetEntityGuid), this.agentRef) ? this.appStorageMap.get(DEFAULT_KEY) : new this.StorageClass();
+    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.
 

package/dist/types/common/session/session-entity.d.ts

@@ -11,10 +11,11 @@ export class SessionEntity {
     state: {};
     key: any;
     ee: any;
-    setup({ value, expiresMs, inactiveMs }: {
+    setup({ value, expiresMs, inactiveMs, numOfResets }: {
         value?: string | undefined;
         expiresMs?: number | undefined;
         inactiveMs?: number | undefined;
+        numOfResets?: number | undefined;
     }): void;
     expiresMs: number | undefined;
     inactiveMs: number | undefined;
@@ -41,6 +42,7 @@ export class SessionEntity {
      * Refresh the inactivity timer data
      */
     refresh(): void;
+    isAfterSessionExpiry(timestamp: any): boolean;
     /**
      * @param {number} timestamp
      * @returns {boolean}

package/dist/types/common/session/session-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-entity.d.ts","sourceRoot":"","sources":["../../../../src/common/session/session-entity.js"],"names":[],"mappings":"AAoCA;IACE;;;;;OAKG;IACH,uBA+BC;IAzBC,qBAAsC;IACtC,aAAsB;IACtB,UAAe;IAGf,SAAc;IAEd,QAAiC;IAoBnC;;;;aA4EC;IAnEC,8BAA0B;IAC1B,+BAA4B;IAc1B,gCAOqC;IAUrC,4CAkBsC;IAexC,iCAAuB;IAKzB,wBAEC;IAED,sBAEC;IAED;;;OAGG;IACH,QAFa,MAAM,CA6BlB;IAED;;;;;;OAMG;IACH,YAHW,MAAM,GACJ,MAAM,CAkBlB;IAED,gBAuBC;IAED;;OAEG;IACH,gBAIC;IAED;;;OAGG;IACH,qBAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;OAGG;IACH,gBAHW,MAAM,GACJ,OAAO,CAKnB;IAED,yDAUC;IAED,6DAIC;IAED;;;OAGG;IACH,6BAHW,MAAM,GACJ,MAAM,CAIlB;IAED,gDAaC;IAHG,YAAuD;CAI5D;sBAhTqB,gBAAgB;iCAGL,4BAA4B"}
+{"version":3,"file":"session-entity.d.ts","sourceRoot":"","sources":["../../../../src/common/session/session-entity.js"],"names":[],"mappings":"AAqCA;IACE;;;;;OAKG;IACH,uBA+BC;IAzBC,qBAAsC;IACtC,aAAsB;IACtB,UAAe;IAGf,SAAc;IAEd,QAAiC;IAoBnC;;;;;aA6EC;IApEC,8BAA0B;IAC1B,+BAA4B;IAe1B,gCAOqC;IAUrC,4CAkBsC;IAexC,iCAAuB;IAKzB,wBAEC;IAED,sBAEC;IAED;;;OAGG;IACH,QAFa,MAAM,CA6BlB;IAED;;;;;;OAMG;IACH,YAHW,MAAM,GACJ,MAAM,CAkBlB;IAED,gBAwBC;IAED;;OAEG;IACH,gBAIC;IAED,8CAEC;IAED;;;OAGG;IACH,qBAHW,MAAM,GACJ,OAAO,CAInB;IAED;;;OAGG;IACH,gBAHW,MAAM,GACJ,OAAO,CAKnB;IAED,yDAUC;IAED,6DAIC;IAED;;;OAGG;IACH,6BAHW,MAAM,GACJ,MAAM,CAIlB;IAED,gDAaC;IAHG,YAAuD;CAI5D;sBAvTqB,gBAAgB;iCAGL,4BAA4B"}

package/dist/types/features/logging/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/logging/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAAiC;IACjC,2BAmCC;IAjCC,8BAA+G;IAUxG,iBAAmC;IAyB5C,0CAKC;IAED,4HAwDC;IAED;;YAKM,0FAA0F;;;QAoB5F,0DAA0D;;QAM7D;IAED;;MAGC;IAED,yDAAyD;IACzD,yBAOC;IAED,yCAIC;CACF;8BAxK6B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/logging/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAAiC;IACjC,2BAmCC;IAjCC,8BAA+G;IAUxG,iBAAmC;IAyB5C,0CAKC;IAED,4HAwDC;IAED;;YAKM,0FAA0F;;;QAoB5F,0DAA0D;;QAM7D;IAED;;MAGC;IAED,yDAAyD;IACzD,yBASC;IAED,yCAIC;CACF;8BA1K6B,4BAA4B"}

package/dist/types/features/session_replay/aggregate/index.d.ts

@@ -14,7 +14,7 @@ export class Aggregate extends AggregateBase {
     timeKeeper: any;
     recorder: any;
     errorNoticed: any;
-    isSessionTrackingEnabled: any;
+    isSessionTrackingEnabled: boolean;
     replayIsActive(): boolean;
     handleError(e: any): void;
     switchToFull(): void;

package/dist/types/features/session_replay/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/aggregate/index.js"],"names":[],"mappings":"AAyBA;IACE,2BAAiC;IAIjC,sCAsFC;IAzFD,aAAe;IAKb,iFAAiF;IACjF,qBAAwB;IAGxB,2CAA2C;IAC3C,sDAAwB;IACxB,6CAA6C;IAC7C,gDAAmB;IAEnB,0BAA0B;IAC1B,kBAAqB;IACrB,6CAA6C;IAC7C,gBAA2B;IAE3B,cAA8B;IAC9B,kBAA+C;IAG/C,8BAA+G;IAoEjH,0BAEC;IAED,0BAMC;IAED,qBAUC;IAED;;;;;OAKG;IACH,4BAJW,OAAO,iBACP,OAAO,GACL,IAAI,CAuDhB;IAED,2BASC;IAED;;;oBAmDC;IAED,sCAIC;IAED;;;;;;;;;;MAuEC;IAED,sCAKC;IAED;;;;OAIG;IACH,mCAKC;IAED,yDAAyD;IACzD,+CASC;IAED,yCAIC;CACF;8BApX6B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/aggregate/index.js"],"names":[],"mappings":"AAyBA;IACE,2BAAiC;IAIjC,sCAsFC;IAzFD,aAAe;IAKb,iFAAiF;IACjF,qBAAwB;IAGxB,2CAA2C;IAC3C,sDAAwB;IACxB,6CAA6C;IAC7C,gDAAmB;IAEnB,0BAA0B;IAC1B,kBAAqB;IACrB,6CAA6C;IAC7C,gBAA2B;IAE3B,cAA8B;IAC9B,kBAA+C;IAG/C,kCAAiH;IAoEnH,0BAEC;IAED,0BAMC;IAED,qBAUC;IAED;;;;;OAKG;IACH,4BAJW,OAAO,iBACP,OAAO,GACL,IAAI,CAuDhB;IAED,2BASC;IAED;;;oBAmDC;IAED,sCAIC;IAED;;;;;;;;;;MAuEC;IAED,sCAKC;IAED;;;;OAIG;IACH,mCAKC;IAED,yDAAyD;IACzD,+CASC;IAED,yCAIC;CACF;8BApX6B,4BAA4B"}

package/dist/types/features/session_replay/shared/recorder.d.ts

@@ -28,6 +28,7 @@ export class Recorder {
     clearBuffer(): void;
     /** Begin recording using configured recording lib */
     startRecording(): void;
+    notified: boolean | undefined;
     /**
      * audit - Checks if the event node payload is missing certain attributes
      * will forward on to the "store" method if nothing needs async fixing
@@ -37,7 +38,6 @@ export class Recorder {
     audit(event: any, isCheckout: any): void;
     /** Store a payload in the buffer (this.#events).  This should be the callback to the recording lib noticing a mutation */
     store(event: any, isCheckout: any): void;
-    notified: boolean | undefined;
     /** force the recording lib to take a full DOM snapshot.  This needs to occur in certain cases, like visibility changes */
     takeFullSnapshot(): void;
     clearTimestamps(): void;

package/dist/types/features/session_replay/shared/recorder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/shared/recorder.js"],"names":[],"mappings":"AAmBA;IAYE,yBAmBC;IAlBC,sDAAsD;IACtD,YAAoB;IACpB,0FAA0F;IAC1F,eAAyE;IAKzE,iEAAiE;IACjE,mBAAsB;IACtB,6DAA6D;IAC7D,oCAAuC;IACvC,+IAA+I;IAC/I,yBAA4B;IAC5B,kIAAkI;IAClI,kBAAqB;IACrB,uIAAuI;IACvI,0BAAyE;IAG3E;;;;;;;;;MAmBC;IAED,mFAAmF;IACnF,oBAKC;IAED,qDAAqD;IACrD,uBA6BC;IAED;;;;;OAKG;IACH,aAHW,GAAC,cACD,GAAC,QAiCX;IAED,0HAA0H;IAC1H,yCAoDC;IA1CG,8BAAoB;IA4CxB,0HAA0H;IAC1H,yBAOC;IAED,wBAEC;IAED,gCAAgC;IAChC,uCAGC;IAED;;;SAGK;IACL,oCAGC;;CACF;+BApO8B,mBAAmB"}
+{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/shared/recorder.js"],"names":[],"mappings":"AAmBA;IAYE,yBAmBC;IAlBC,sDAAsD;IACtD,YAAoB;IACpB,0FAA0F;IAC1F,eAAyE;IAKzE,iEAAiE;IACjE,mBAAsB;IACtB,6DAA6D;IAC7D,oCAAuC;IACvC,+IAA+I;IAC/I,yBAA4B;IAC5B,kIAAkI;IAClI,kBAAqB;IACrB,uIAAuI;IACvI,0BAAyE;IAG3E;;;;;;;;;MAmBC;IAED,mFAAmF;IACnF,oBAKC;IAED,qDAAqD;IACrD,uBA8BC;IAJG,8BAAqB;IAMzB;;;;;OAKG;IACH,aAHW,GAAC,cACD,GAAC,QAiCX;IAED,0HAA0H;IAC1H,yCAwDC;IAED,0HAA0H;IAC1H,yBAOC;IAED,wBAEC;IAED,gCAAgC;IAChC,uCAGC;IAED;;;SAGK;IACL,oCAGC;;CACF;+BAzO8B,mBAAmB"}

package/dist/types/features/session_trace/aggregate/trace/storage.d.ts

@@ -7,6 +7,7 @@ export class TraceStorage {
     latestTimeStamp: number;
     prevStoredEvents: Set<any>;
     parent: any;
+    isAfterSessionExpiry(entryTimestamp: any): any;
     /** Central function called by all the other store__ & addToTrace API to append a trace node. */
     storeSTN(stn: any): void;
     /**

package/dist/types/features/session_trace/aggregate/trace/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../../../src/features/session_trace/aggregate/trace/storage.js"],"names":[],"mappings":"AA8BA,+HAA+H;AAC/H;IAQE,yBAEC;IATD,kBAAa;IACb,UAAU;IACV,0BAA4B;IAC5B,wBAAmB;IACnB,2BAA4B;IAI1B,YAAoB;IAGtB,gGAAgG;IAChG,yBAcC;IAED;;;;OAIG;IACH,2BAHW,MAAM,GACJ,MAAM,CAsBlB;IAED,oEAAoE;IACpE;;;;MAgBC;IAED,mEA6BC;IAED,oDAEC;IAED,mEAuBC;IAGD,uEAcC;IAED,oDAKC;IAED,wBAwBC;IAGD,gDAEC;IAID,qCAaC;IAGD,qEAGC;IAGD,mEAGC;IAID,mBAEC;IAED,aAEC;IAED;;;;;;;QAEC;IAED,cAMC;IAED,mBAEC;IAED,kBAEC;;CACF"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../../../../../src/features/session_trace/aggregate/trace/storage.js"],"names":[],"mappings":"AA8BA,+HAA+H;AAC/H;IAQE,yBAEC;IATD,kBAAa;IACb,UAAU;IACV,0BAA4B;IAC5B,wBAAmB;IACnB,2BAA4B;IAI1B,YAAoB;IAGtB,+CAEC;IAED,gGAAgG;IAChG,yBAkBC;IAED;;;;OAIG;IACH,2BAHW,MAAM,GACJ,MAAM,CAsBlB;IAED,oEAAoE;IACpE;;;;MAgBC;IAED,mEA6BC;IAED,oDAEC;IAED,mEAuBC;IAGD,uEAcC;IAED,oDAKC;IAED,wBAwBC;IAGD,gDAEC;IAID,qCAaC;IAGD,qEAGC;IAGD,mEAGC;IAID,mBAEC;IAED,aAEC;IAED;;;;;;;QAEC;IAED,cAMC;IAED,mBAEC;IAED,kBAEC;;CACF"}

package/dist/types/features/soft_navigations/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/soft_navigations/aggregate/index.js"],"names":[],"mappings":"AAeA;IACE,2BAAiC;IACjC;;OA2DC;IAxDC,2BAAwC;IACxC,iBAA8B;IAE9B,uDAA0F;IAsB1F,yBAA+B;IAC/B,0CAAiC;IACjC,sBAA4B;IA+B9B,qCAUC;IAED,0EAiBC;IAED,2BAiBC;IAED;;;;;;;OAOG;IACH,6BAHW,mBAAmB,OAqB7B;;CA6FF;8BA9O6B,4BAA4B;2CAGf,iCAAiC;4BAChD,eAAe"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/soft_navigations/aggregate/index.js"],"names":[],"mappings":"AAeA;IACE,2BAAiC;IACjC;;OAoDC;IAjDC,2BAAwC;IACxC,iBAA8B;IAE9B,uDAA0F;IAe1F,yBAA+B;IAC/B,0CAAiC;IACjC,sBAA4B;IA+B9B,qCAUC;IAED,0EAiBC;IAED,2BAiBC;IAED;;;;;;;OAOG;IACH,6BAHW,mBAAmB,OAqB7B;;CA6FF;8BAvO6B,4BAA4B;2CAGf,iCAAiC;4BAChD,eAAe"}

package/dist/types/features/spa/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/spa/aggregate/index.js"],"names":[],"mappings":"AA6BA;IACE,2BAAiC;IACjC,2BAwrBC;IArrBe;;;;;;;;;;;;;;MAeb;IACD,+BAA8C;IAuqBhD,qCAEC;CACF;8BA5sB6B,4BAA4B;2BAJ/B,cAAc"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/spa/aggregate/index.js"],"names":[],"mappings":"AA6BA;IACE,2BAAiC;IACjC,2BAyrBC;IAtrBe;;;;;;;;;;;;;;MAeb;IACD,+BAA8C;IAwqBhD,qCAEC;CACF;8BA7sB6B,4BAA4B;2BAJ/B,cAAc"}

package/dist/types/features/utils/aggregate-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregate-base.d.ts","sourceRoot":"","sources":["../../../../src/features/utils/aggregate-base.js"],"names":[],"mappings":"AAqBA;IACE;;;;OAIG;IACH,sBAHW,MAAM,eACN,MAAM,EAkBhB;IAdC,iBAAwB;IAIxB,gBAAqB;IA2BjB,YAAuI;IAW7I;;;;OAIG;IACH,yBAHW,MAAM,EAAE,gBAwBlB;IAED;;OAEG;IACH,cAGC;IADC,6BAAmB;IAGrB,qCAEC;IAED;;;;;;OAMG;IACH,uDAJW,MAAM,GAAC,SAAS,SAyB1B;IAED;;;;;;;OAOG;IACH,4BALG;QAAwB,SAAS,GAAzB,MAAM,YAAC;KACf,QAQF;IAED;;;OAGG;IACH,6CAsBC;IAED;;;OAGG;IACH,2CAOC;IALC,gBAA6C;IAO/C;;;;OAIG;IACH,uCAHW,GAAC,UACD,GAAC,QAIX;;CACF;4BAxM2B,gBAAgB"}
+{"version":3,"file":"aggregate-base.d.ts","sourceRoot":"","sources":["../../../../src/features/utils/aggregate-base.js"],"names":[],"mappings":"AAqBA;IACE;;;;OAIG;IACH,sBAHW,MAAM,eACN,MAAM,EAoBhB;IAhBC,iBAAwB;IAIxB,gBAAqB;IA6BjB,YAAuI;IAW7I;;;;OAIG;IACH,yBAHW,MAAM,EAAE,gBAwBlB;IAED;;OAEG;IACH,cAGC;IADC,6BAAmB;IAGrB,qCAEC;IAED;;;;;;OAMG;IACH,uDAJW,MAAM,GAAC,SAAS,SAyB1B;IAED;;;;;;;OAOG;IACH,4BALG;QAAwB,SAAS,GAAzB,MAAM,YAAC;KACf,QAQF;IAED;;;OAGG;IACH,6CAsBC;IAED;;;OAGG;IACH,2CAOC;IALC,gBAA6C;IAO/C;;;;OAIG;IACH,uCAHW,GAAC,UACD,GAAC,QAIX;;CACF;4BA1M2B,gBAAgB"}

package/dist/types/features/utils/event-store-manager.d.ts

@@ -6,14 +6,16 @@ export class EventStoreManager {
     /**
      * @param {object} agentRef - reference to base agent class
      * @param {EventBuffer|EventAggregator} storageClass - the type of storage to use in this manager; 'EventBuffer' (1), 'EventAggregator' (2)
+     * @param {string} [defaultEntityGuid] - the entity guid to use as the default storage instance; if not provided, a new one is created
+     * @param {string} featureName - the name of the feature this manager is for; used for event dispatching
      */
-    constructor(agentRef: object, storageClass: EventBuffer | EventAggregator, defaultEntityGuid: any, featureName: any);
+    constructor(agentRef: object, storageClass: EventBuffer | EventAggregator, defaultEntityGuid?: string, featureName: string);
     agentRef: object;
     entityManager: any;
     StorageClass: any;
-    appStorageMap: Map<any, any>;
-    defaultEntity: any;
-    featureName: any;
+    appStorageMap: Map<string, any>;
+    featureName: string;
+    setEventStore(targetEntityGuid: any): void;
     /**
      * Calls the isEmpty method on the underlying storage class. If target is provided, runs just for the target, otherwise runs for all apps.
      * @param {object} optsIfPresent - exists if called during harvest interval, @see AggregateBase.makeHarvestPayload

package/dist/types/features/utils/event-store-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-store-manager.d.ts","sourceRoot":"","sources":["../../../../src/features/utils/event-store-manager.js"],"names":[],"mappings":"AAOA;;;GAGG;AACH;IACE;;;OAGG;IACH,sBAHW,MAAM,gBACN,WAAW,GAAC,eAAe,4CASrC;IANC,iBAAwB;IACxB,mBAAmD;IACnD,kBAAgC;IAChC,6BAA8B;IAC9B,mBAA2D;IAC3D,iBAA8B;IAgBhC;;;;;OAKG;IACH,uBAJW,MAAM,0BAEJ,OAAO,CASnB;IAED;;;;;OAKG;IACH,WAJW,MAAM,oBACN,MAAM,GACJ,OAAO,CAYnB;IAED,0GAA0G;IAC1G,8DAEC;IAED;;;;;OAKG;IACH,WAJW,MAAM,YAAC,gCAYjB;IAED;;;;OAIG;IACH,2BAHW,GAAC,OAKX;IAED;;;;;OAKG;IACH,iCAJW,GAAC,oBACD,GAAC,OAKX;IAED;;;;;OAKG;IACH,oBAJW,GAAC,oBACD,GAAC,OAMX;IAED;;;;;OAKG;IACH,qBAJW,GAAC,oBACD,GAAC,OAMX;IAGD,2DAEC;IAED,0DAEC;;CACF"}
+{"version":3,"file":"event-store-manager.d.ts","sourceRoot":"","sources":["../../../../src/features/utils/event-store-manager.js"],"names":[],"mappings":"AASA;;;GAGG;AACH;IACE;;;;;OAKG;IACH,sBALW,MAAM,gBACN,WAAW,GAAC,eAAe,sBAC3B,MAAM,eACN,MAAM,EAShB;IANC,iBAAwB;IACxB,mBAAmD;IACnD,kBAAgC;IAChC,gCAAsE;IACtE,oBAA8B;IAchC,2CAQC;IAID;;;;;OAKG;IACH,uBAJW,MAAM,0BAEJ,OAAO,CASnB;IAED;;;;;OAKG;IACH,WAJW,MAAM,oBACN,MAAM,GACJ,OAAO,CAYnB;IAED,0GAA0G;IAC1G,8DAEC;IAED;;;;;OAKG;IACH,WAJW,MAAM,YAAC,gCAYjB;IAED;;;;OAIG;IACH,2BAHW,GAAC,OAKX;IAED;;;;;OAKG;IACH,iCAJW,GAAC,oBACD,GAAC,OAKX;IAED;;;;;OAKG;IACH,oBAJW,GAAC,oBACD,GAAC,OAMX;IAED;;;;;OAKG;IACH,qBAJW,GAAC,oBACD,GAAC,OAMX;IAGD,2DAEC;IAED,0DAEC;;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.287.0",
+  "version": "1.288.1",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",

package/src/common/session/session-entity.js

@@ -31,7 +31,8 @@ const model = {
   traceHarvestStarted: false,
   loggingMode: LOGGING_MODE.OFF,
   serverTimeDiff: null, // set by TimeKeeper; "undefined" value will not be stringified and stored but "null" will
-  custom: {}
+  custom: {},
+  numOfResets: 0
 }
 
 export class SessionEntity {
@@ -74,7 +75,7 @@ export class SessionEntity {
     }
   }
 
-  setup ({ value = generateRandomHexString(16), expiresMs = DEFAULT_EXPIRES_MS, inactiveMs = DEFAULT_INACTIVE_MS }) {
+  setup ({ value = generateRandomHexString(16), expiresMs = DEFAULT_EXPIRES_MS, inactiveMs = DEFAULT_INACTIVE_MS, numOfResets = 0 }) {
     /** Ensure that certain properties are preserved across a reset if already set */
     const persistentAttributes = { serverTimeDiff: this.state.serverTimeDiff || model.serverTimeDiff }
     this.state = {}
@@ -98,6 +99,7 @@ export class SessionEntity {
     // this gets ignored if the value is falsy, allowing for session entities that do not expire
     if (expiresMs) {
       this.state.expiresAt = initialRead?.expiresAt || this.getFutureTimestamp(expiresMs)
+      this.state.numOfResets = initialRead?.numOfResets || numOfResets
       this.expiresTimer = new Timer({
         // When the inactive timer ends, collect a SM and reset the session
         onEnd: () => {
@@ -236,7 +238,8 @@ export class SessionEntity {
         key: this.key,
         storage: this.storage,
         expiresMs: this.expiresMs,
-        inactiveMs: this.inactiveMs
+        inactiveMs: this.inactiveMs,
+        numOfResets: ++this.state.numOfResets
       })
       return this.read()
     } catch (e) {
@@ -253,6 +256,10 @@ export class SessionEntity {
     this.write({ ...existingData, inactiveAt: this.getFutureTimestamp(this.inactiveMs) })
   }
 
+  isAfterSessionExpiry (timestamp) {
+    return this.state.numOfResets > 0 || (typeof timestamp === 'number' && typeof this.state.expiresAt === 'number' && timestamp >= this.state.expiresAt)
+  }
+
   /**
    * @param {number} timestamp
    * @returns {boolean}

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

@@ -162,8 +162,10 @@ export class Aggregate extends AggregateBase {
   abort (reason = {}) {
     this.reportSupportabilityMetric(`Logging/Abort/${reason.sm}`)
     this.blocked = true
-    this.events.clear()
-    this.events.clearSave()
+    if (this.events) {
+      this.events.clear()
+      this.events.clearSave()
+    }
     this.updateLoggingMode(LOGGING_MODE.OFF)
     this.deregisterDrain()
   }

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

@@ -48,7 +48,7 @@ export class Aggregate extends AggregateBase {
     this.errorNoticed = args?.errorNoticed || false
     this.harvestOpts.raw = true
 
-    this.isSessionTrackingEnabled = canEnableSessionTracking(this.agentIdentifier) && this.agentRef.runtime.session
+    this.isSessionTrackingEnabled = canEnableSessionTracking(this.agentIdentifier) && !!this.agentRef.runtime.session
 
     this.reportSupportabilityMetric('Config/SessionReplay/Enabled')
 

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

@@ -106,6 +106,7 @@ export class Recorder {
 
     this.stopRecording = () => {
       this.recording = false
+      this.notified = false
       this.parent.ee.emit(SR_EVENT_EMITTER_TYPES.REPLAY_RUNNING, [false, this.parent.mode])
       stop?.()
     }
@@ -153,6 +154,10 @@ export class Recorder {
   /** Store a payload in the buffer (this.#events).  This should be the callback to the recording lib noticing a mutation */
   store (event, isCheckout) {
     if (!event) return
+    if (this.parent.agentRef.runtime?.session?.isAfterSessionExpiry(event.timestamp)) {
+      handle(SUPPORTABILITY_METRIC_CHANNEL, ['Session/Expired/SessionReplay/Seen'], undefined, FEATURE_NAMES.metrics, this.ee)
+      return
+    }
 
     if (!(this.parent instanceof AggregateBase) && this.#preloaded.length) this.currentBufferTarget = this.#preloaded[this.#preloaded.length - 1]
     else this.currentBufferTarget = this.#events

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

@@ -41,6 +41,10 @@ export class TraceStorage {
     this.parent = parent
   }
 
+  isAfterSessionExpiry (entryTimestamp) {
+    return this.parent.agentRef.runtime?.session?.isAfterSessionExpiry((this.parent.timeKeeper?.ready && this.parent.timeKeeper.convertRelativeTimestamp(entryTimestamp)) ?? undefined)
+  }
+
   /** Central function called by all the other store__ & addToTrace API to append a trace node. */
   storeSTN (stn) {
     if (this.parent.blocked) return
@@ -49,6 +53,10 @@ export class TraceStorage {
       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 (this.isAfterSessionExpiry(stn.s)) {
+      this.parent.reportSupportabilityMetric('Session/Expired/SessionTrace/Seen')
+      return
+    }
 
     if (this.trace[stn.n]) this.trace[stn.n].push(stn)
     else this.trace[stn.n] = [stn]

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

@@ -23,17 +23,10 @@ export class Aggregate extends AggregateBase {
 
     this.initialPageLoadInteraction = new InitialPageLoadInteraction(agentRef.agentIdentifier)
     this.initialPageLoadInteraction.onDone.push(() => { // this ensures the .end() method also works with iPL
+      if (agentRef.runtime.session?.isNew) this.initialPageLoadInteraction.customAttributes.isFirstOfSession = true // mark the hard page load as first of its session
       this.initialPageLoadInteraction.forceSave = true // unless forcibly ignored, iPL always finish by default
       const ixn = this.initialPageLoadInteraction
-      /** this.events (ixns to harvest) has already been set up, use it immediately */
-      if (this.interactionsToHarvest) this.interactionsToHarvest.add(ixn)
-      else {
-        /** this.events (ixns to harvest) hasnt been initialized yet... wait for it */
-        this.ee.on('entity-added', () => {
-          this.interactionsToHarvest = this.events
-          this.interactionsToHarvest.add(ixn)
-        })
-      }
+      this.interactionsToHarvest.add(ixn)
       this.initialPageLoadInteraction = null
     })
     timeToFirstByte.subscribe(({ attrs }) => {

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

@@ -110,6 +110,7 @@ export class Aggregate extends AggregateBase {
 
     state.initialPageLoad = new Interaction('initialPageLoad', 0, state.lastSeenUrl, state.lastSeenRouteName, onInteractionFinished, agentRef)
     state.initialPageLoad.save = true
+    if (agentRef.runtime.session?.isNew) state.initialPageLoad.root.attrs.custom.isFirstOfSession = true // mark the hard page load as first of its session
     state.prevInteraction = state.initialPageLoad
     state.currentNode = state.initialPageLoad.root // hint
     // ensure that checkFinish calls are safe during initialPageLoad

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

@@ -34,11 +34,13 @@ export class AggregateBase extends FeatureBase {
     this.harvestOpts = {} // features aggregate classes can define custom opts for when their harvest is called
 
     const agentEntityGuid = this.agentRef?.runtime?.appMetadata?.agents?.[0]?.entityGuid
-    if (agentEntityGuid) {
-      this.#setupEventStore(agentEntityGuid) // if there's no entity guid, wont dont anything, and will wait for rum flags
-    } else {
+    this.#setupEventStore(agentEntityGuid)
+    if (!agentEntityGuid) {
+      /** wait for the entity guid from the rum response and use to it to further configure things to set the default entity to share an indexed entity with entityGuid */
       this.ee.on('entity-added', entity => {
-        this.#setupEventStore(entity.entityGuid)
+        // not all event managers have this fn, like ST and SR
+        // this allows the lookup to work for the default and an entityGuid without creating two separate buffers
+        this.events?.setEventStore?.(entity.entityGuid)
       })
     }
   }
@@ -49,7 +51,7 @@ export class AggregateBase extends FeatureBase {
    * @returns {void}
    */
   #setupEventStore (entityGuid) {
-    if (this.events || !entityGuid) return
+    if (this.events) return
     switch (this.featureName) {
     // SessionTrace + Replay have their own storage mechanisms.
       case FEATURE_NAMES.sessionTrace:

package/src/features/utils/event-store-manager.js

@@ -4,7 +4,9 @@
  */
 import { dispatchGlobalEvent } from '../../common/dispatch/global-event'
 import { activatedFeatures } from '../../common/util/feature-flags'
+import { isContainerAgentTarget } from '../../common/util/target'
 
+const DEFAULT_KEY = 'NR_CONTAINER_AGENT' // this is the default entity guid used for the default storage instance
 /**
  * This layer allows multiple browser entity apps, or "target", to each have their own segregated storage instance.
  * The purpose is so the harvester can send data to different apps within the same agent. Each feature should have a manager if it needs this capability.
@@ -13,14 +15,16 @@ export class EventStoreManager {
   /**
    * @param {object} agentRef - reference to base agent class
    * @param {EventBuffer|EventAggregator} storageClass - the type of storage to use in this manager; 'EventBuffer' (1), 'EventAggregator' (2)
+   * @param {string} [defaultEntityGuid] - the entity guid to use as the default storage instance; if not provided, a new one is created
+   * @param {string} featureName - the name of the feature this manager is for; used for event dispatching
    */
   constructor (agentRef, storageClass, defaultEntityGuid, featureName) {
     this.agentRef = agentRef
     this.entityManager = agentRef.runtime.entityManager
     this.StorageClass = storageClass
-    this.appStorageMap = new Map()
-    this.defaultEntity = this.#getEventStore(defaultEntityGuid)
+    this.appStorageMap = new Map([[DEFAULT_KEY, new this.StorageClass()]])
     this.featureName = featureName
+    this.setEventStore(defaultEntityGuid)
   }
 
   /**
@@ -28,12 +32,21 @@ export class EventStoreManager {
    * @param {string=} targetEntityGuid the lookup
    * @returns {*} ALWAYS returns a storage instance
    */
-  #getEventStore (targetEntityGuid) {
-    if (!targetEntityGuid) return this.defaultEntity
-    if (!this.appStorageMap.has(targetEntityGuid)) this.appStorageMap.set(targetEntityGuid, new this.StorageClass())
+  #getEventStore (targetEntityGuid = DEFAULT_KEY) {
+    if (!this.appStorageMap.has(targetEntityGuid)) this.setEventStore(targetEntityGuid)
     return this.appStorageMap.get(targetEntityGuid)
   }
 
+  setEventStore (targetEntityGuid) {
+    /** we should already have an event store for the default */
+    if (!targetEntityGuid) return
+    /** if the target is the container agent, SHARE the default storage -- otherwise create a new event store */
+    const eventStorage = (isContainerAgentTarget(this.entityManager.get(targetEntityGuid), this.agentRef))
+      ? this.appStorageMap.get(DEFAULT_KEY)
+      : new this.StorageClass()
+    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.
 
   /**