@newrelic/browser-agent 1.297.1-rc.0 → 1.297.1-rc.2

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

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

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

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

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

@@ -18,6 +18,7 @@ var _bundleId = require("../ids/bundle-id");
  */
 
 const flag = exports.flag = "nr@original:".concat(_bundleId.bundleId);
+const LONG_TASK_THRESHOLD = 50;
 
 /**
  * A convenience alias of `hasOwnProperty`.
@@ -94,7 +95,7 @@ function createWrapperWithEmitter(emitter, always) {
       // Warning: start events may mutate args!
       safeEmit(prefix + 'start', [args, originalThis, methodName], ctx, bubble);
       const fnStartTime = performance.now();
-      let fnEndTime = fnStartTime;
+      let fnEndTime;
       try {
         result = fn.apply(originalThis, args);
         fnEndTime = performance.now();
@@ -108,16 +109,20 @@ function createWrapperWithEmitter(emitter, always) {
       } finally {
         const duration = fnEndTime - fnStartTime;
         const task = {
+          start: fnStartTime,
+          end: fnEndTime,
           duration,
-          isLongTask: duration >= 50,
+          isLongTask: duration >= LONG_TASK_THRESHOLD,
           methodName,
           thrownError
           // could add more properties here later if needed by downstream features
         };
         // standalone long task message
-        if (task.isLongTask) safeEmit('long-task', [task], ctx, bubble);
+        if (task.isLongTask) {
+          safeEmit('long-task', [task, originalThis], ctx, bubble);
+        }
         // -end message also includes the task execution info
-        safeEmit(prefix + 'end', [args, originalThis, result, task], ctx, bubble);
+        safeEmit(prefix + 'end', [args, originalThis, result], ctx, bubble);
       }
     }
   }

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

@@ -13,6 +13,7 @@ var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _gql = require("./gql");
 var _belSerializer = require("../../../common/serialize/bel-serializer");
+var _nreum = require("../../../common/window/nreum");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -49,6 +50,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
       // 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
     }, this.featureName, this.ee);
+    this.ee.on('long-task', (task, originator) => {
+      if (originator instanceof (0, _nreum.gosNREUMOriginals)().o.XHR) {
+        // any time a long task from XHR callback is observed, update the end time for soft nav use
+        const xhrMetadata = this.ee.context(originator);
+        xhrMetadata.latestLongtaskEnd = task.end;
+      }
+    });
     this.waitForFlags([]).then(() => this.drain());
   }
   storeXhr(params, metrics, startTime, endTime, type, ctx) {
@@ -108,8 +116,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 to it for evaluation -- either part of an interaction or is given back
-      (0, _handle.handle)('ajax', [event], undefined, _features.FEATURE_NAMES.softNav, this.ee);
+      // For newer soft nav (when 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;

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

@@ -106,6 +106,7 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
     ctx.loadCaptureCalled = false;
     ctx.params = this.params || {};
     ctx.metrics = this.metrics || {};
+    ctx.latestLongtaskEnd = 0;
     xhr.addEventListener('load', function (event) {
       captureXhrData(ctx, xhr);
     }, (0, _eventListenerOpts.eventListenerOpts)(false));

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

@@ -44,7 +44,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     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) => this.onSoftNavNotification(interactionId, wasFinished, softNavAttrs), this.featureName, this.ee); // when an ixn is done or cancelled
+    (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
 
     this.harvestOpts.aggregatorTypes = ['err', 'ierr', 'xhr']; // the types in EventAggregator this feature cares about
 
@@ -271,10 +271,15 @@ class Aggregate extends _aggregateBase.AggregateBase {
     });
     delete this.bufferedErrorsUnderSpa[interaction.id];
   }
-  onSoftNavNotification(interactionId, wasFinished, softNavAttrs) {
+  onSoftNavNotification(interactionId, wasFinished, softNavAttrs, interactionEndTime) {
     if (this.blocked) return;
-    this.bufferedErrorsUnderSpa[interactionId]?.forEach(jsErrorEvent => this.#storeJserrorForHarvest(jsErrorEvent, wasFinished, softNavAttrs) // this should not modify the re-used softNavAttrs contents
-    );
+    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
   }
 }

package/dist/cjs/features/soft_navigations/aggregate/ajax-node.js

@@ -13,7 +13,7 @@ var _belNode = require("./bel-node");
  */
 
 class AjaxNode extends _belNode.BelNode {
-  constructor(ajaxEvent) {
+  constructor(ajaxEvent, ajaxContext) {
     super();
     this.belType = _constants.NODE_TYPE.AJAX;
     this.method = ajaxEvent.method;
@@ -27,8 +27,12 @@ class AjaxNode extends _belNode.BelNode {
     this.traceId = ajaxEvent.traceId;
     this.spanTimestamp = ajaxEvent.spanTimestamp;
     this.gql = ajaxEvent.gql;
-    this.start = ajaxEvent.startTime; // 5000 --- 5500 --> 10500
+    this.start = ajaxEvent.startTime;
     this.end = ajaxEvent.endTime;
+    if (ajaxContext?.latestLongtaskEnd) {
+      this.callbackEnd = Math.max(ajaxContext.latestLongtaskEnd, this.end); // typically lt end if non-zero, but added clamping to end just in case
+      this.callbackDuration = this.callbackEnd - this.end; // callbackDuration is the time from ajax loaded to last long task observed from it
+    } else this.callbackEnd = this.end; // if no long task was observed, callbackEnd is the same as end
   }
   serialize(parentStartTimestamp, agentRef) {
     const addString = (0, _belSerializer.getAddStringContext)(agentRef.runtime.obfuscator);
@@ -41,7 +45,11 @@ class AjaxNode extends _belNode.BelNode {
     // start relative to parent start (if part of first node in payload) or first parent start
     (0, _belSerializer.numeric)(this.end - this.start),
     // end is relative to start
-    (0, _belSerializer.numeric)(this.callbackEnd), (0, _belSerializer.numeric)(this.callbackDuration), addString(this.method), (0, _belSerializer.numeric)(this.status), addString(this.domain), addString(this.path), (0, _belSerializer.numeric)(this.txSize), (0, _belSerializer.numeric)(this.rxSize), this.requestedWith, addString(this.nodeId), (0, _belSerializer.nullable)(this.spanId, addString, true) + (0, _belSerializer.nullable)(this.traceId, addString, true) + (0, _belSerializer.nullable)(this.spanTimestamp, _belSerializer.numeric)];
+    (0, _belSerializer.numeric)(this.callbackEnd - this.end),
+    // callbackEnd is relative to end
+    (0, _belSerializer.numeric)(this.callbackDuration),
+    // not relative
+    addString(this.method), (0, _belSerializer.numeric)(this.status), addString(this.domain), addString(this.path), (0, _belSerializer.numeric)(this.txSize), (0, _belSerializer.numeric)(this.rxSize), this.requestedWith, addString(this.nodeId), (0, _belSerializer.nullable)(this.spanId, addString, true) + (0, _belSerializer.nullable)(this.traceId, addString, true) + (0, _belSerializer.nullable)(this.spanTimestamp, _belSerializer.numeric)];
     let allAttachedNodes = [];
     if (typeof this.gql === 'object') allAttachedNodes = (0, _belSerializer.addCustomAttributes)(this.gql, addString);
     this.children.forEach(node => allAttachedNodes.push(node.serialize())); // no children is expected under ajax nodes at this time

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

@@ -47,7 +47,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     });
     this.latestRouteSetByApi = null;
     this.interactionInProgress = null; // aside from the "page load" interaction, there can only ever be 1 ongoing at a time
-    this.latestHistoryUrl = null;
+    this.latestHistoryUrl = window.location.href; // the initial url is needed to get a correct oldURL in the case that the first nav is triggered by 'popstate'
     this.harvestOpts.beforeUnload = () => this.interactionInProgress?.done(); // return any withheld ajax or jserr events so they can be sent with EoL harvest
 
     this.waitForFlags(['spa']).then(([spaOn]) => {
@@ -63,14 +63,25 @@ class Aggregate extends _aggregateBase.AggregateBase {
     // By default, a complete UI driven interaction requires event -> URL change -> DOM mod in that exact order.
     (0, _registerHandler.registerHandler)('newUIEvent', event => this.startUIInteraction(event.type, Math.floor(event.timeStamp), event.target), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('newURL', (timestamp, url) => {
-      // In the case of 'popstate' trigger, by the time the event fires, the URL has already changed, so we need to store what-will-be the *previous* URL for oldURL of next popstate ixn.
+      // The newURL always need to be tracked such that it becomes the oldURL of the next potential popstate ixn.
+      // Because for 'popstate' triggered newUIEVent, by the time the event fires, the page URL has already changed so the previous URL is lost if not recorded.
       this.latestHistoryUrl = url;
       this.interactionInProgress?.updateHistory(timestamp, url);
     }, this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('newDom', timestamp => {
       this.interactionInProgress?.updateDom(timestamp);
-      if (this.interactionInProgress?.seenHistoryAndDomChange()) this.interactionInProgress.done();
+      this.interactionInProgress?.checkHistoryAndDomChange();
     }, this.featureName, this.ee);
+    this.ee.on('long-task', task => {
+      if (!this.interactionInProgress?.watchLongtaskTimer) return; // no ixn in progress or it's not yet in a pending-finish state, as indicated by the lack of a watchLongtask timeout
+      clearTimeout(this.interactionInProgress.watchLongtaskTimer);
+      // Provided there isn't another long task, the ixn span will be extended to include this long task that would finish the interaction.
+      this.interactionInProgress.customEnd = task.end;
+      this.interactionInProgress.watchLongtaskTimer = setTimeout(() => this.interactionInProgress.done(), _constants.NO_LONG_TASK_WINDOW);
+
+      // Report metric on frequency of ixn extension due to long task
+      this.reportSupportabilityMetric('SoftNav/Interaction/Extended');
+    });
     this.#registerApiHandlers();
     (0, _registerHandler.registerHandler)('ajax', this.#handleAjaxEvent.bind(this), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('jserror', this.#handleJserror.bind(this), this.featureName, this.ee);
@@ -89,9 +100,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
   startUIInteraction(eventName, startedAt, sourceElem) {
     // this is throttled by instrumentation so that it isn't excessively called
     if (this.interactionInProgress?.createdByApi) return; // api-started interactions cannot be disrupted aka cancelled by UI events (and the vice versa applies as well)
-    if (this.interactionInProgress?.done() === false) return; // current in-progress is blocked from closing, e.g. by 'waitForEnd' api option
+    // Navs from interacting with the document will emit the UI event like click, followed by a popstate which should be squashed given some margin of time. This prevents it from cancelling the first UI ixn.
+    if (eventName === _constants.POPSTATE_TRIGGER && this.interactionInProgress?.trigger !== _constants.POPSTATE_TRIGGER && startedAt - this.interactionInProgress?.start <= _constants.POPSTATE_MERGE_WINDOW) return;
+    if (this.interactionInProgress?.done() === false) return; // current in-progress is blocked from closing if true, e.g. by 'waitForEnd' api option; notice this cancels/finishes existing in-progress ixn
 
-    const oldURL = eventName === _constants.INTERACTION_TRIGGERS[3] ? this.latestHistoryUrl : undefined; // see related comment in 'newURL' handler above, 'popstate'
+    const oldURL = eventName === _constants.POPSTATE_TRIGGER ? this.latestHistoryUrl : undefined; // see related comment in 'newURL' handler above, 'popstate'
     this.interactionInProgress = new _interaction.Interaction(eventName, startedAt, this.latestRouteSetByApi, oldURL);
     if (eventName === _constants.INTERACTION_TRIGGERS[0]) {
       // 'click'
@@ -154,22 +167,30 @@ class Aggregate extends _aggregateBase.AggregateBase {
   /**
    * Handles or redirect ajax event based on the interaction, if any, that it's tied to.
    * @param {Object} event see Ajax feature's storeXhr function for object definition
+   * @param {Object} metadata reference to the ajax context, used to pass long task info
    */
-  #handleAjaxEvent(event) {
+  #handleAjaxEvent(event, metadata) {
     const associatedInteraction = this.getInteractionFor(event.startTime);
     if (!associatedInteraction) {
       // no interaction was happening when this ajax started, so give it back to Ajax feature for processing
       (0, _handle.handle)('returnAjax', [event], undefined, _features.FEATURE_NAMES.ajax, this.ee);
     } else {
-      if (associatedInteraction.status === _constants.INTERACTION_STATUS.FIN) processAjax(event, associatedInteraction); // tack ajax onto the ixn object awaiting harvest
+      if (associatedInteraction.status === _constants.INTERACTION_STATUS.FIN) processAjax.call(this, event, metadata, associatedInteraction); // tack ajax onto the ixn object awaiting harvest
       else {
         // same thing as above, just at a later time -- if the interaction in progress is cancelled, just send the event back to ajax feat unmodified
-        associatedInteraction.on('finished', () => processAjax(event, associatedInteraction));
+        associatedInteraction.on('finished', () => processAjax.call(this, event, metadata, associatedInteraction));
         associatedInteraction.on('cancelled', () => (0, _handle.handle)('returnAjax', [event], undefined, _features.FEATURE_NAMES.ajax, this.ee));
       }
     }
-    function processAjax(event, parentInteraction) {
-      const newNode = new _ajaxNode.AjaxNode(event);
+    function processAjax(event, metadata, parentInteraction) {
+      const finalEnd = parentInteraction.end; // assume: by the time the 'finished' event occurs & this executes, the ixn end time accounts for any long task extension + lookback window exclusion
+      if (event.startTime > finalEnd) {
+        (0, _handle.handle)('returnAjax', [event], undefined, _features.FEATURE_NAMES.ajax, this.ee); // falling outside the final span, returned as standalone
+        return;
+      }
+
+      // Metadata(ctx) should contain any long task end time associated with this XHR which should be up-to-date by the time the in-progress ixn & ajax children are being finalized for harvest.
+      const newNode = new _ajaxNode.AjaxNode(event, metadata);
       parentInteraction.addChild(newNode);
     }
   }
@@ -192,7 +213,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     } 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], undefined, _features.FEATURE_NAMES.jserrors, this.ee)));
+      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
     }
   }
@@ -207,7 +228,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.associatedInteraction = thisClass.getInteractionFor(time);
       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 seenHistoryAndDomChange process.
+        // 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);
         thisClass.domObserver.observe(document.body, {
           attributes: true,
@@ -217,10 +238,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
         }); // start observing for DOM changes like a regular UI-driven interaction
         thisClass.setClosureHandlers();
       }
-      if (waitForEnd === true) this.associatedInteraction.keepOpenUntilEndApi = true;
+      if (waitForEnd === true) {
+        this.associatedInteraction.keepOpenUntilEndApi = true;
+        clearTimeout(this.associatedInteraction.cancellationTimer); // get rid of the auto-cancel 30s timer for UI ixns when users specify waitForEnd manual override
+      }
     }, thisClass.featureName, thisClass.ee);
     (0, _registerHandler.registerHandler)(INTERACTION_API + 'end', function (timeNow) {
-      this.associatedInteraction.done(timeNow);
+      this.associatedInteraction.done(timeNow, true);
     }, thisClass.featureName, thisClass.ee);
     (0, _registerHandler.registerHandler)(INTERACTION_API + 'save', function () {
       this.associatedInteraction.forceSave = true;

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

@@ -35,7 +35,9 @@ class Interaction extends _belNode.BelNode {
   createdByApi = false;
   keepOpenUntilEndApi = false;
   onDone = [];
+  customEnd = 0;
   cancellationTimer;
+  watchLongtaskTimer;
   constructor(uiEvent, uiEventTimestamp, currentRouteKnown, currentUrl) {
     super();
     this.belType = _constants.NODE_TYPE.INTERACTION;
@@ -47,36 +49,48 @@ class Interaction extends _belNode.BelNode {
     if (this.trigger === _constants.API_TRIGGER_NAME) this.createdByApi = true;
     this.newURL = this.oldURL = currentUrl || _runtime.globalScope?.location.href;
   }
-  updateDom(timestamp) {
-    this.domTimestamp = timestamp || (0, _now.now)(); // default timestamp should be precise for accurate isActiveDuring calculations
-  }
   updateHistory(timestamp, newUrl) {
-    this.newURL = newUrl || '' + _runtime.globalScope?.location;
+    if (this.domTimestamp > 0) return; // url is locked once ui>url>dom change sequence is seen
+    if (!newUrl || newUrl === this.oldURL) return; // url must be different for interaction heuristic to proceed
+    this.newURL = newUrl;
     this.historyTimestamp = timestamp || (0, _now.now)();
   }
-  seenHistoryAndDomChange() {
-    return this.historyTimestamp > 0 && this.domTimestamp > this.historyTimestamp; // URL must change before DOM does
+  updateDom(timestamp) {
+    if (!this.historyTimestamp || timestamp < this.historyTimestamp) return; // dom change must come after (any) url change, though this can be updated multiple times, taking the last dom timestamp
+    this.domTimestamp = timestamp || (0, _now.now)(); // default timestamp should be precise for accurate isActiveDuring calculations
+  }
+  checkHistoryAndDomChange() {
+    if (!(this.historyTimestamp > 0 && this.domTimestamp > this.historyTimestamp)) return false;
+    if (this.status === _constants.INTERACTION_STATUS.PF) return true; // indicate the finishing process has already started for this interaction
+    this.status = _constants.INTERACTION_STATUS.PF; // set for eventual harvest
+
+    // Once the fixed reqs for a nav has been met, start a X countdown timer that watches for any long task, if it doesn't already exist, before completing the interaction.
+    clearTimeout(this.cancellationTimer); // "pending-finish" ixns cannot be auto cancelled anymore
+    this.watchLongtaskTimer ??= setTimeout(() => this.done(), _constants.NO_LONG_TASK_WINDOW);
+    // Notice that by not providing a specific end time to `.done()`, the ixn will use the dom timestamp in the event of no long task, which is what we want.
+    return true;
   }
   on(event, cb) {
     if (!this.eventSubscription.has(event)) throw new Error('Cannot subscribe to non pre-defined events.');
     if (typeof cb !== 'function') throw new Error('Must supply function as callback.');
     this.eventSubscription.get(event).push(cb);
   }
-  done(customEndTime) {
-    // User could've mark this interaction--regardless UI or api started--as "don't close until .end() is called on it". Only .end provides a timestamp; the default flows do not.
-    if (this.keepOpenUntilEndApi && customEndTime === undefined) return false;
+  done(customEndTime = this.customEnd, calledByApi = false) {
+    // User could've mark this interaction--regardless UI or api started--as "don't close until .end() is called on it".
+    if (this.keepOpenUntilEndApi && !calledByApi) return false;
     // If interaction is already closed, this is a no-op. However, returning true lets startUIInteraction know that it CAN start a new interaction, as this one is done.
-    if (this.status !== _constants.INTERACTION_STATUS.IP) return true;
+    if (this.status === _constants.INTERACTION_STATUS.FIN || this.status === _constants.INTERACTION_STATUS.CAN) return true;
+    clearTimeout(this.cancellationTimer); // clean up timers in case this is called by any flow that doesn't already do so
+    clearTimeout(this.watchLongtaskTimer);
     this.onDone.forEach(apiProvidedCb => apiProvidedCb(this.customDataByApi)); // this interaction's .save or .ignore can still be set by these user provided callbacks for example
 
     if (this.forceIgnore) this.#cancel(); // .ignore() always has precedence over save actions
-    else if (this.seenHistoryAndDomChange()) this.#finish(customEndTime); // then this should've already finished while it was the interactionInProgress, with a natural end time
+    else if (this.status === _constants.INTERACTION_STATUS.PF) this.#finish(customEndTime); // then this should've already finished while it was the interactionInProgress, with a natural end time
     else if (this.forceSave) this.#finish(customEndTime || performance.now()); // a manually saved ixn (did not fulfill conditions) must have a specified end time, if one wasn't provided
     else this.#cancel();
     return true;
   }
-  #finish(customEndTime = 0) {
-    clearTimeout(this.cancellationTimer);
+  #finish(customEndTime) {
     this.end = Math.max(this.domTimestamp, this.historyTimestamp, customEndTime);
     this.status = _constants.INTERACTION_STATUS.FIN;
 
@@ -85,7 +99,6 @@ class Interaction extends _belNode.BelNode {
     callbacks.forEach(fn => fn());
   }
   #cancel() {
-    clearTimeout(this.cancellationTimer);
     this.status = _constants.INTERACTION_STATUS.CAN;
 
     // Run all the callbacks listening to this interaction's potential cancellation.
@@ -96,12 +109,13 @@ class Interaction extends _belNode.BelNode {
   /**
    * Given a timestamp, determine if it falls within this interaction's span, i.e. if this was the active interaction during that time.
    * For in-progress interactions, this only compares the time with the start of span. Cancelled interactions are not considered active at all.
+   * Pending-finish interactions are also considered still active wrt assigning ajax or jserrors to them during the wait period.
    * @param {DOMHighResTimeStamp} timestamp
    * @returns True or false boolean.
    */
   isActiveDuring(timestamp) {
-    if (this.status === _constants.INTERACTION_STATUS.IP) return this.start <= timestamp;
-    return this.status === _constants.INTERACTION_STATUS.FIN && this.start <= timestamp && this.end > timestamp;
+    if (this.status === _constants.INTERACTION_STATUS.IP || this.status === _constants.INTERACTION_STATUS.PF) return this.start <= timestamp;
+    return this.status === _constants.INTERACTION_STATUS.FIN && this.start <= timestamp && timestamp < this.end;
   }
 
   // Following are virtual properties overridden by a subclass:
@@ -129,10 +143,10 @@ class Interaction extends _belNode.BelNode {
     // the very 1st ixn does not require offset so it should fallback to a 0 while rest is offset by the very 1st ixn's start
     (0, _belSerializer.numeric)(this.end - this.start),
     // end -- relative to start
-    (0, _belSerializer.numeric)(this.callbackEnd),
-    // cbEnd -- relative to start; not used by BrowserInteraction events
-    (0, _belSerializer.numeric)(this.callbackDuration),
-    // not relative
+    (0, _belSerializer.numeric)(0),
+    // callbackEnd -- relative to start; not used by BrowserInteraction events so these are always 0
+    (0, _belSerializer.numeric)(0),
+    // not relative; always 0 for BrowserInteraction
     addString(this.trigger), addString((0, _cleanUrl.cleanURL)(this.initialPageURL, true)), addString((0, _cleanUrl.cleanURL)(this.oldURL, true)), addString((0, _cleanUrl.cleanURL)(this.newURL, true)), addString(this.customName), ixnType, (0, _belSerializer.nullable)(this.queueTime, _belSerializer.numeric, true) + (0, _belSerializer.nullable)(this.appTime, _belSerializer.numeric, true) + (0, _belSerializer.nullable)(this.oldRoute, addString, true) + (0, _belSerializer.nullable)(this.newRoute, addString, true) + addString(this.id), addString(this.nodeId), (0, _belSerializer.nullable)(this.firstPaint, _belSerializer.numeric, true) + (0, _belSerializer.nullable)(this.firstContentfulPaint, _belSerializer.numeric)];
     const customAttributes = {
       ...agentRef.info.jsAttributes,

package/dist/cjs/features/soft_navigations/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.NODE_TYPE = exports.IPL_TRIGGER_NAME = exports.INTERACTION_TYPE = exports.INTERACTION_TRIGGERS = exports.INTERACTION_STATUS = exports.FEATURE_NAME = exports.API_TRIGGER_NAME = void 0;
+exports.POPSTATE_TRIGGER = exports.POPSTATE_MERGE_WINDOW = exports.NO_LONG_TASK_WINDOW = exports.NODE_TYPE = exports.IPL_TRIGGER_NAME = exports.INTERACTION_TYPE = exports.INTERACTION_TRIGGERS = exports.INTERACTION_STATUS = exports.FEATURE_NAME = exports.API_TRIGGER_NAME = void 0;
 var _features = require("../../loaders/features/features");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
@@ -14,13 +14,15 @@ const INTERACTION_TRIGGERS = exports.INTERACTION_TRIGGERS = ['click',
 // e.g. user clicks link or the page back/forward buttons
 'keydown',
 // e.g. user presses left and right arrow key to switch between displayed photo gallery
-'submit',
-// e.g. user clicks submit butotn or presses enter while editing a form field
-'popstate' // history api is used to navigate back and forward
+'submit' // e.g. user clicks submit butotn or presses enter while editing a form field
 ];
+const POPSTATE_TRIGGER = exports.POPSTATE_TRIGGER = 'popstate'; // e.g. user clicks browser back/forward button or history API is used programmatically
 const API_TRIGGER_NAME = exports.API_TRIGGER_NAME = 'api';
 const IPL_TRIGGER_NAME = exports.IPL_TRIGGER_NAME = 'initialPageLoad';
 const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.softNav;
+const NO_LONG_TASK_WINDOW = exports.NO_LONG_TASK_WINDOW = 5000; // purpose is to wait 5 seconds wherein no long task is detected
+const POPSTATE_MERGE_WINDOW = exports.POPSTATE_MERGE_WINDOW = 500; // "coalesce" (discard) a popstate that happen within this period following an INTERACTION_TRIGGER opening ixn, e.g. click->popstate
+
 const INTERACTION_TYPE = exports.INTERACTION_TYPE = {
   INITIAL_PAGE_LOAD: '',
   ROUTE_CHANGE: 1,
@@ -34,6 +36,8 @@ const NODE_TYPE = exports.NODE_TYPE = {
 };
 const INTERACTION_STATUS = exports.INTERACTION_STATUS = {
   IP: 'in progress',
+  PF: 'pending finish',
+  // interaction meets the hard criteria but is awaiting flexible conditions to fully finish
   FIN: 'finished',
   CAN: 'cancelled'
 };

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

@@ -36,19 +36,22 @@ class Instrument extends _instrumentBase.InstrumentBase {
     if (!_runtime.isBrowserScope || !(0, _nreum.gosNREUMOriginals)().o.MO) return; // soft navigations is not supported outside web env or browsers without the mutation observer API
 
     const historyEE = (0, _wrapHistory.wrapHistory)(this.ee);
+    try {
+      this.removeOnAbort = new AbortController();
+    } catch (e) {}
     _constants.INTERACTION_TRIGGERS.forEach(trigger => {
       (0, _eventListenerOpts.windowAddEventListener)(trigger, evt => {
         processUserInteraction(evt);
-      }, true);
+      }, true, this.removeOnAbort?.signal);
     });
     const trackURLChange = () => (0, _handle.handle)('newURL', [(0, _now.now)(), '' + window.location], undefined, this.featureName, this.ee);
     historyEE.on('pushState-end', trackURLChange);
     historyEE.on('replaceState-end', trackURLChange);
-    try {
-      this.removeOnAbort = new AbortController();
-    } catch (e) {}
-    const trackURLChangeEvent = evt => (0, _handle.handle)('newURL', [evt.timeStamp, '' + window.location], undefined, this.featureName, this.ee);
-    (0, _eventListenerOpts.windowAddEventListener)('popstate', trackURLChangeEvent, true, this.removeOnAbort?.signal);
+    (0, _eventListenerOpts.windowAddEventListener)(_constants.POPSTATE_TRIGGER, evt => {
+      // popstate is unique in that it serves as BOTH a UI event and a notification of URL change
+      processUserInteraction(evt);
+      (0, _handle.handle)('newURL', [evt.timeStamp, '' + window.location], undefined, this.featureName, this.ee);
+    }, true, this.removeOnAbort?.signal);
     let oncePerFrame = false; // attempt to reduce dom noice since the observer runs very frequently with below options
     const domObserver = new ((0, _nreum.gosNREUMOriginals)().o.MO)((domChanges, observer) => {
       if (oncePerFrame) return;

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.297.1-rc.0";
+export const VERSION = "1.297.1-rc.2";
 
 /**
  * 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.297.1-rc.0";
+export const VERSION = "1.297.1-rc.2";
 
 /**
  * Exposes the build type of the agent

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

@@ -10,6 +10,7 @@
 import { ee } from '../event-emitter/contextual-ee';
 import { bundleId } from '../ids/bundle-id';
 export const flag = "nr@original:".concat(bundleId);
+const LONG_TASK_THRESHOLD = 50;
 
 /**
  * A convenience alias of `hasOwnProperty`.
@@ -87,7 +88,7 @@ export function createWrapperWithEmitter(emitter, always) {
       // Warning: start events may mutate args!
       safeEmit(prefix + 'start', [args, originalThis, methodName], ctx, bubble);
       const fnStartTime = performance.now();
-      let fnEndTime = fnStartTime;
+      let fnEndTime;
       try {
         result = fn.apply(originalThis, args);
         fnEndTime = performance.now();
@@ -101,16 +102,20 @@ export function createWrapperWithEmitter(emitter, always) {
       } finally {
         const duration = fnEndTime - fnStartTime;
         const task = {
+          start: fnStartTime,
+          end: fnEndTime,
           duration,
-          isLongTask: duration >= 50,
+          isLongTask: duration >= LONG_TASK_THRESHOLD,
           methodName,
           thrownError
           // could add more properties here later if needed by downstream features
         };
         // standalone long task message
-        if (task.isLongTask) safeEmit('long-task', [task], ctx, bubble);
+        if (task.isLongTask) {
+          safeEmit('long-task', [task, originalThis], ctx, bubble);
+        }
         // -end message also includes the task execution info
-        safeEmit(prefix + 'end', [args, originalThis, result, task], ctx, bubble);
+        safeEmit(prefix + 'end', [args, originalThis, result], ctx, bubble);
       }
     }
   }

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

@@ -11,6 +11,7 @@ import { FEATURE_NAMES } from '../../../loaders/features/features';
 import { AggregateBase } from '../../utils/aggregate-base';
 import { parseGQL } from './gql';
 import { nullable, numeric, getAddStringContext, addCustomAttributes } from '../../../common/serialize/bel-serializer';
+import { gosNREUMOriginals } from '../../../common/window/nreum';
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME;
   constructor(agentRef) {
@@ -42,6 +43,13 @@ export class Aggregate extends AggregateBase {
       // 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
     }, this.featureName, this.ee);
+    this.ee.on('long-task', (task, originator) => {
+      if (originator instanceof gosNREUMOriginals().o.XHR) {
+        // any time a long task from XHR callback is observed, update the end time for soft nav use
+        const xhrMetadata = this.ee.context(originator);
+        xhrMetadata.latestLongtaskEnd = task.end;
+      }
+    });
     this.waitForFlags([]).then(() => this.drain());
   }
   storeXhr(params, metrics, startTime, endTime, type, ctx) {
@@ -101,8 +109,8 @@ export class Aggregate extends AggregateBase {
     if (event.gql) this.reportSupportabilityMetric('Ajax/Events/GraphQL/Bytes-Added', stringify(event.gql).length);
     const softNavInUse = Boolean(this.agentRef.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
-      handle('ajax', [event], undefined, FEATURE_NAMES.softNav, this.ee);
+      // For newer soft nav (when running), pass the event w/ info to it for evaluation -- either part of an interaction or is given back
+      handle('ajax', [event, ctx], undefined, 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;

package/dist/esm/features/ajax/instrument/index.js

@@ -98,6 +98,7 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
     ctx.loadCaptureCalled = false;
     ctx.params = this.params || {};
     ctx.metrics = this.metrics || {};
+    ctx.latestLongtaskEnd = 0;
     xhr.addEventListener('load', function (event) {
       captureXhrData(ctx, xhr);
     }, eventListenerOpts(false));

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

@@ -39,7 +39,7 @@ export class Aggregate extends AggregateBase {
     this.ee.on('interactionDone', (interaction, wasSaved) => this.onInteractionDone(interaction, wasSaved));
     register('err', (...args) => this.storeError(...args), this.featureName, this.ee);
     register('ierr', (...args) => this.storeError(...args), this.featureName, this.ee);
-    register('softNavFlush', (interactionId, wasFinished, softNavAttrs) => this.onSoftNavNotification(interactionId, wasFinished, softNavAttrs), this.featureName, this.ee); // when an ixn is done or cancelled
+    register('softNavFlush', (interactionId, wasFinished, softNavAttrs, interactionEndTime) => this.onSoftNavNotification(interactionId, wasFinished, softNavAttrs, interactionEndTime), this.featureName, this.ee); // when an ixn is done or cancelled
 
     this.harvestOpts.aggregatorTypes = ['err', 'ierr', 'xhr']; // the types in EventAggregator this feature cares about
 
@@ -266,10 +266,15 @@ export class Aggregate extends AggregateBase {
     });
     delete this.bufferedErrorsUnderSpa[interaction.id];
   }
-  onSoftNavNotification(interactionId, wasFinished, softNavAttrs) {
+  onSoftNavNotification(interactionId, wasFinished, softNavAttrs, interactionEndTime) {
     if (this.blocked) return;
-    this.bufferedErrorsUnderSpa[interactionId]?.forEach(jsErrorEvent => this.#storeJserrorForHarvest(jsErrorEvent, wasFinished, softNavAttrs) // this should not modify the re-used softNavAttrs contents
-    );
+    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
   }
 }