@newrelic/browser-agent 1.288.0 → 1.288.1

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 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)
 
 

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.288.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.288.0";
+const VERSION = exports.VERSION = "1.288.1";
 
 /**
  * Exposes the build type of the agent

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

@@ -166,7 +166,7 @@ class Recorder {
   store(event, isCheckout) {
     if (!event) return;
     if (this.parent.agentRef.runtime?.session?.isAfterSessionExpiry(event.timestamp)) {
-      this.parent.reportSupportabilityMetric('Session/Expired/SessionReplay/Seen');
+      (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;

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

@@ -33,14 +33,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       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/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.288.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.288.0";
+export const VERSION = "1.288.1";
 
 /**
  * Exposes the build type of the agent

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

@@ -159,7 +159,7 @@ export class Recorder {
   store(event, isCheckout) {
     if (!event) return;
     if (this.parent.agentRef.runtime?.session?.isAfterSessionExpiry(event.timestamp)) {
-      this.parent.reportSupportabilityMetric('Session/Expired/SessionReplay/Seen');
+      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/dist/esm/features/soft_navigations/aggregate/index.js

@@ -26,14 +26,7 @@ export class Aggregate extends AggregateBase {
       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/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/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;;OA4DC;IAzDC,2BAAwC;IACxC,iBAA8B;IAE9B,uDAA0F;IAuB1F,yBAA+B;IAC/B,0CAAiC;IACjC,sBAA4B;IA+B9B,qCAUC;IAED,0EAiBC;IAED,2BAiBC;IAED;;;;;;;OAOG;IACH,6BAHW,mBAAmB,OAqB7B;;CA6FF;8BA/O6B,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/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.288.0",
+  "version": "1.288.1",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",

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

@@ -155,7 +155,7 @@ export class Recorder {
   store (event, isCheckout) {
     if (!event) return
     if (this.parent.agentRef.runtime?.session?.isAfterSessionExpiry(event.timestamp)) {
-      this.parent.reportSupportabilityMetric('Session/Expired/SessionReplay/Seen')
+      handle(SUPPORTABILITY_METRIC_CHANNEL, ['Session/Expired/SessionReplay/Seen'], undefined, FEATURE_NAMES.metrics, this.ee)
       return
     }
 

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

@@ -26,15 +26,7 @@ export class Aggregate extends AggregateBase {
       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/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.
 
   /**