@newrelic/browser-agent 1.306.0 → 1.307.0-rc.1

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.307.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.306.0...v1.307.0) (2026-01-06)
+
+
+### Features
+
+* Add resetSession option to setUserId() API ([#1646](https://github.com/newrelic/newrelic-browser-agent/issues/1646)) ([c284cfd](https://github.com/newrelic/newrelic-browser-agent/commit/c284cfde4a18fb9afa75c11b181944401a902e13))
+* Ajax deny list wildcard support ([#1655](https://github.com/newrelic/newrelic-browser-agent/issues/1655)) ([61fa99b](https://github.com/newrelic/newrelic-browser-agent/commit/61fa99ba39334b85f7611a076943f15356f65364))
+* Make soft navigations feature the default SPA ([#1638](https://github.com/newrelic/newrelic-browser-agent/issues/1638)) ([d93f3f3](https://github.com/newrelic/newrelic-browser-agent/commit/d93f3f388085b7e76292e79749977db19a10765a))
+
 ## [1.306.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.305.0...v1.306.0) (2025-12-16)
 
 

package/dist/cjs/cdn/spa.js

@@ -9,11 +9,10 @@ var _instrument5 = require("../features/ajax/instrument");
 var _instrument6 = require("../features/session_trace/instrument");
 var _instrument7 = require("../features/session_replay/instrument");
 var _instrument8 = require("../features/soft_navigations/instrument");
-var _instrument9 = require("../features/spa/instrument");
-var _instrument0 = require("../features/generic_events/instrument");
-var _instrument1 = require("../features/logging/instrument");
+var _instrument9 = require("../features/generic_events/instrument");
+var _instrument0 = require("../features/logging/instrument");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -22,7 +21,6 @@ var _instrument1 = require("../features/logging/instrument");
  */
 
 new _agent.Agent({
-  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument4.Instrument, _instrument0.Instrument, _instrument1.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
-  ],
+  features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument7.Instrument, _instrument3.Instrument, _instrument4.Instrument, _instrument9.Instrument, _instrument0.Instrument, _instrument8.Instrument],
   loaderType: 'spa'
 });

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

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.306.0";
+const VERSION = exports.VERSION = "1.307.0-rc.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.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.306.0";
+const VERSION = exports.VERSION = "1.307.0-rc.1";
 
 /**
  * Exposes the build type of the agent

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

@@ -26,12 +26,12 @@ var denyList = [];
 function shouldCollectEvent(params) {
   if (!params || hasUndefinedHostname(params)) return false;
   if (denyList.length === 0) return true;
+
+  // short circuit if deny list contains just a wildcard
+  if (denyList[0].hostname === '*') return false;
   for (var i = 0; i < denyList.length; i++) {
     var parsed = denyList[i];
-    if (parsed.hostname === '*') {
-      return false;
-    }
-    if (domainMatchesPattern(parsed.hostname, params.hostname) && comparePath(parsed.pathname, params.pathname)) {
+    if (parsed.hostname.test(params.hostname) && parsed.pathname.test(params.pathname)) {
       return false;
     }
   }
@@ -54,6 +54,13 @@ function setDenyList(denyListConfig) {
     let url = denyListConfig[i];
     if (!url) continue; // ignore bad values like undefined or empty strings
 
+    // short circuit if deny list entry is just a wildcard
+    if (url === '*') {
+      denyList = [{
+        hostname: '*'
+      }];
+      return;
+    }
     if (url.indexOf('http://') === 0) {
       url = url.substring(7);
     } else if (url.indexOf('https://') === 0) {
@@ -66,45 +73,24 @@ function setDenyList(denyListConfig) {
       pathname = url.substring(firstSlash);
     } else {
       host = url;
-      pathname = '';
+      pathname = '*';
     }
     let [hostname] = host.split(':');
     denyList.push({
-      hostname,
-      pathname
+      hostname: convertToRegularExpression(hostname),
+      pathname: convertToRegularExpression(pathname, true)
     });
   }
 }
-/**
- * Returns true if the right side of `domain` (end of string) matches `pattern`.
- * @param {string} pattern - a string to be matched against the end of `domain` string
- * @param {string} domain - a domain string with no protocol or path (e.g., app1.example.com)
- * @returns {boolean} `true` if domain matches pattern; else `false`
- */
-function domainMatchesPattern(pattern, domain) {
-  if (pattern.length > domain.length) {
-    return false;
-  }
-  return domain.indexOf(pattern) === domain.length - pattern.length;
-}
 
 /**
- * Returns true if a URL path matches a pattern string, disregarding leading slashes.
- * @param {string} pattern - a string to compare with path (e.g., api/v1)
- * @param {string} path - a string representing a URL path (e.g., /api/v1)
- * @returns {boolean} `true` if path and pattern are an exact string match (except for leading slashes); else `false`
+ * Converts a deny list filter string into a regular expression object with wildcard support
+ * @param {string} filter - deny list filter to convert
+ * @param {boolean} [isPathname=false] - indicates if the filter is a pathname
+ * @returns {RegExp} - regular expression object built from the input string
  */
-function comparePath(pattern, path) {
-  if (pattern.indexOf('/') === 0) {
-    pattern = pattern.substring(1);
-  }
-  if (path.indexOf('/') === 0) {
-    path = path.substring(1);
-  }
-
-  // No path in pattern means match all paths.
-  if (pattern === '') {
-    return true;
-  }
-  return pattern === path;
+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 + '$');
 }

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

@@ -85,7 +85,8 @@ class Harvester {
       featureName: aggregateInst.featureName,
       endpointVersion: output.endpointVersion
     });
-    output.ranSend = true;
+    output.ranSend = true; // Set to true if we attempted to send (even if send() returned false due to missing errorBeacon in tests)
+
     return output;
 
     /**

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

@@ -24,7 +24,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
   constructor(agentRef) {
     super(agentRef, _constants.FEATURE_NAME);
     (0, _denyList.setDenyList)(agentRef.runtime.denyList);
-    this.underSpaEvents = {};
     const classThis = this;
     if (!agentRef.init.ajax.block_internal) {
       // if the agent is tracking ITSELF, it can spawn endless ajax requests early if they are large from custom attributes, so we just disable early harvest for ajax in this case.
@@ -32,20 +31,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     } else {
       super.customAttributesAreSeparate = true;
     }
-
-    // --- v Used by old spa feature
-    this.ee.on('interactionDone', (interaction, wasSaved) => {
-      if (!this.underSpaEvents[interaction.id]) return;
-      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
-        this.underSpaEvents[interaction.id].forEach(item => this.events.add(item));
-      }
-      delete this.underSpaEvents[interaction.id];
-    });
-    // --- ^
-    // --- v Used by new soft nav
     (0, _registerHandler.registerHandler)('returnAjax', event => this.events.add(event), this.featureName, this.ee);
-    // --- ^
     (0, _registerHandler.registerHandler)('xhr', function () {
       // the EE-drain system not only switches "this" but also passes a new EventContext with info. Should consider platform refactor to another system which passes a mutable context around separately and predictably to avoid problems like this.
       classThis.storeXhr(...arguments, this); // this switches the context back to the class instance while passing the NR context as an argument -- see "ctx" in storeXhr
@@ -116,13 +102,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (event.gql) this.reportSupportabilityMetric('Ajax/Events/GraphQL/Bytes-Added', (0, _stringify.stringify)(event.gql).length);
     const softNavInUse = Boolean(this.agentRef.features?.[_features.FEATURE_NAMES.softNav]);
     if (softNavInUse) {
-      // For newer soft nav (when running), pass the event w/ info to it for evaluation -- either part of an interaction or is given back
+      // when SN is running, pass the event w/ info to it for evaluation -- either part of an interaction or is given back
       (0, _handle.handle)('ajax', [event, ctx], undefined, _features.FEATURE_NAMES.softNav, this.ee);
-    } else if (ctx.spaNode) {
-      // For old spa (when running), if the ajax happened inside an interaction, hold it until the interaction finishes
-      const interactionId = ctx.spaNode.interaction.id;
-      this.underSpaEvents[interactionId] ??= [];
-      this.underSpaEvents[interactionId].push(event);
     } else {
       this.events.add(event);
     }

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

@@ -39,14 +39,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.stackReported = {};
     this.observedAt = {};
     this.pageviewReported = {};
-    this.bufferedErrorsUnderSpa = {};
     this.errorOnPage = false;
-
-    // this will need to change to match whatever ee we use in the instrument
-    this.ee.on('interactionDone', (interaction, wasSaved) => this.onInteractionDone(interaction, wasSaved));
     (0, _registerHandler.registerHandler)('err', (...args) => this.storeError(...args), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('ierr', (...args) => this.storeError(...args), this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('softNavFlush', (interactionId, wasFinished, softNavAttrs, interactionEndTime) => this.onSoftNavNotification(interactionId, wasFinished, softNavAttrs, interactionEndTime), this.featureName, this.ee); // when an ixn is done or cancelled
+    (0, _registerHandler.registerHandler)('returnJserror', (jsErrorEvent, softNavAttrs) => this.#storeJserrorForHarvest(jsErrorEvent, softNavAttrs), this.featureName, this.ee);
 
     // 0 == off, 1 == on
     this.waitForFlags(['err']).then(([errFlag]) => {
@@ -193,43 +189,26 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     if (this.shouldAllowMainAgentToCapture(target)) {
       const softNavInUse = Boolean(this.agentRef.features?.[_features.FEATURE_NAMES.softNav]);
-      // Note: the following are subject to potential race cond wherein if the other feature aren't fully initialized, it'll be treated as there being no associated interaction.
-      // They each will also tack on their respective properties to the params object as part of the decision flow.
-      if (softNavInUse) (0, _handle.handle)('jserror', [params, time], undefined, _features.FEATURE_NAMES.softNav, this.ee);else (0, _handle.handle)('spa-jserror', jsErrorEvent, undefined, _features.FEATURE_NAMES.spa, this.ee);
-      if (params.browserInteractionId && !params._softNavFinished) {
-        // hold onto the error until the in-progress interaction is done, eithered saved or discarded
-        this.bufferedErrorsUnderSpa[params.browserInteractionId] ??= [];
-        this.bufferedErrorsUnderSpa[params.browserInteractionId].push(jsErrorEvent);
-      } else if (params._interactionId != null) {
-        // same as above, except tailored for the way old spa does it
-        this.bufferedErrorsUnderSpa[params._interactionId] = this.bufferedErrorsUnderSpa[params._interactionId] || [];
-        this.bufferedErrorsUnderSpa[params._interactionId].push(jsErrorEvent);
+      if (softNavInUse) {
+        // pass the error to soft nav for evaluation - it will return it via 'returnJserror' when interaction is resolved
+        (0, _handle.handle)('jserror', [jsErrorEvent], undefined, _features.FEATURE_NAMES.softNav, this.ee);
       } else {
-        // Either there is no interaction (then all these params properties will be undefined) OR there's a related soft navigation that's already completed.
-        // The old spa does not look up completed interactions at all, so there's no need to consider it.
-        this.#storeJserrorForHarvest(jsErrorEvent, params.browserInteractionId !== undefined, params._softNavAttributes);
+        this.#storeJserrorForHarvest(jsErrorEvent, false);
       }
     }
 
     // always add directly if scoped to a sub-entity, the other pathways above will be deterministic if the main agent should procede
     if (target) this.#storeJserrorForHarvest([...jsErrorEvent, target], false, params._softNavAttributes);
   }
-  #storeJserrorForHarvest(errorInfoArr, softNavOccurredFinished, softNavCustomAttrs = {}) {
+  #storeJserrorForHarvest(errorInfoArr, softNavCustomAttrs = {}) {
     let [type, bucketHash, params, newMetrics, localAttrs, target] = errorInfoArr;
     const allCustomAttrs = {
       /** MFE specific attributes if in "multiple" mode (ie consumer version 2) */
       ...(0, _mfe.getVersion2Attributes)(target, this)
     };
-    if (softNavOccurredFinished) {
-      Object.entries(softNavCustomAttrs).forEach(([k, v]) => setCustom(k, v)); // when an ixn finishes, it'll include stuff in jsAttributes + attrs specific to the ixn
-      bucketHash += params.browserInteractionId;
-      delete params._softNavAttributes; // cleanup temp properties from synchronous evaluation; this is harmless when async from soft nav (properties DNE)
-      delete params._softNavFinished;
-    } else {
-      // interaction was cancelled -> error should not be associated OR there was no interaction
-      Object.entries(this.agentRef.info.jsAttributes).forEach(([k, v]) => setCustom(k, v));
-      delete params.browserInteractionId;
-    }
+    Object.entries(this.agentRef.info.jsAttributes).forEach(([k, v]) => setCustom(k, v));
+    Object.entries(softNavCustomAttrs).forEach(([k, v]) => setCustom(k, v)); // when an ixn finishes, it'll pass attrs specific to the ixn; if no associated ixn, this defaults to empty
+    if (params.browserInteractionId) bucketHash += params.browserInteractionId;
     if (localAttrs) Object.entries(localAttrs).forEach(([k, v]) => setCustom(k, v)); // local custom attrs are applied in either case with the highest precedence
 
     const jsAttributesHash = (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(allCustomAttrs));
@@ -249,42 +228,5 @@ class Aggregate extends _aggregateBase.AggregateBase {
   shouldAllowMainAgentToCapture(target) {
     return !target || this.agentRef.init.api.duplicate_registered_data;
   }
-
-  // TO-DO: Remove this function when old spa is taken out. #storeJserrorForHarvest handles the work with the softnav feature.
-  onInteractionDone(interaction, wasSaved) {
-    if (!this.bufferedErrorsUnderSpa[interaction.id] || this.blocked) return;
-    this.bufferedErrorsUnderSpa[interaction.id].forEach(item => {
-      var allCustomAttrs = {};
-      const localCustomAttrs = item[4];
-      Object.entries(interaction.root.attrs.custom || {}).forEach(setCustom); // tack on custom attrs from the interaction
-      Object.entries(localCustomAttrs || {}).forEach(setCustom);
-      var params = item[2];
-      if (wasSaved) {
-        params.browserInteractionId = interaction.root.attrs.id;
-        if (params._interactionNodeId) params.parentNodeId = params._interactionNodeId.toString();
-      }
-      delete params._interactionId;
-      delete params._interactionNodeId;
-      var hash = wasSaved ? item[1] + interaction.root.attrs.id : item[1];
-      var jsAttributesHash = (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(allCustomAttrs));
-      var aggregateHash = hash + ':' + jsAttributesHash;
-      this.events.add([item[0], aggregateHash, params, item[3], allCustomAttrs], item[5]);
-      function setCustom([key, val]) {
-        allCustomAttrs[key] = val && typeof val === 'object' ? (0, _stringify.stringify)(val) : val;
-      }
-    });
-    delete this.bufferedErrorsUnderSpa[interaction.id];
-  }
-  onSoftNavNotification(interactionId, wasFinished, softNavAttrs, interactionEndTime) {
-    if (this.blocked) return;
-    this.bufferedErrorsUnderSpa[interactionId]?.forEach(jsErrorEvent => {
-      // this should not modify the re-used softNavAttrs contents
-      if (!wasFinished) return this.#storeJserrorForHarvest(jsErrorEvent, false, softNavAttrs);
-      const startTime = jsErrorEvent[3].time; // in storeError fn, the newMetrics obj contains the time passed to & used by SN to seek the ixn
-      if (startTime > interactionEndTime) return this.#storeJserrorForHarvest(jsErrorEvent, false, softNavAttrs); // disassociate any error that ultimately falls outside the final ixn span
-      return this.#storeJserrorForHarvest(jsErrorEvent, true, softNavAttrs);
-    });
-    delete this.bufferedErrorsUnderSpa[interactionId]; // wipe the list of jserrors so they aren't duplicated by another call to the same id
-  }
 }
 exports.Aggregate = Aggregate;

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.Aggregate = void 0;
 var _handle = require("../../../common/event-emitter/handle");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
-var _invoke = require("../../../common/util/invoke");
 var _loadTime = require("../../../common/vitals/load-time");
 var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
@@ -193,25 +192,36 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
 
   /**
-   * Decorate the passed-in params obj with properties relating to any associated interaction at the time of the timestamp.
-   * @param {Object} params reference to the local var instance in Jserrors feature's storeError
-   * @param {DOMHighResTimeStamp} timestamp time the jserror occurred
+   * Handles or redirects jserror event based on the interaction, if any, that it's tied to.
+   * @param {Array} jsErrorEvent the error event array from jserrors feature
    */
-  #handleJserror(params, timestamp) {
+  #handleJserror(jsErrorEvent) {
+    const timestamp = jsErrorEvent[3].time; // in storeError fn, the newMetrics obj contains the time of the error
     const associatedInteraction = this.getInteractionFor(timestamp);
-    if (!associatedInteraction) return; // do not need to decorate this jserror params
+    if (!associatedInteraction) {
+      // No interaction was happening when this error occurred, so give it back to jserrors feature for processing
+      return (0, _handle.handle)('returnJserror', [jsErrorEvent], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+    }
 
-    // Whether the interaction is in-progress or already finished, the id will let jserror buffer it under its index, until it gets the next step instruction.
-    params.browserInteractionId = associatedInteraction.id;
+    // Store the error info to be returned when interaction finishes
     if (associatedInteraction.status === _constants.INTERACTION_STATUS.FIN) {
-      // This information cannot be relayed back via handle() that flushes buffered errs because this is being called by a jserror's handle() per se and before the err is buffered.
-      params._softNavFinished = true; // instead, signal that this err can be processed right away without needing to be buffered aka wait for an in-progress ixn
-      params._softNavAttributes = associatedInteraction.customAttributes;
+      // Interaction already finished, return immediately with the interaction ID and attributes
+      processJserror.call(this, jsErrorEvent, associatedInteraction);
     } else {
-      // These callbacks may be added multiple times for an ixn, but just a single run will deal with all jserrors associated with the interaction.
-      // As such, be cautious not to use the params object since that's tied to one specific jserror and won't affect the rest of them.
-      associatedInteraction.on('finished', (0, _invoke.single)(() => (0, _handle.handle)('softNavFlush', [associatedInteraction.id, true, associatedInteraction.customAttributes, associatedInteraction.end], undefined, _features.FEATURE_NAMES.jserrors, this.ee)));
-      associatedInteraction.on('cancelled', (0, _invoke.single)(() => (0, _handle.handle)('softNavFlush', [associatedInteraction.id, false, undefined], undefined, _features.FEATURE_NAMES.jserrors, this.ee))); // don't take custom attrs from cancelled ixns
+      // Interaction still in progress, wait for it to finish or be cancelled
+      associatedInteraction.on('finished', () => processJserror.call(this, jsErrorEvent, associatedInteraction));
+      associatedInteraction.on('cancelled', () => (0, _handle.handle)('returnJserror', [jsErrorEvent], undefined, _features.FEATURE_NAMES.jserrors, this.ee));
+    }
+    function processJserror(jsErrorEvent, parentInteraction) {
+      const finalEnd = parentInteraction.end;
+      if (timestamp > finalEnd) {
+        // check if error falls within the final interaction span, after any & all long task extension(s) are considered
+        return (0, _handle.handle)('returnJserror', [jsErrorEvent], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
+      }
+      // Error is within the interaction span, return with the correct interaction ID set, plus any custom attributes from the interaction
+      const params = jsErrorEvent[2];
+      params.browserInteractionId = parentInteraction.id;
+      (0, _handle.handle)('returnJserror', [jsErrorEvent, parentInteraction.customAttributes], undefined, _features.FEATURE_NAMES.jserrors, this.ee);
     }
   }
   #registerApiHandlers() {
@@ -226,7 +236,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       if (this.associatedInteraction?.trigger === _constants.IPL_TRIGGER_NAME) this.associatedInteraction = null; // the api get-interaction method cannot target IPL
       if (!this.associatedInteraction) {
         // This new api-driven interaction will be the target of any subsequent .interaction() call, until it is closed by EITHER .end() OR the regular url>dom change process.
-        this.associatedInteraction = thisClass.interactionInProgress = new _interaction.Interaction(_constants.API_TRIGGER_NAME, time, thisClass.latestRouteSetByApi);
+        this.associatedInteraction = thisClass.interactionInProgress = new _interaction.Interaction(_constants.API_TRIGGER_NAME, Math.floor(time), thisClass.latestRouteSetByApi);
         thisClass.domObserver.observe(document.body, {
           attributes: true,
           childList: true,

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

@@ -12,6 +12,11 @@ var _localStorage = require("../../common/storage/local-storage.js");
 var _constants = require("../../common/session/constants");
 var _info = require("../../common/config/info");
 var _attributeSize = require("../../common/util/attribute-size");
+var _handle = require("../../common/event-emitter/handle");
+var _constants2 = require("../../loaders/api/constants");
+var _constants3 = require("../metrics/constants");
+var _features = require("../../loaders/features/features");
+var _sharedHandlers = require("../../loaders/api/sharedHandlers");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -59,6 +64,11 @@ function setupAgentSession(agentRef) {
   (0, _registerHandler.registerHandler)('api-setUserId', (time, key, value) => {
     agentRef.runtime.session.syncCustomAttribute(key, value);
   }, 'session', sharedEE);
+  (0, _registerHandler.registerHandler)('api-setUserIdAndResetSession', value => {
+    agentRef.runtime.session.reset();
+    (0, _handle.handle)(_constants3.SUPPORTABILITY_METRIC_CHANNEL, ['API/' + _constants2.SET_USER_ID + '/resetSession/called'], undefined, _features.FEATURE_NAMES.metrics, sharedEE);
+    (0, _sharedHandlers.appendJsAttribute)(agentRef, 'enduser.id', value, _constants2.SET_USER_ID, true);
+  }, 'session', sharedEE);
   (0, _registerHandler.registerHandler)('api-consent', accept => {
     agentRef.runtime.session.write({
       consent: accept === undefined ? true : accept

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

@@ -143,7 +143,7 @@ class AggregateBase extends _featureBase.FeatureBase {
     (0, _drain.drain)(this.agentIdentifier, this.featureName);
   }
   preHarvestChecks(opts) {
-    return !this.blocked;
+    return !this.blocked && !this.ee.aborted;
   }
 
   /**

package/dist/cjs/interfaces/registered-entity.js

@@ -102,8 +102,9 @@ class RegisteredEntity {
    * Adds a user-defined identifier string to subsequent events on the page for the registered taret.
    * {@link https://docs.newrelic.com/docs/browser/new-relic-browser/browser-apis/setuserid/}
    * @param {string|null} value A string identifier for the end-user, useful for tying all browser events to specific users. The value parameter does not have to be unique. If IDs should be unique, the caller is responsible for that validation. Passing a null value unsets any existing user ID.
+   * @param {boolean} [resetSession=false] Optional param. Should not be used from a registered entity context. To reset a session when updating user id, must be initiated by the main agent.
    */
-  setUserId(value) {
+  setUserId(value, resetSession = false) {
     /** this method will be overset once register is successful */
     (0, _console.warn)(35, 'setUserId');
   }

package/dist/cjs/loaders/agent.js

@@ -21,7 +21,7 @@ var _setApplicationVersion = require("./api/setApplicationVersion");
 var _start = require("./api/start");
 var _consent = require("./api/consent");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -70,7 +70,6 @@ class Agent extends _agentBase.AgentBase {
     // NR1 creates an index on the rum call, and if not seen for a few days, will remove the browser app!
     // Future work is being planned to evaluate removing this behavior from the backend, but for now we must ensure this call is made
     this.desiredFeatures.add(_instrument.Instrument);
-    this.runSoftNavOverSpa = [...this.desiredFeatures].some(instr => instr.featureName === _features.FEATURE_NAMES.softNav);
     (0, _configure.configure)(this, options, options.loaderType || 'agent'); // add api, exposed, and other config properties
 
     /** assign base agent-level API definitions, feature-level APIs will be handled by the features to allow better code-splitting */
@@ -100,8 +99,10 @@ class Agent extends _agentBase.AgentBase {
       featuresToStart.sort((a, b) => _features.featurePriority[a.featureName] - _features.featurePriority[b.featureName]);
       featuresToStart.forEach(InstrumentCtor => {
         if (!enabledFeatures[InstrumentCtor.featureName] && InstrumentCtor.featureName !== _features.FEATURE_NAMES.pageViewEvent) return; // PVE is required to run even if it's marked disabled
-        if (this.runSoftNavOverSpa && InstrumentCtor.featureName === _features.FEATURE_NAMES.spa) return;
-        if (!this.runSoftNavOverSpa && InstrumentCtor.featureName === _features.FEATURE_NAMES.softNav) return;
+        if (InstrumentCtor.featureName === _features.FEATURE_NAMES.spa) {
+          (0, _console.warn)(67);
+          return; // Skip old SPA
+        }
         const dependencies = (0, _featureDependencies.getFeatureDependencyNames)(InstrumentCtor.featureName);
         const missingDependencies = dependencies.filter(featName => !(featName in this.features)); // any other feature(s) this depends on should've been initialized on prior iterations by priority order
         if (missingDependencies.length > 0) {

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

@@ -23,12 +23,12 @@ function setupInteractionAPI(agent) {
   function InteractionHandle() {}
   const InteractionApiProto = InteractionHandle.prototype = {
     createTracer: function (name, cb) {
+      // Primarily used by old SPA feature to create custom child tracers under an interaction.
+      // Soft navigations won't support Tracer nodes, but this fn should still work the same otherwise (e.g., run the orig cb).
       var contextStore = {};
       var ixn = this;
       var hasCb = typeof cb === 'function';
       (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['API/createTracer/called'], undefined, _features.FEATURE_NAMES.metrics, agent.ee);
-      // Soft navigations won't support Tracer nodes, but this fn should still work the same otherwise (e.g., run the orig cb).
-      if (!agent.runSoftNavOverSpa) (0, _handle.handle)(_constants2.spaPrefix + 'tracer', [(0, _now.now)(), name, contextStore], ixn, _features.FEATURE_NAMES.spa, agent.ee);
       return function () {
         tracerEE.emit((hasCb ? '' : 'no-') + 'fn-start', [(0, _now.now)(), ixn, hasCb], contextStore);
         if (hasCb) {
@@ -48,11 +48,11 @@ function setupInteractionAPI(agent) {
   };
   ['actionText', 'setName', 'setAttribute', 'save', 'ignore', 'onEnd', 'getContext', 'end', 'get'].forEach(name => {
     _sharedHandlers.setupAPI.apply(this, [name, function () {
-      (0, _handle.handle)(_constants2.spaPrefix + name, [(0, _now.now)(), ...arguments], this, agent.runSoftNavOverSpa ? _features.FEATURE_NAMES.softNav : _features.FEATURE_NAMES.spa, agent.ee);
+      (0, _handle.handle)(_constants2.spaPrefix + name, [performance.now(), ...arguments], this, _features.FEATURE_NAMES.softNav, agent.ee);
       return this;
     }, agent, InteractionApiProto]);
   });
   (0, _sharedHandlers.setupAPI)(_constants2.SET_CURRENT_ROUTE_NAME, function () {
-    if (agent.runSoftNavOverSpa) (0, _handle.handle)(_constants2.spaPrefix + 'routeName', [performance.now(), ...arguments], undefined, _features.FEATURE_NAMES.softNav, agent.ee);else (0, _handle.handle)(_constants2.prefix + 'routeName', [(0, _now.now)(), ...arguments], this, _features.FEATURE_NAMES.spa, agent.ee);
+    (0, _handle.handle)(_constants2.spaPrefix + 'routeName', [performance.now(), ...arguments], undefined, _features.FEATURE_NAMES.softNav, agent.ee);
   }, agent);
 }

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

@@ -18,7 +18,7 @@ exports.default = void 0;
  * @property {(eventType: string, options?: {start: number, end: number, duration: number, customAttributes: object}) => ({start: number, end: number, duration: number, customAttributes: object})} measure - Measures a task that is recorded as a BrowserPerformance event.
  * @property {(value: string | null) => void} setApplicationVersion - Add an application.version attribute to all outgoing data for the registered entity.
  * @property {(name: string, value: string | number | boolean | null, persist?: boolean) => void} setCustomAttribute - Add a custom attribute to outgoing data for the registered entity.
- * @property {(value: string | null) => void} setUserId - Add an enduser.id attribute to all outgoing API data for the registered entity.
+ * @property {(value: string | null, resetSession?: boolean) => void} setUserId - Add an enduser.id attribute to all outgoing API data for the registered entity.  Note: a registered entity will not be able to initiate a session reset.  It must be done from the main agent.
  * @property {RegisterAPIMetadata} metadata - The metadata object containing the custom attributes and target information for the registered entity.
  */
 /**

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

@@ -7,6 +7,7 @@ exports.setupSetUserIdAPI = setupSetUserIdAPI;
 var _console = require("../../common/util/console");
 var _constants = require("./constants");
 var _sharedHandlers = require("./sharedHandlers");
+var _handle = require("../../common/event-emitter/handle");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -15,14 +16,23 @@ var _sharedHandlers = require("./sharedHandlers");
 function setupSetUserIdAPI(agent) {
   /**
     * Attach the 'enduser.id' attribute onto agent payloads. This may be used in NR queries to group all browser events by specific users.
-    * @param {string} value - unique user identifier; a null user id suggests none should exist
+    * @param {string|null} value - unique user identifier; a null user id suggests none should exist
+   *  @param {boolean} [resetSession=false] - Optional param. When true, resets the current session ONLY when changing user id from an existing value to another value or null. If the current user id is null when calling the API, the session cannot be reset.
     * @returns @see apiCall
     */
-  (0, _sharedHandlers.setupAPI)(_constants.SET_USER_ID, function (value) {
+  (0, _sharedHandlers.setupAPI)(_constants.SET_USER_ID, function (value, resetSession = false) {
     if (!(typeof value === 'string' || value === null)) {
       (0, _console.warn)(41, typeof value);
       return;
     }
-    return (0, _sharedHandlers.appendJsAttribute)(agent, 'enduser.id', value, _constants.SET_USER_ID, true);
+    const currUser = agent.info.jsAttributes['enduser.id'];
+
+    // reset session ONLY if we are updating the userid (from one value to another, or from a value to null/undefined)
+    const shouldAttemptReset = resetSession && currUser !== undefined && currUser !== null && currUser !== value;
+    if (shouldAttemptReset) {
+      (0, _handle.handle)(_constants.prefix + 'setUserIdAndResetSession', [value], undefined, 'session', agent.ee);
+    } else {
+      (0, _sharedHandlers.appendJsAttribute)(agent, 'enduser.id', value, _constants.SET_USER_ID, true);
+    }
   }, agent);
 }

package/dist/cjs/loaders/api-base.js

@@ -89,9 +89,10 @@ class ApiBase {
    * Adds a user-defined identifier string to subsequent events on the page.
    * {@link https://docs.newrelic.com/docs/browser/new-relic-browser/browser-apis/setuserid/}
    * @param {string|null} value A string identifier for the end-user, useful for tying all browser events to specific users. The value parameter does not have to be unique. If IDs should be unique, the caller is responsible for that validation. Passing a null value unsets any existing user ID.
+   * @param {boolean} [resetSession=false] Optional param. When true, resets the current session ONLY when changing user id from an existing value to another value or null. If the current user id is null when calling the API, the session cannot be reset.
    */
-  setUserId(value) {
-    return this.#callMethod(_constants.SET_USER_ID, value);
+  setUserId(value, resetSession = false) {
+    return this.#callMethod(_constants.SET_USER_ID, value, resetSession);
   }
 
   /**

package/dist/cjs/loaders/browser-agent.js

@@ -11,13 +11,12 @@ var _instrument3 = require("../features/metrics/instrument");
 var _instrument4 = require("../features/jserrors/instrument");
 var _instrument5 = require("../features/ajax/instrument");
 var _instrument6 = require("../features/session_trace/instrument");
-var _instrument7 = require("../features/spa/instrument");
-var _instrument8 = require("../features/session_replay/instrument");
-var _instrument9 = require("../features/generic_events/instrument");
-var _instrument0 = require("../features/logging/instrument");
-var _instrument1 = require("../features/soft_navigations/instrument");
+var _instrument7 = require("../features/session_replay/instrument");
+var _instrument8 = require("../features/generic_events/instrument");
+var _instrument9 = require("../features/logging/instrument");
+var _instrument0 = require("../features/soft_navigations/instrument");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -32,7 +31,7 @@ class BrowserAgent extends _agent.Agent {
   constructor(options) {
     super({
       ...options,
-      features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument3.Instrument, _instrument4.Instrument, _instrument7.Instrument, _instrument1.Instrument, _instrument8.Instrument, _instrument9.Instrument, _instrument0.Instrument],
+      features: [_instrument5.Instrument, _instrument.Instrument, _instrument2.Instrument, _instrument6.Instrument, _instrument3.Instrument, _instrument4.Instrument, _instrument0.Instrument, _instrument7.Instrument, _instrument8.Instrument, _instrument9.Instrument],
       loaderType: 'browser-agent'
     });
   }

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

@@ -62,9 +62,6 @@ function configure(agent, opts = {}, loaderType, forceDrain) {
     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);
-
-    // Update if soft_navigations is allowed to run AND part of this agent build, used to override old spa functions.
-    agent.runSoftNavOverSpa &&= updatedInit.soft_navigations.enabled === true && updatedInit.feature_flags.includes('soft_nav');
   }
   runtime.denyList = [...(updatedInit.ajax.deny_list || []), ...(updatedInit.ajax.block_internal ? internalTrafficList : [])];
   runtime.ptid = agent.agentIdentifier;

package/dist/esm/cdn/spa.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
  */
 
@@ -16,11 +16,9 @@ import { Instrument as InstrumentXhr } from '../features/ajax/instrument';
 import { Instrument as InstrumentSessionTrace } from '../features/session_trace/instrument';
 import { Instrument as InstrumentSessionReplay } from '../features/session_replay/instrument';
 import { Instrument as InstrumentSoftNav } from '../features/soft_navigations/instrument';
-import { Instrument as InstrumentSpa } from '../features/spa/instrument';
 import { Instrument as InstrumentGenericEvents } from '../features/generic_events/instrument';
 import { Instrument as InstrumentLogs } from '../features/logging/instrument';
 new Agent({
-  features: [InstrumentXhr, InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentSessionReplay, InstrumentMetrics, InstrumentErrors, InstrumentGenericEvents, InstrumentLogs, InstrumentSoftNav, InstrumentSpa // 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
-  ],
+  features: [InstrumentXhr, InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentSessionReplay, InstrumentMetrics, InstrumentErrors, InstrumentGenericEvents, InstrumentLogs, InstrumentSoftNav],
   loaderType: 'spa'
 });