@newrelic/browser-agent 1.252.0 → 1.253.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.253.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.252.1...v1.253.0) (2024-03-13)
+
+
+### Features
+
+* Apply deny list to ajax metrics ([#898](https://github.com/newrelic/newrelic-browser-agent/issues/898)) ([a5c2adc](https://github.com/newrelic/newrelic-browser-agent/commit/a5c2adc0ecbe322ea9a9dcdf1ed3b072c1212415))
+* Isolate observation context per agent ([#903](https://github.com/newrelic/newrelic-browser-agent/issues/903)) ([85887c8](https://github.com/newrelic/newrelic-browser-agent/commit/85887c8e7f4241076daeeda75077e6ee710a3d00))
+* Preload the Session Replay recorder when properly configured ([#893](https://github.com/newrelic/newrelic-browser-agent/issues/893)) ([bc5ebb5](https://github.com/newrelic/newrelic-browser-agent/commit/bc5ebb5cb255fda7f2c30d5053b5a980a423c2b1))
+* Soft Navigations trial ([#808](https://github.com/newrelic/newrelic-browser-agent/issues/808)) ([7fcb627](https://github.com/newrelic/newrelic-browser-agent/commit/7fcb62791ad932cbd3b9f16a72277b42bca9a75f))
+
+## [1.252.1](https://github.com/newrelic/newrelic-browser-agent/compare/v1.252.0...v1.252.1) (2024-02-29)
+
+
+### Bug Fixes
+
+* Fix webpack imports in npm package ([#905](https://github.com/newrelic/newrelic-browser-agent/issues/905)) ([35810a8](https://github.com/newrelic/newrelic-browser-agent/commit/35810a895b7f61ab60ea5c24adfa49c4a3956191))
+* Page load after session timeouts don't start new session ([#899](https://github.com/newrelic/newrelic-browser-agent/issues/899)) ([5c952a0](https://github.com/newrelic/newrelic-browser-agent/commit/5c952a0a212922d84dfd7e8eb388fdbd566b6c00))
+
 ## [1.252.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.251.1...v1.252.0) (2024-02-12)
 
 

package/README.md

@@ -24,16 +24,16 @@ $ npm install @newrelic/browser-agent --save
 $ yarn add @newrelic/browser-agent
 ```
 
-## Creating an app in New Relic One
+## Creating an app in New Relic
 
-Before instrumenting your app using the NPM package, a Browser App should be configured in New Relic One. This may be done with or without a corresponding APM agent. Once the app has been created, the Copy/Paste JavaScript code on the app's *Application settings* page will contain the configuration values needed to define options when instantiating the agent via the NPM package.
+Before instrumenting your app using the NPM package, a Browser App should be configured in New Relic. This may be done with or without a corresponding APM agent. Once the app has been created, the Copy/Paste JavaScript code on the app's *Application settings* page will contain the configuration values needed to define options when instantiating the agent via the NPM package.
 
 1. If a browser app does not already exist, create one:
-   - From the *New Relic One* navigation panel, click *Add Data*.
+   - From the *New Relic* navigation panel, click *Add Data*.
    - Select the *Browser monitoring* data source.
    - Choose the *APM* or *Copy/Paste* method.
    - Select or name your app and click *Enable*.
-2. From the navigation panel, select *Browser* to view brower apps.
+2. From the navigation panel, select *Browser* to view browser apps.
 3. Select the desired app and navigate to the *Application settings* page.
 4. From the *Copy/Paste JavaScript* box, copy the configuration values assigned to the `NREUM` object (`init`, `info`, and `loader_config`). You will use these configuration values when instantiating the agent using the NPM package.
 
@@ -41,7 +41,7 @@ Before instrumenting your app using the NPM package, a Browser App should be con
 
 For best results, import and instantiate the `BrowserAgent` class as close to the top of the `head` element of your app's HTML output as possible. The specific location and method will vary based on your application's architecture or framework. See [Library Support](#library-support) for more information.
 
-Populate the `options` parameter using configuration values found in the the *Copy/Paste JavaScript* box in your browser app's *Application settings* page in New Relic One.
+Populate the `options` parameter using configuration values found in the the *Copy/Paste JavaScript* box in your browser app's *Application settings* page in New Relic.
 
 ```javascript
 import { BrowserAgent } from '@newrelic/browser-agent/loaders/browser-agent'
@@ -137,7 +137,7 @@ The examples above use the `Agent` class at their core, which is ideal for most
 
 Using the `MicroAgent` class, it is possible to skip the "auto" instrumentation phases of the other loader types, and provide a *very small* agent designed for capturing data in a controlled manner via the API interfaces. The `MicroAgent` captures a distinct `PageView` event when instantiated, and additional `PageAction` and `JavaScriptError` events may be captured by calling the `noticeError` and `addPageAction` methods.
 
-Because it does not wrap the page-level globals in the same way as the base `Agent` class, the `MicroAgent` is not only smaller but can easily be instantiated multiple times on a single page with low overhead, with each instance configured to report to a different Browser App entity in New Relic One if desired. This accommodates specialized use cases, such as segmented UI designs (e.g., the micro front-end pattern) or applications requiring subsets of manually-handled data to be reported to different application entities.
+Because it does not wrap the page-level globals in the same way as the base `Agent` class, the `MicroAgent` is not only smaller but can easily be instantiated multiple times on a single page with low overhead, with each instance configured to report to a different Browser App entity in New Relic if desired. This accommodates specialized use cases, such as segmented UI designs (e.g., the micro front-end pattern) or applications requiring subsets of manually-handled data to be reported to different application entities.
 
 The example below illustrates how to instantiate and interact with two separate `MicroAgent` instances on one page.
 

package/dist/cjs/cdn/experimental.js

@@ -8,7 +8,7 @@ var _instrument4 = require("../features/jserrors/instrument");
 var _instrument5 = require("../features/ajax/instrument");
 var _instrument6 = require("../features/session_trace/instrument");
 var _instrument7 = require("../features/session_replay/instrument");
-var _instrument8 = require("../features/spa/instrument");
+var _instrument8 = require("../features/soft_navigations/instrument");
 var _instrument9 = require("../features/page_action/instrument");
 /*
  * Copyright 2023 New Relic Corporation. All rights reserved.
@@ -21,7 +21,11 @@ var _instrument9 = require("../features/page_action/instrument");
  * It is not production ready, and is not intended to be imported or implemented in any build of the browser agent
  */
 
+// import { Instrument as InstrumentSpa } from '../features/spa/instrument'
+
 new _agent.Agent({
-  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument9.Instrument, _instrument4.Instrument, _instrument8.Instrument],
+  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument9.Instrument, _instrument4.Instrument,
+  // InstrumentSpa,
+  _instrument8.Instrument],
   loaderType: 'experimental'
 });

package/dist/cjs/cdn/spa.js

@@ -8,13 +8,15 @@ var _instrument4 = require("../features/jserrors/instrument");
 var _instrument5 = require("../features/ajax/instrument");
 var _instrument6 = require("../features/session_trace/instrument");
 var _instrument7 = require("../features/session_replay/instrument");
-var _instrument8 = require("../features/spa/instrument");
-var _instrument9 = require("../features/page_action/instrument");
+var _instrument8 = require("../features/soft_navigations/instrument");
+var _instrument9 = require("../features/spa/instrument");
+var _instrument10 = require("../features/page_action/instrument");
 /**
  * @file Creates a "SPA" agent loader bundle composed of the core agent and all available feature modules.
  */
 
 new _agent.Agent({
-  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument9.Instrument, _instrument4.Instrument, _instrument8.Instrument],
+  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument10.Instrument, _instrument4.Instrument, _instrument8.Instrument, _instrument9.Instrument // either the softnav or the old spa will be used (not both), but we still need to pack both to avoid dynamic import for instrument files
+  ],
   loaderType: 'spa'
 });

package/dist/cjs/common/aggregate/aggregator.js

@@ -83,7 +83,7 @@ class Aggregator extends _sharedContext.SharedContext {
     var hasData = false;
     for (var i = 0; i < types.length; i++) {
       type = types[i];
-      results[type] = toArray(this.aggregatedData[type]);
+      results[type] = Object.values(this.aggregatedData[type] || {});
       if (results[type].length) hasData = true;
       delete this.aggregatedData[type];
     }
@@ -158,11 +158,4 @@ function createMetricObject(value) {
     sos: value * value,
     c: 1
   };
-}
-function toArray(obj) {
-  if (typeof obj !== 'object') return [];
-  return (0, _mapOwn.mapOwn)(obj, getValue);
-}
-function getValue(key, value) {
-  return value;
 }

package/dist/cjs/common/config/state/init.js

@@ -106,6 +106,8 @@ const model = () => {
       autoStart: true,
       enabled: false,
       harvestTimeSeconds: 60,
+      preload: false,
+      // if true, enables the agent to load rrweb immediately instead of waiting to do so after the window.load event
       sampling_rate: 10,
       // float from 0 - 100
       error_sampling_rate: 100,
@@ -158,6 +160,11 @@ const model = () => {
       enabled: true,
       harvestTimeSeconds: 10,
       autoStart: true
+    },
+    soft_navigations: {
+      enabled: true,
+      harvestTimeSeconds: 10,
+      autoStart: true
     }
   };
 };

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

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

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

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

package/dist/cjs/common/context/observation-context-manager.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ObservationContextManager = void 0;
+var _nreum = require("../window/nreum");
+var _bundleId = require("../ids/bundle-id");
+var _eventContext = require("./event-context");
+class ObservationContextManager {
+  // These IDs are provided for backwards compatibility until the agent is fully updated
+  // use the observation context class.
+
+  static contextId = "nr@context:".concat(_bundleId.bundleId);
+  static contextOriginalId = "nr@original:".concat(_bundleId.bundleId);
+  static contextWrappedId = "nr@wrapped:".concat(ObservationContextManager.contextId);
+  static getObservationContextByAgentIdentifier(agentIdentifier) {
+    const nr = (0, _nreum.gosNREUM)();
+    return Object.keys(nr?.initializedAgents || {}).indexOf(agentIdentifier) > -1 ? nr.initializedAgents[agentIdentifier].observationContext : undefined;
+  }
+
+  /**
+   * @type {WeakMap<WeakKey, {[key: string]: unknown}>}
+   */
+  #observationContext = new WeakMap();
+
+  /**
+   * Returns the observation context tied to the supplied construct. If there has been
+   * no observation construct created, an empty object is created and stored as the current
+   * context.
+   * @param key {unknown} The construct being observed such as an XHR instance
+   * @return {EventContext} An object of key:value pairs to track as
+   * part of the observation
+   */
+  getCreateContext(key) {
+    if (!this.#observationContext.has(key)) {
+      this.#observationContext.set(key, new _eventContext.EventContext());
+    }
+    return this.#observationContext.get(key);
+  }
+
+  /**
+   * Set the observation context for an observed construct. If values of the context
+   * need to be updated, they should be done so directly on the context. This function
+   * is only for the setting of a whole context.
+   * @param key {unknown} The construct being observed such as an XHR instance
+   * @param value {EventContext} An object of key:value pairs to track as
+   * part of the observation
+   * @return {EventContext} The updated observation context
+   */
+  setContext(key, value) {
+    this.#observationContext.set(key, value);
+    return this.#observationContext.get(key);
+  }
+}
+exports.ObservationContextManager = ObservationContextManager;

package/dist/cjs/common/event-emitter/contextual-ee.js

@@ -3,19 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ee = exports.contextId = void 0;
+exports.ee = void 0;
 var _nreum = require("../window/nreum");
 var _getOrSet = require("../util/get-or-set");
 var _config = require("../config/config");
-var _eventContext = require("./event-context");
-var _bundleId = require("../ids/bundle-id");
+var _eventContext = require("../context/event-context");
+var _observationContextManager = require("../context/observation-context-manager");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// create a unique id to store event context data for the current agent bundle
-const contextId = exports.contextId = "nr@context:".concat(_bundleId.bundleId);
 // create global emitter instance that can be shared among bundles
 const globalInstance = exports.ee = ee(undefined, 'globalEE');
 
@@ -53,16 +51,17 @@ function ee(old, debugId) {
     aborted: false,
     isBuffering,
     debugId,
-    backlog: isolatedBacklog ? {} : old && typeof old.backlog === 'object' ? old.backlog : {}
+    backlog: isolatedBacklog ? {} : old && typeof old.backlog === 'object' ? old.backlog : {},
+    observationContextManager: null
   };
   return emitter;
   function context(contextOrStore) {
     if (contextOrStore && contextOrStore instanceof _eventContext.EventContext) {
       return contextOrStore;
     } else if (contextOrStore) {
-      return (0, _getOrSet.getOrSet)(contextOrStore, contextId, () => new _eventContext.EventContext(contextId));
+      return (0, _getOrSet.getOrSet)(contextOrStore, _observationContextManager.ObservationContextManager.contextId, () => emitter.observationContextManager ? emitter.observationContextManager.getCreateContext(contextOrStore) : new _eventContext.EventContext(_observationContextManager.ObservationContextManager.contextId));
     } else {
-      return new _eventContext.EventContext(contextId);
+      return emitter.observationContextManager ? emitter.observationContextManager.getCreateContext({}) : new _eventContext.EventContext(_observationContextManager.ObservationContextManager.contextId);
     }
   }
   function emit(type, args, contextOrStore, force, bubble) {
@@ -106,7 +105,11 @@ function ee(old, debugId) {
     return handlers[type] || [];
   }
   function getOrCreate(name) {
-    return emitters[name] = emitters[name] || ee(emitter, name);
+    const newEventEmitter = emitters[name] = emitters[name] || ee(emitter, name);
+    if (!newEventEmitter.observationContextManager && emitter.observationContextManager) {
+      newEventEmitter.observationContextManager = emitter.observationContextManager;
+    }
+    return newEventEmitter;
   }
   function bufferEventsByGroup(types, group) {
     const eventBuffer = getBuffer();

package/dist/cjs/common/session/constants.js

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SESSION_EVENT_TYPES = exports.SESSION_EVENTS = exports.PREFIX = exports.MODE = exports.DEFAULT_INACTIVE_MS = exports.DEFAULT_EXPIRES_MS = void 0;
+exports.SESSION_EVENT_TYPES = exports.SESSION_EVENTS = exports.PREFIX = exports.MODE = exports.DEFAULT_KEY = exports.DEFAULT_INACTIVE_MS = exports.DEFAULT_EXPIRES_MS = void 0;
 const PREFIX = exports.PREFIX = 'NRBA';
+const DEFAULT_KEY = exports.DEFAULT_KEY = 'SESSION';
 const DEFAULT_EXPIRES_MS = exports.DEFAULT_EXPIRES_MS = 14400000;
 const DEFAULT_INACTIVE_MS = exports.DEFAULT_INACTIVE_MS = 1800000;
 const SESSION_EVENTS = exports.SESSION_EVENTS = {

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

@@ -135,7 +135,9 @@ class SessionEntity {
 
     // The fact that the session is "new" or pre-existing is used in some places in the agent.  Session Replay and Trace
     // can use this info to inform whether to trust a new sampling decision vs continue a previous tracking effort.
-    this.isNew = !Object.keys(initialRead).length;
+    /* [NR-230914] 02/2024 - the logical OR assignment is used so that isNew remains 'true' if it was already set as such. This fixes the expires and inactive timestamps timing out in localStorage
+      while no page for a given domain is in-use and the session resetting upon user returning to the page as part of a fresh session. */
+    this.isNew ||= !Object.keys(initialRead).length;
     // if its a "new" session, we write to storage API with the default values.  These values may change over the lifespan of the agent run.
     // we can use a modeled object here to help us know and manage what values are being used. -- see "model" above
     if (this.isNew) this.write((0, _configurable.getModeledObject)(this.state, model), true);else this.sync(initialRead);

package/dist/cjs/common/timing/nav-timing.js

@@ -32,7 +32,7 @@ var REQUEST = 'request';
 var RESPONSE = 'response';
 var LOAD_EVENT = 'loadEvent';
 var DOM_CONTENT_LOAD_EVENT = 'domContentLoadedEvent';
-var navTimingValues = exports.navTimingValues = [];
+const navTimingValues = exports.navTimingValues = [];
 function getPntType(type) {
   if (typeof type === 'number') return type;
   const types = {
@@ -78,6 +78,11 @@ function addPN(pn, v) {
   handleValue(pn.redirectCount, v, 'rc');
   return v;
 }
+
+/**
+ * By side effect, this modifies 'obj' with a mapping of the 'prop' provided to a 'value', and invalid values are not added.
+ * On the other hand, the local navTimingValues array gets the value appended if valid and 'undefined' appended if invalid, regardless.
+ */
 function handleValue(value, obj, prop, isOldApi) {
   /*
   For L2 Timing API, the value will already be a relative-to-previous-document DOMHighResTimeStamp.
@@ -92,6 +97,6 @@ function handleValue(value, obj, prop, isOldApi) {
     }
     value = Math.round(value);
     obj[prop] = value;
-  }
-  navTimingValues.push(value);
+    navTimingValues.push(value);
+  } else navTimingValues.push(undefined);
 }

package/dist/cjs/common/timing/now.js

@@ -11,5 +11,5 @@ exports.now = now;
 
 // This is our own layer around performance.now. It's not strictly necessary, but we keep it in case of future mod-ing of the value for refactor purpose.
 function now() {
-  return Math.round(performance.now());
+  return Math.floor(performance.now());
 }

package/dist/cjs/common/util/feature-flags.js

@@ -18,7 +18,7 @@ const bucketMap = {
   stn: [_features.FEATURE_NAMES.sessionTrace],
   err: [_features.FEATURE_NAMES.jserrors, _features.FEATURE_NAMES.metrics],
   ins: [_features.FEATURE_NAMES.pageAction],
-  spa: [_features.FEATURE_NAMES.spa],
+  spa: [_features.FEATURE_NAMES.spa, _features.FEATURE_NAMES.softNav],
   sr: [_features.FEATURE_NAMES.sessionReplay, _features.FEATURE_NAMES.sessionTrace]
 };
 const sentIds = new Set();

package/dist/cjs/common/wrap/index.js

@@ -39,12 +39,6 @@ Object.defineProperty(exports, "wrapPromise", {
     return _wrapPromise.wrapPromise;
   }
 });
-Object.defineProperty(exports, "wrapRaf", {
-  enumerable: true,
-  get: function () {
-    return _wrapRaf.wrapRaf;
-  }
-});
 Object.defineProperty(exports, "wrapTimer", {
   enumerable: true,
   get: function () {
@@ -63,6 +57,5 @@ var _wrapHistory = require("./wrap-history");
 var _wrapJsonp = require("./wrap-jsonp");
 var _wrapMutation = require("./wrap-mutation");
 var _wrapPromise = require("./wrap-promise");
-var _wrapRaf = require("./wrap-raf");
 var _wrapTimer = require("./wrap-timer");
 var _wrapXhr = require("./wrap-xhr");

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

@@ -9,6 +9,7 @@ var _contextualEe = require("../event-emitter/contextual-ee");
 var _wrapFunction = require("./wrap-function");
 var _getOrSet = require("../util/get-or-set");
 var _runtime = require("../constants/runtime");
+var _observationContextManager = require("../context/observation-context-manager");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -23,7 +24,6 @@ const wrapped = {};
 const XHR = _runtime.globalScope.XMLHttpRequest;
 const ADD_EVENT_LISTENER = 'addEventListener';
 const REMOVE_EVENT_LISTENER = 'removeEventListener';
-const flag = "nr@wrapped:".concat(_contextualEe.contextId);
 
 /**
  * Wraps `addEventListener` and `removeEventListener` on: global scope; the prototype of `XMLHttpRequest`, and
@@ -52,7 +52,7 @@ function wrapEvents(sharedEE) {
     if (originalListener === null || typeof originalListener !== 'function' && typeof originalListener !== 'object') {
       return;
     }
-    var wrapped = (0, _getOrSet.getOrSet)(originalListener, flag, function () {
+    var wrapped = (0, _getOrSet.getOrSet)(originalListener, _observationContextManager.ObservationContextManager.contextWrappedId, function () {
       var listener = {
         object: wrapHandleEvent,
         function: originalListener

package/dist/cjs/common/wrap/wrap-fetch.js

@@ -7,6 +7,7 @@ exports.scopedEE = scopedEE;
 exports.wrapFetch = wrapFetch;
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _runtime = require("../constants/runtime");
+var _observationContextManager = require("../context/observation-context-manager");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -78,7 +79,7 @@ function wrapFetch(sharedEE) {
         // we are wrapping args in an array so we can preserve the reference
         ee.emit(prefix + 'before-start', [args], ctx);
         var dtPayload;
-        if (ctx[_contextualEe.contextId] && ctx[_contextualEe.contextId].dt) dtPayload = ctx[_contextualEe.contextId].dt;
+        if (ctx[_observationContextManager.ObservationContextManager.contextId] && ctx[_observationContextManager.ObservationContextManager.contextId].dt) dtPayload = ctx[_observationContextManager.ObservationContextManager.contextId].dt;
         var origPromiseFromFetch = fn.apply(this, args);
         ee.emit(prefix + 'start', [args, dtPayload], origPromiseFromFetch);
 

package/dist/cjs/common/wrap/wrap-function.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createWrapperWithEmitter = createWrapperWithEmitter;
-exports.flag = exports.default = void 0;
+exports.default = void 0;
 var _contextualEe = require("../event-emitter/contextual-ee");
-var _bundleId = require("../ids/bundle-id");
+var _observationContextManager = require("../context/observation-context-manager");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -15,8 +15,6 @@ var _bundleId = require("../ids/bundle-id");
  * @file Provides helper functions for wrapping functions in various scenarios.
  */
 
-const flag = exports.flag = "nr@original:".concat(_bundleId.bundleId);
-
 /**
  * A convenience alias of `hasOwnProperty`.
  * @type {function}
@@ -46,7 +44,7 @@ function createWrapperWithEmitter(emitter, always) {
    * As a property on a wrapped function, contains the original function.
    * @type {string}
    */
-  wrapFn.flag = flag;
+  wrapFn.flag = _observationContextManager.ObservationContextManager.contextOriginalId;
   return wrapFn;
 
   /**
@@ -62,7 +60,7 @@ function createWrapperWithEmitter(emitter, always) {
     // Unless fn is both wrappable and unwrapped, return it unchanged.
     if (notWrappable(fn)) return fn;
     if (!prefix) prefix = '';
-    nrWrapper[flag] = fn;
+    nrWrapper[_observationContextManager.ObservationContextManager.contextOriginalId] = fn;
     copy(fn, nrWrapper, emitter);
     return nrWrapper;
 
@@ -216,5 +214,5 @@ function copy(from, to, emitter) {
  * @returns {boolean} Whether the passed function is ineligible to be wrapped.
  */
 function notWrappable(fn) {
-  return !(fn && typeof fn === 'function' && fn.apply && !fn[flag]);
+  return !(fn && typeof fn === 'function' && fn.apply && !fn[_observationContextManager.ObservationContextManager.contextOriginalId]);
 }

package/dist/cjs/common/wrap/wrap-promise.js

@@ -8,6 +8,7 @@ exports.wrapPromise = wrapPromise;
 var _wrapFunction = require("./wrap-function");
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _runtime = require("../constants/runtime");
+var _observationContextManager = require("../context/observation-context-manager");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -125,7 +126,7 @@ function wrapPromise(sharedEE) {
       promiseEE.emit('propagate', [originalThis, true], origFnCallWithThis, false, false);
       return origFnCallWithThis;
     };
-    prevPromiseObj.prototype.then[_wrapFunction.flag] = prevPromiseOrigThen;
+    prevPromiseObj.prototype.then[_observationContextManager.ObservationContextManager.contextOriginalId] = prevPromiseOrigThen;
     promiseEE.on('executor-start', function (args) {
       args[0] = promiseWrapper(args[0], 'resolve-', this, null, false);
       args[1] = promiseWrapper(args[1], 'resolve-', this, null, false);

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

@@ -16,6 +16,7 @@ var _features = require("../../../loaders/features/features");
 var _constants2 = require("../../metrics/constants");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _gql = require("./gql");
+var _nreum = require("../../../common/window/nreum");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -50,19 +51,23 @@ class Aggregate extends _aggregateBase.AggregateBase {
         spaAjaxEvents
       };
     };
-    ee.on('interactionSaved', interaction => {
-      if (!spaAjaxEvents[interaction.id]) return;
-      // remove from the spaAjaxEvents buffer, and let spa harvest it
-      delete spaAjaxEvents[interaction.id];
-    });
-    ee.on('interactionDiscarded', interaction => {
+
+    // --- v Used by old spa feature
+    ee.on('interactionDone', (interaction, wasSaved) => {
       if (!spaAjaxEvents[interaction.id]) return;
-      spaAjaxEvents[interaction.id].forEach(function (item) {
-        // move it from the spaAjaxEvents buffer to the ajaxEvents buffer for harvesting here
-        ajaxEvents.push(item);
-      });
+      if (!wasSaved) {
+        // if the ixn was saved, then its ajax reqs are part of the payload whereas if it was discarded, it should still be harvested in the ajax feature itself
+        spaAjaxEvents[interaction.id].forEach(function (item) {
+          ajaxEvents.push(item);
+        });
+      }
       delete spaAjaxEvents[interaction.id];
     });
+    // --- ^
+    // --- v Used by new soft nav
+    (0, _registerHandler.registerHandler)('returnAjax', event => ajaxEvents.push(event), this.featureName, this.ee);
+    // --- ^
+
     const scheduler = new _harvestScheduler.HarvestScheduler('events', {
       onFinished: onEventsHarvestFinished,
       getPayload: prepareHarvest
@@ -83,16 +88,26 @@ class Aggregate extends _aggregateBase.AggregateBase {
       } else {
         hash = (0, _stringify.stringify)([params.status, params.host, params.pathname]);
       }
+      const shouldCollect = (0, _denyList.shouldCollectEvent)(params);
+      const ajaxMetricDenyListEnabled = agentInit.feature_flags?.includes('ajax_metrics_deny_list');
 
       // store as metric
-      aggregator.store('xhr', hash, params, metrics);
+      if (shouldCollect || !ajaxMetricDenyListEnabled) {
+        aggregator.store('xhr', hash, params, metrics);
+      }
       if (!allAjaxIsEnabled) return;
-      if (!(0, _denyList.shouldCollectEvent)(params)) {
+      if (!shouldCollect) {
         if (params.hostname === beacon || proxyBeacon && params.hostname === proxyBeacon) {
           // This doesn't make a distinction if the same-domain request is going to a different port or path...
           (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Ajax/Events/Excluded/Agent'], undefined, _features.FEATURE_NAMES.metrics, ee);
+          if (ajaxMetricDenyListEnabled) {
+            (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Ajax/Metrics/Excluded/Agent'], undefined, _features.FEATURE_NAMES.metrics, ee);
+          }
         } else {
           (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Ajax/Events/Excluded/App'], undefined, _features.FEATURE_NAMES.metrics, ee);
+          if (ajaxMetricDenyListEnabled) {
+            (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Ajax/Metrics/Excluded/App'], undefined, _features.FEATURE_NAMES.metrics, ee);
+          }
         }
         return;
       }
@@ -122,10 +137,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
         query: this?.parsedOrigin?.search
       });
       if (event.gql) (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Ajax/Events/GraphQL/Bytes-Added', (0, _stringify.stringify)(event.gql).length], undefined, _features.FEATURE_NAMES.metrics, ee);
-
-      // if the ajax happened inside an interaction, hold it until the interaction finishes
-      if (this.spaNode) {
-        var interactionId = this.spaNode.interaction.id;
+      const softNavInUse = Boolean((0, _nreum.getNREUMInitializedAgent)(agentIdentifier)?.features?.[_features.FEATURE_NAMES.softNav]);
+      if (softNavInUse) {
+        // For newer soft nav (when running), pass the event to it for evaluation -- either part of an interaction or is given back
+        (0, _handle.handle)('ajax', [event], undefined, _features.FEATURE_NAMES.softNav, ee);
+      } else if (this.spaNode) {
+        // For old spa (when running), if the ajax happened inside an interaction, hold it until the interaction finishes
+        const interactionId = this.spaNode.interaction.id;
         spaAjaxEvents[interactionId] = spaAjaxEvents[interactionId] || [];
         spaAjaxEvents[interactionId].push(event);
       } else {