@newrelic/browser-agent 1.310.1 → 1.311.0

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

@@ -11,7 +11,7 @@ var _constants2 = require("../../../common/session/constants");
 var _globalEvent = require("../../../common/dispatch/global-event");
 var _load = require("../../../common/window/load");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); } /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 class Instrument extends _instrumentBase.InstrumentBase {
@@ -20,17 +20,16 @@ class Instrument extends _instrumentBase.InstrumentBase {
     super(agentRef, CONSTANTS.FEATURE_NAME);
 
     /** setup inspection events for window lifecycle */
-    this.setupInspectionEvents(agentRef.agentIdentifier);
+    this.setupInspectionEvents();
 
     /** feature specific APIs */
     (0, _setPageViewName.setupSetPageViewNameAPI)(agentRef);
     this.importAggregator(agentRef, () => Promise.resolve().then(() => _interopRequireWildcard(require(/* webpackChunkName: "page_view_event-aggregate" */'../aggregate'))));
   }
-  setupInspectionEvents(agentIdentifier) {
+  setupInspectionEvents() {
     const dispatch = (evt, name) => {
       if (!evt) return;
       (0, _globalEvent.dispatchGlobalEvent)({
-        agentIdentifier,
         timeStamp: evt.timeStamp,
         loaded: evt.target.readyState === 'complete',
         type: 'window',
@@ -49,7 +48,6 @@ class Instrument extends _instrumentBase.InstrumentBase {
     });
     this.ee.on(_constants2.SESSION_EVENTS.UPDATE, (_, data) => {
       (0, _globalEvent.dispatchGlobalEvent)({
-        agentIdentifier,
         type: 'lifecycle',
         name: 'session',
         data

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

@@ -21,6 +21,7 @@ var _runtime = require("../../../common/constants/runtime");
 var _eventOrigin = require("../../../common/util/event-origin");
 var _loadTime = require("../../../common/vitals/load-time");
 var _webdriverDetection = require("../../../common/util/webdriver-detection");
+var _cleanUrl = require("../../../common/url/clean-url");
 /**
  * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -84,6 +85,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
   addTiming(name, value, attrs) {
     attrs = attrs || {};
+    attrs.pageUrl = (0, _cleanUrl.cleanURL)((0, _runtime.getNavigationEntry)()?.name || _runtime.initialLocation);
     addConnectionAttributes(attrs); // network conditions may differ from the actual for VitalMetrics when they were captured
 
     // If cls was set to another value by `onCLS`, then it's supported and is attached onto any timing but is omitted until such time.

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

@@ -15,7 +15,7 @@ var _traverse = require("../../../common/util/traverse");
 var _cleanUrl = require("../../../common/url/clean-url");
 var _console = require("../../../common/util/console");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -64,8 +64,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
         // if another page's session entity has expired, or another page has transitioned to off and this one hasn't... we can just abort straight away here
         if (this.sessionId !== sessionState.value || eventType === 'cross-tab' && sessionState.sessionTraceMode === _constants2.MODE.OFF) this.abort(2);
       });
-      if ((0, _runtime.supportsNavTimingL2)()) {
-        this.traceStorage.storeTiming(_runtime.globalScope.performance?.getEntriesByType?.('navigation')[0]);
+      const navEntry = (0, _runtime.getNavigationEntry)();
+      if (navEntry) {
+        this.traceStorage.storeTiming(navEntry);
       } else {
         this.traceStorage.storeTiming(_runtime.globalScope.performance?.timing, true);
       }

package/dist/cjs/features/utils/agent-session.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setupAgentSession = setupAgentSession;
 var _drain = require("../../common/drain/drain");
-var _contextualEe = require("../../common/event-emitter/contextual-ee");
 var _registerHandler = require("../../common/event-emitter/register-handler");
 var _sessionEntity = require("../../common/session/session-entity");
 var _localStorage = require("../../common/storage/local-storage.js");
@@ -27,7 +26,7 @@ function setupAgentSession(agentRef) {
 
   const sessionInit = agentRef.init.session;
   agentRef.runtime.session = new _sessionEntity.SessionEntity({
-    agentIdentifier: agentRef.agentIdentifier,
+    agentRef,
     key: _constants.DEFAULT_KEY,
     storage: new _localStorage.LocalStorage(),
     expiresMs: sessionInit?.expiresMs,
@@ -49,7 +48,7 @@ function setupAgentSession(agentRef) {
 
   /** track changes to the jsAttributes field over time for aiding with harvest mechanics */
   agentRef.runtime.jsAttributesMetadata = (0, _attributeSize.trackObjectAttributeSize)(agentRef.info, 'jsAttributes');
-  const sharedEE = _contextualEe.ee.get(agentRef.agentIdentifier);
+  const sharedEE = agentRef.ee;
 
   // any calls to newrelic.setCustomAttribute(<persisted>) will need to be added to:
   // local info.jsAttributes {}
@@ -74,6 +73,6 @@ function setupAgentSession(agentRef) {
       consent: accept === undefined ? true : accept
     });
   }, 'session', sharedEE);
-  (0, _drain.drain)(agentRef.agentIdentifier, 'session');
+  (0, _drain.drain)(agentRef, 'session');
   return agentRef.runtime.session;
 }

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

@@ -9,7 +9,6 @@ var _info = require("../../common/config/info");
 var _configure = require("../../loaders/configure/configure");
 var _nreum = require("../../common/window/nreum");
 var _drain = require("../../common/drain/drain");
-var _featureFlags = require("../../common/util/feature-flags");
 var _obfuscate = require("../../common/util/obfuscate");
 var _features = require("../../loaders/features/features");
 var _harvester = require("../../common/harvest/harvester");
@@ -30,8 +29,7 @@ class AggregateBase extends _featureBase.FeatureBase {
    * @param {string} featureName The name of the feature creating the instance.
    */
   constructor(agentRef, featureName) {
-    super(agentRef.agentIdentifier, featureName);
-    this.agentRef = agentRef;
+    super(agentRef, featureName);
     this.checkConfiguration(agentRef);
     this.doOnceForAllAggregate(agentRef);
 
@@ -115,8 +113,8 @@ class AggregateBase extends _featureBase.FeatureBase {
    */
   waitForFlags(flagNames = []) {
     const flagsPromise = new Promise((resolve, reject) => {
-      if (_featureFlags.activatedFeatures[this.agentIdentifier]) {
-        resolve(buildOutput(_featureFlags.activatedFeatures[this.agentIdentifier]));
+      if (this.agentRef.runtime?.activatedFeatures) {
+        resolve(buildOutput(this.agentRef.runtime.activatedFeatures));
       } else {
         this.ee.on('rumresp', (resp = {}) => {
           resolve(buildOutput(resp));
@@ -140,7 +138,7 @@ class AggregateBase extends _featureBase.FeatureBase {
    * Stages the feature to be drained
    */
   drain() {
-    (0, _drain.drain)(this.agentIdentifier, this.featureName);
+    (0, _drain.drain)(this.agentRef, this.featureName);
   }
   preHarvestChecks(opts) {
     return !this.blocked && !this.ee.aborted;

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

@@ -4,19 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FeatureBase = void 0;
-var _contextualEe = require("../../common/event-emitter/contextual-ee");
 var _drain = require("../../common/drain/drain");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 class FeatureBase {
-  constructor(agentIdentifier, featureName) {
-    /** @type {string} */
-    this.agentIdentifier = agentIdentifier;
+  constructor(agentRef, featureName) {
+    /** @type {Object} */
+    this.agentRef = agentRef;
     /** @type {import('../../common/event-emitter/contextual-ee').ee} */
-    this.ee = _contextualEe.ee.get(agentIdentifier);
+    this.ee = agentRef?.ee;
     /** @type {string} */
     this.featureName = featureName;
     /**
@@ -27,7 +26,7 @@ class FeatureBase {
     this.blocked = false;
   }
   deregisterDrain() {
-    (0, _drain.deregisterDrain)(this.agentIdentifier, this.featureName);
+    (0, _drain.deregisterDrain)(this.agentRef, this.featureName);
   }
 }
 exports.FeatureBase = FeatureBase;

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

@@ -16,7 +16,7 @@ var _invoke = require("../../common/util/invoke");
 var _agentConstants = require("../../common/constants/agent-constants");
 var _handle = require("../../common/event-emitter/handle");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); } /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */ /**
  * @file Defines `InstrumentBase` to be used as the super of the Instrument classes implemented by each feature.
@@ -30,12 +30,11 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 class InstrumentBase extends _featureBase.FeatureBase {
   /**
    * Instantiate InstrumentBase.
-   * @param {string} agentIdentifier - The unique ID of the instantiated agent (relative to global scope).
+   * @param {Object} agentRef - The agent reference object.
    * @param {string} featureName - The name of the feature module (used to construct file path).
    */
   constructor(agentRef, featureName) {
-    super(agentRef.agentIdentifier, featureName);
-    this.agentRef = agentRef;
+    super(agentRef, featureName);
 
     /** @type {Function | undefined} This should be set by any derived Instrument class if it has things to do when feature fails or is killed. */
     this.abortHandler = undefined;
@@ -65,13 +64,13 @@ class InstrumentBase extends _featureBase.FeatureBase {
         this.ee.on('manual-start-all', (0, _invoke.single)(() => {
           // register the feature to drain only once the API has been called, it will drain when importAggregator finishes for all the features
           // called by the api in that cycle
-          (0, _drain.registerDrain)(agentRef.agentIdentifier, this.featureName);
+          (0, _drain.registerDrain)(agentRef, this.featureName);
           resolve();
         }));
       });
     } else {
       /** if the feature requires opt-in (!auto-start), it will get registered once the api has been called */
-      (0, _drain.registerDrain)(agentRef.agentIdentifier, featureName);
+      (0, _drain.registerDrain)(agentRef, featureName);
     }
   }
 
@@ -111,7 +110,7 @@ class InstrumentBase extends _featureBase.FeatureBase {
        */
       try {
         if (!this.#shouldImportAgg(this.featureName, session, agentRef.init)) {
-          (0, _drain.drain)(this.agentIdentifier, this.featureName);
+          (0, _drain.drain)(this.agentRef, this.featureName);
           this.loadedSuccessfully(false); // aggregate module isn't loaded at all
           return;
         }
@@ -125,7 +124,7 @@ class InstrumentBase extends _featureBase.FeatureBase {
         (0, _console.warn)(34, e);
         this.abortHandler?.(); // undo any important alterations made to the page
         // not supported yet but nice to do: "abort" this agent's EE for this feature specifically
-        (0, _drain.drain)(this.agentIdentifier, this.featureName, true);
+        (0, _drain.drain)(this.agentRef, this.featureName, true);
         this.loadedSuccessfully(false);
         if (this.ee) this.ee.abort();
       }

package/dist/cjs/loaders/api/register-api-types.js

@@ -24,7 +24,7 @@ exports.default = void 0;
  */
 /**
  * @typedef {Object} RegisterAPIConstructor
- * @property {string|number} id - The unique id for the registered entity. This will be assigned to any synthesized entities.
+ * @property {string} id - The unique id for the registered entity. This will be assigned to any synthesized entities.
  * @property {string} name - The readable name for the registered entity. This will be assigned to any synthesized entities.
  * @property {{[key: string]: any}} [tags] - The tags for the registered entity as key-value pairs. This will be assigned to any synthesized entities. Tags are converted to source.* attributes (e.g., {environment: 'production'} becomes source.environment: 'production').
  * @property {boolean} [isolated] - When true, each registration creates an isolated instance. When false, multiple registrations with the same id and isolated: false will share a single instance, including all custom attributes, ids, names, and metadata. Calling deregister on a shared instance will deregister it for all entities using the instance. Defaults to true.

package/dist/cjs/loaders/api/register.js

@@ -94,7 +94,7 @@ function register(agentRef, target, parent) {
     invalidApiResponse = warning;
   };
   function hasValidValue(val) {
-    return typeof val === 'string' && !!val.trim() && val.trim().length < 501 || typeof val === 'number';
+    return typeof val === 'string' && !!val.trim() && val.trim().length < 501;
   }
 
   /** primary cases that can block the register API from working at init time */

package/dist/cjs/loaders/api/sharedHandlers.js

@@ -9,13 +9,12 @@ var _globalEvent = require("../../common/dispatch/global-event");
 var _handle = require("../../common/event-emitter/handle");
 var _now = require("../../common/timing/now");
 var _console = require("../../common/util/console");
-var _featureFlags = require("../../common/util/feature-flags");
 var _constants = require("../../features/metrics/constants");
 var _agentBase = require("../agent-base");
 var _features = require("../features/features");
 var _constants2 = require("./constants");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -35,8 +34,7 @@ function setupAPI(name, fn, agent, obj) {
   api[name] = function () {
     (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['API/' + name + '/called'], undefined, _features.FEATURE_NAMES.metrics, agent.ee);
     (0, _globalEvent.dispatchGlobalEvent)({
-      agentIdentifier: agent.agentIdentifier,
-      drained: !!_featureFlags.activatedFeatures?.[agent.agentIdentifier],
+      drained: !!agent.runtime?.activatedFeatures,
       type: 'data',
       name: 'api',
       feature: _constants2.prefix + name,

package/dist/cjs/loaders/configure/configure.js

@@ -9,7 +9,6 @@ var _nreum = require("../../common/window/nreum");
 var _info = require("../../common/config/info");
 var _init = require("../../common/config/init");
 var _runtime = require("../../common/config/runtime");
-var _featureFlags = require("../../common/util/feature-flags");
 var _runtime2 = require("../../common/constants/runtime");
 var _publicPath = require("./public-path");
 var _contextualEe = require("../../common/event-emitter/contextual-ee");
@@ -20,8 +19,6 @@ var _loaderConfig = require("../../common/config/loader-config");
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const alreadySetOnce = new Set(); // the configure() function can run multiple times in agent lifecycle for different agents
-
 /**
  * Sets or re-sets the agent's configuration values from global settings. This also attach those as properties to the agent instance.
  * IMPORTANT: setNREUMInitializedAgent must be called on the agent prior to calling this function.
@@ -52,32 +49,37 @@ function configure(agent, opts = {}, loaderType, forceDrain) {
   }
   agent.info = (0, _info.mergeInfo)(info);
   const updatedInit = agent.init;
-  const internalTrafficList = [info.beacon, info.errorBeacon];
-  if (!alreadySetOnce.has(agent.agentIdentifier)) {
-    if (updatedInit.proxy.assets) {
-      (0, _publicPath.redefinePublicPath)(updatedInit.proxy.assets);
-      internalTrafficList.push(updatedInit.proxy.assets);
-    }
-    if (updatedInit.proxy.beacon) internalTrafficList.push(updatedInit.proxy.beacon);
-    agent.beacons = [...internalTrafficList];
-    (0, _topLevelCallers.setTopLevelCallers)(agent); // no need to set global APIs on newrelic obj more than once
-    (0, _nreum.addToNREUM)('activatedFeatures', _featureFlags.activatedFeatures);
+  agent.runtime ??= (0, _runtime.mergeRuntime)(runtime);
+
+  // Apply proxy settings whenever configure is called (supports late {init} setting)
+  if (updatedInit.proxy.assets) {
+    (0, _publicPath.redefinePublicPath)(updatedInit.proxy.assets);
   }
-  runtime.denyList = [...(updatedInit.ajax.deny_list || []), ...(updatedInit.ajax.block_internal ? internalTrafficList : [])];
-  runtime.ptid = agent.agentIdentifier;
-  runtime.loaderType = loaderType;
-  agent.runtime = (0, _runtime.mergeRuntime)(runtime);
-  if (!alreadySetOnce.has(agent.agentIdentifier)) {
+  if (!agent.runtime.configured) {
+    Object.defineProperty(agent, 'beacons', {
+      get() {
+        return [agent.info.beacon, agent.info.errorBeacon, agent.init.proxy.assets, agent.init.proxy.beacon].filter(Boolean);
+      }
+    });
+    Object.defineProperty(agent.runtime, 'denyList', {
+      get() {
+        // Compute the internal traffic list fresh each time to ensure beacons array is current
+        return [...(agent.init.ajax.deny_list || []), ...(agent.init.ajax.block_internal ? agent.beacons : [])];
+      }
+    });
+    agent.runtime.ptid = agent.agentIdentifier;
+    (0, _topLevelCallers.setTopLevelCallers)(agent); // no need to set global APIs on newrelic obj more than once
+
+    agent.runtime.loaderType = loaderType;
     agent.ee = _contextualEe.ee.get(agent.agentIdentifier);
     agent.exposed = exposed;
     (0, _globalEvent.dispatchGlobalEvent)({
-      agentIdentifier: agent.agentIdentifier,
-      drained: !!_featureFlags.activatedFeatures?.[agent.agentIdentifier],
+      drained: !!agent.runtime.activatedFeatures,
       type: 'lifecycle',
       name: 'initialize',
       feature: undefined,
       data: agent.config
     });
+    agent.runtime.configured = true;
   }
-  alreadySetOnce.add(agent.agentIdentifier);
 }

package/dist/esm/common/config/configurable.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { warn } from '../util/console';
@@ -17,7 +17,7 @@ export function getModeledObject(obj, model) {
           output[key] = null;
           continue;
         }
-        if (Array.isArray(obj[key]) && Array.isArray(model[key])) output[key] = Array.from(new Set([...obj[key], ...model[key]]));else if (typeof obj[key] === 'object' && typeof model[key] === 'object') output[key] = getModeledObject(obj[key], model[key]);else output[key] = obj[key];
+        if (Array.isArray(obj[key]) && Array.isArray(model[key])) output[key] = Array.from(new Set([...obj[key], ...model[key]]));else if (obj[key] instanceof Map || obj[key] instanceof Set || obj[key] instanceof Date || obj[key] instanceof RegExp) output[key] = obj[key];else if (typeof obj[key] === 'object' && typeof model[key] === 'object') output[key] = getModeledObject(obj[key], model[key]);else output[key] = obj[key];
       } catch (e) {
         if (!output[key]) warn(1, e);
       }

package/dist/esm/common/config/runtime.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { getModeledObject } from './configurable';
@@ -21,8 +21,12 @@ const hiddenState = {
   consented: false
 };
 const RuntimeModel = {
+  /** @type {{[key: string]: number} | undefined} */
+  activatedFeatures: undefined,
   /** Agent-specific metadata found in the RUM call response. ex. entityGuid */
   appMetadata: {},
+  /** @type {boolean} */
+  configured: false,
   get consented() {
     return this.session?.state?.consent || hiddenState.consented;
   },
@@ -30,8 +34,10 @@ const RuntimeModel = {
     hiddenState.consented = value;
   },
   customTransaction: undefined,
-  denyList: undefined,
+  denyList: [],
   disabled: false,
+  /** @type {Map<string, {staged: boolean, priority: number}>} */
+  drainRegistry: new Map(),
   harvester: undefined,
   isolatedBacklog: false,
   isRecording: false,

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

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

package/dist/esm/common/constants/runtime.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -49,4 +49,17 @@ export const ffVersion = (() => {
  * @type {number}
  */
 export const originTime = Date.now() - now();
-export const supportsNavTimingL2 = () => typeof PerformanceNavigationTiming !== 'undefined' && globalScope?.performance?.getEntriesByType('navigation')?.[0]?.responseStart;
+
+/**
+ * Gets the first navigation entry from the Performance Timeline API.
+ * Returns undefined if the entry is not available or invalid.
+ * Matches web-vitals validation: checks that responseStart exists, is positive, and is not larger than current time.
+ * See: https://github.com/GoogleChrome/web-vitals/issues/137
+ * @returns {PerformanceNavigationTiming | undefined}
+ */
+export const getNavigationEntry = () => {
+  const navigationEntry = globalScope?.performance?.getEntriesByType?.('navigation')?.[0];
+  if (navigationEntry && navigationEntry.responseStart > 0 && navigationEntry.responseStart < globalScope.performance.now()) {
+    return navigationEntry;
+  }
+};

package/dist/esm/common/deny-list/deny-list.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -84,5 +84,5 @@ export function setDenyList(denyListConfig) {
 function convertToRegularExpression(filter, isPathname = false) {
   const newFilter = filter.replace(/[.+?^${}()|[\]\\]/g, m => '\\' + m) // use a replacer function to not break apm injection
   .replace(/\*/g, '.*?'); // use lazy matching instead of greedy
-  return new RegExp((isPathname ? '^' : '') + newFilter + '$');
+  return new RegExp((isPathname ? '^' : '') + newFilter + '\x24'); // x24 == $, but using a literal $ causes webpack to to break when building unminified
 }

package/dist/esm/common/drain/drain.js

@@ -4,82 +4,73 @@
  */
 
 import { dispatchGlobalEvent } from '../../common/dispatch/global-event';
-import { ee } from '../event-emitter/contextual-ee';
 import { registerHandler as defaultRegister } from '../event-emitter/register-handler';
 import { featurePriority } from '../../loaders/features/features';
 import { EventContext } from '../event-emitter/event-context';
-const registry = {};
 
 /**
  * Adds an entry to the centralized drain registry specifying that a particular agent has events of a particular named
  * event-group "bucket" that should be drained at the time the agent drains all its buffered events. Buffered events
  * accumulate because instrumentation begins as soon as possible, before the agent has finished lazy-loading the code
  * responsible for aggregating and reporting captured data.
- * @param {string} agentIdentifier - A 16 character string uniquely identifying the agent.
+ * @param {Object} agentRef - The agent reference object.
  * @param {string} group - The named "bucket" for the events this feature will be bucketing for later collection.
  */
-export function registerDrain(agentIdentifier, group) {
+export function registerDrain(agentRef, group) {
+  if (!agentRef) return;
   // Here `item` captures the registered properties of a feature-group: whether it is ready for its buffered events
   // to be drained (`staged`) and the `priority` order in which it should be drained relative to other feature groups.
   const item = {
     staged: false,
     priority: featurePriority[group] || 0
   };
-  curateRegistry(agentIdentifier);
-  if (!registry[agentIdentifier].get(group)) registry[agentIdentifier].set(group, item);
+  if (!agentRef.runtime.drainRegistry.get(group)) agentRef.runtime.drainRegistry.set(group, item);
 }
 
 /**
  * Removes an item from the registry and immediately re-checks if the registry is ready to "drain all"
- * @param {*} agentIdentifier - A 16 character string uniquely identifying the agent.
+ * @param {Object} agentRef - The agent reference object.
  * @param {*} group - The named "bucket" to be removed from the registry
  */
-export function deregisterDrain(agentIdentifier, group) {
-  if (!agentIdentifier || !registry[agentIdentifier]) return;
-  if (registry[agentIdentifier].get(group)) registry[agentIdentifier].delete(group);
-  drainGroup(agentIdentifier, group, false);
-  if (registry[agentIdentifier].size) checkCanDrainAll(agentIdentifier);
-}
-
-/**
- * Registers the specified agent with the centralized event buffer registry if it is not already registered.
- * Agents without an identifier (as in the case of some tests) will be excluded from the registry.
- * @param {string} agentIdentifier - A 16 character string uniquely identifying an agent.
- */
-function curateRegistry(agentIdentifier) {
-  if (!agentIdentifier) throw new Error('agentIdentifier required');
-  if (!registry[agentIdentifier]) registry[agentIdentifier] = new Map();
+export function deregisterDrain(agentRef, group) {
+  if (!agentRef) return;
+  const drainRegistry = agentRef.runtime.drainRegistry;
+  if (!drainRegistry) return;
+  if (drainRegistry.get(group)) drainRegistry.delete(group);
+  drainGroup(agentRef, group, false);
+  if (drainRegistry.size) checkCanDrainAll(agentRef);
 }
 
 /**
  * Drain buffered events out of the event emitter. Each feature should have its events bucketed by "group" and drain
  * its own named group explicitly, when ready.
- * @param {string} agentIdentifier - A unique 16 character ID corresponding to an instantiated agent.
+ * @param {Object} agentRef - The agent reference object.
  * @param {string} featureName - A named group into which the feature's buffered events are bucketed.
  * @param {boolean} force - Whether to force the drain to occur immediately, bypassing the registry and staging logic.
  */
-export function drain(agentIdentifier = '', featureName = 'feature', force = false) {
-  curateRegistry(agentIdentifier);
+export function drain(agentRef, featureName = 'feature', force = false) {
+  if (!agentRef) return;
   // If the feature for the specified agent is not in the registry, that means the instrument file was bypassed.
   // This could happen in tests, or loaders that directly import the aggregator. In these cases it is safe to
   // drain the feature group immediately rather than waiting to drain all at once.
-  if (!agentIdentifier || !registry[agentIdentifier].get(featureName) || force) return drainGroup(agentIdentifier, featureName);
+  if (!agentRef.runtime.drainRegistry.get(featureName) || force) return drainGroup(agentRef, featureName);
 
   // When `drain` is called, this feature is ready to drain (staged).
-  registry[agentIdentifier].get(featureName).staged = true;
-  checkCanDrainAll(agentIdentifier);
+  agentRef.runtime.drainRegistry.get(featureName).staged = true;
+  checkCanDrainAll(agentRef);
 }
 
 /** Checks all items in the registry to see if they have been "staged".  If ALL items are staged, it will drain all registry items (drainGroup).  It not, nothing will happen */
-function checkCanDrainAll(agentIdentifier) {
+function checkCanDrainAll(agentRef) {
+  if (!agentRef) return;
   // Only when the event-groups for all features are ready to drain (staged) do we execute the drain. This has the effect
   // that the last feature to call drain triggers drain for all features.
-  const items = Array.from(registry[agentIdentifier]);
+  const items = Array.from(agentRef.runtime.drainRegistry);
   if (items.every(([key, values]) => values.staged)) {
     items.sort((a, b) => a[1].priority - b[1].priority);
     items.forEach(([group]) => {
-      registry[agentIdentifier].delete(group);
-      drainGroup(agentIdentifier, group);
+      agentRef.runtime.drainRegistry.delete(group);
+      drainGroup(agentRef, group);
     });
   }
 }
@@ -89,12 +80,12 @@ function checkCanDrainAll(agentIdentifier) {
    * the subscribed handlers for the group.
    * @param {*} group - The name of a particular feature's event "bucket".
    */
-function drainGroup(agentIdentifier, group, activateGroup = true) {
-  const baseEE = agentIdentifier ? ee.get(agentIdentifier) : ee;
+function drainGroup(agentRef, group, activateGroup = true) {
+  if (!agentRef) return;
+  const baseEE = agentRef.ee;
   const handlers = defaultRegister.handlers; // other storage in registerHandler
-  if (baseEE.aborted || !baseEE.backlog || !handlers) return;
+  if (!baseEE || baseEE.aborted || !baseEE.backlog || !handlers) return;
   dispatchGlobalEvent({
-    agentIdentifier,
     type: 'lifecycle',
     name: 'drain',
     feature: group

package/dist/esm/common/harvest/harvester.js

@@ -15,7 +15,6 @@ import { obj, param } from '../url/encode';
 import { warn } from '../util/console';
 import { stringify } from '../util/stringify';
 import { getSubmitMethod, xhr as xhrMethod, xhrFetch as fetchMethod } from '../util/submit-data';
-import { activatedFeatures } from '../util/feature-flags';
 import { dispatchGlobalEvent } from '../dispatch/global-event';
 const RETRY = 'Harvester/Retry/';
 const RETRY_ATTEMPTED = RETRY + 'Attempted/';
@@ -229,8 +228,7 @@ export function send(agentRef, {
     }
   }
   dispatchGlobalEvent({
-    agentIdentifier: agentRef.agentIdentifier,
-    drained: !!activatedFeatures?.[agentRef.agentIdentifier],
+    drained: !!agentRef.runtime?.activatedFeatures,
     type: 'data',
     name: 'harvest',
     feature: featureName,