@newrelic/browser-agent 1.313.1-rc.2 → 1.313.1-rc.4

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.313.1-rc.2";
+const VERSION = exports.VERSION = "1.313.1-rc.4";
 
 /**
  * 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.313.1-rc.2";
+const VERSION = exports.VERSION = "1.313.1-rc.4";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/dom/selector-path.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.analyzeElemPath = void 0;
+var _utils = require("../v2/utils");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -18,12 +19,16 @@ exports.analyzeElemPath = void 0;
  *
  * @param {HTMLElement} elem
  * @param {Array<string>} [targetFields=[]] specifies which fields to gather from the nearest element in the path
- * @returns {{path: (undefined|string), nearestFields: {}, hasButton: boolean, hasLink: boolean}}
+ * @returns {{path: (undefined|string), nearestFields: {}, targets: Array, hasButton: boolean, hasLink: boolean}}
  */
-const analyzeElemPath = (elem, targetFields = []) => {
+const analyzeElemPath = (elem, targetFields = [], agentRef) => {
+  const targets = [];
   const result = {
     path: undefined,
     nearestFields: {},
+    get targets() {
+      return targets.length ? targets : [undefined];
+    },
     hasButton: false,
     hasLink: false
   };
@@ -46,6 +51,10 @@ const analyzeElemPath = (elem, targetFields = []) => {
       targetFields.forEach(field => {
         result.nearestFields[nearestAttrName(field)] ||= elem[field]?.baseVal || elem[field];
       });
+      const dataAttrs = elem?.dataset;
+      if (dataAttrs.nrMfeId) {
+        targets.push(...(0, _utils.getRegisteredTargetsFromId)(dataAttrs.nrMfeId, agentRef));
+      }
       pathSelector = buildPathSelector(elem, pathSelector);
       elem = elem.parentNode;
     }

package/dist/cjs/common/timing/time-keeper.js

@@ -45,14 +45,19 @@ class TimeKeeper {
    * @type {boolean}
    */
   #ready = false;
-  #reportedDrift = false;
+
+  /**
+   * The total measured drift in milliseconds. Represents how much performance.now()
+   * has fallen behind Date.now(), which is used to correct timestamp conversions.
+   * @type {number}
+   */
+  #measuredDrift = 0;
   constructor(sessionObj) {
     this.#session = sessionObj;
     this.processStoredDiff();
     (0, _monkeyPatched.isNative)(performance.now, Date.now); // will warn the user if these are not native functions.  We need these to be native for time in the agent to be accurate in general.
   }
   #detectDrift() {
-    if (this.#reportedDrift) return;
     try {
       // Drift detection: measures if performance.now() and Date.now() have become desynchronized
       // This can happen when a machine sleeps and the performance timer freezes while Date continues
@@ -63,8 +68,13 @@ class TimeKeeper {
       // Note: localTimeDiff (server time offset) is NOT part of drift - that's a legitimate offset
       const drift = Date.now() - _runtime.originTime - performance.now();
       if (drift > 1000) {
-        this.#reportedDrift = true;
-        (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Generic/TimeKeeper/ClockDrift/Detected', drift], undefined, _features.FEATURE_NAMES.metrics, this.#session.agentRef.ee);
+        // Check if this is new drift (increase of >1000ms from last measurement)
+        const newDrift = drift - this.#measuredDrift;
+        if (newDrift > 1000) {
+          // Update measured drift and report it
+          this.#measuredDrift = drift;
+          if (this.#session) (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Generic/TimeKeeper/ClockDrift/Detected', drift], undefined, _features.FEATURE_NAMES.metrics, this.#session.agentRef.ee);
+        }
       }
     } catch (err) {
       // Silently ignore drift detection errors to avoid breaking normal operation
@@ -115,7 +125,8 @@ class TimeKeeper {
    */
   convertRelativeTimestamp(relativeTime) {
     this.#detectDrift();
-    return _runtime.originTime + relativeTime;
+    // Add measured drift to compensate for performance.now() falling behind
+    return _runtime.originTime + relativeTime + this.#measuredDrift;
   }
 
   /**
@@ -126,7 +137,8 @@ class TimeKeeper {
    */
   convertAbsoluteTimestamp(timestamp) {
     this.#detectDrift();
-    return timestamp - _runtime.originTime;
+    // Subtract measured drift since we're converting from absolute to relative
+    return timestamp - _runtime.originTime - this.#measuredDrift;
   }
 
   /**

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

@@ -61,7 +61,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       }
       let addUserAction = () => {/** no-op */};
       if (_runtime.isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.#userActionAggregator = new _userActionsAggregator.UserActionsAggregator();
+        this.#userActionAggregator = new _userActionsAggregator.UserActionsAggregator(this.agentRef);
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.#userActionAggregator.aggregationEvent);
         addUserAction = aggregatedUserAction => {
           try {
@@ -73,56 +73,58 @@ class Aggregate extends _aggregateBase.AggregateBase {
                 timeStamp,
                 type
               } = aggregatedUserAction.event;
-              const userActionEvent = {
-                eventType: 'UserAction',
-                timestamp: this.#toEpoch(timeStamp),
-                action: type,
-                actionCount: aggregatedUserAction.count,
-                actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
-                actionMs: aggregatedUserAction.relativeMs,
-                rageClick: aggregatedUserAction.rageClick,
-                target: aggregatedUserAction.selectorPath,
-                currentUrl: aggregatedUserAction.currentUrl,
-                ...((0, _iframe.isIFrameWindow)(window) && {
-                  iframe: true
-                }),
-                ...this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
-                  /** prevent us from capturing an obscenely long value */
-                  if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128);
-                  return acc;
-                }, {}),
-                ...aggregatedUserAction.nearestTargetFields,
-                ...(aggregatedUserAction.deadClick && {
-                  deadClick: true
-                }),
-                ...(aggregatedUserAction.errorClick && {
-                  errorClick: true
-                })
-              };
-              this.addEvent(userActionEvent);
-              this.#trackUserActionSM(userActionEvent);
+              aggregatedUserAction.targets.forEach(mfeTarget => {
+                const userActionEvent = {
+                  eventType: 'UserAction',
+                  timestamp: this.#toEpoch(timeStamp),
+                  action: type,
+                  actionCount: aggregatedUserAction.count,
+                  actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
+                  actionMs: aggregatedUserAction.relativeMs,
+                  rageClick: aggregatedUserAction.rageClick,
+                  target: aggregatedUserAction.selectorPath,
+                  currentUrl: aggregatedUserAction.currentUrl,
+                  ...((0, _iframe.isIFrameWindow)(window) && {
+                    iframe: true
+                  }),
+                  ...this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
+                    /** prevent us from capturing an obscenely long value */
+                    if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128);
+                    return acc;
+                  }, {}),
+                  ...aggregatedUserAction.nearestTargetFields,
+                  ...(aggregatedUserAction.deadClick && {
+                    deadClick: true
+                  }),
+                  ...(aggregatedUserAction.errorClick && {
+                    errorClick: true
+                  })
+                };
+                this.addEvent(userActionEvent, mfeTarget);
+                this.#trackUserActionSM(userActionEvent);
 
-              /**
-               * Returns the original target field name with `target` prepended and camelCased
-               * @param {string} originalFieldName
-               * @returns {string} the target field name
-               */
-              function targetAttrName(originalFieldName) {
-                /** preserve original renaming structure for pre-existing field maps */
-                if (originalFieldName === 'tagName') originalFieldName = 'tag';
-                if (originalFieldName === 'className') originalFieldName = 'class';
-                /** return the original field name, cap'd and prepended with target to match formatting */
-                return "target".concat(originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1));
-              }
+                /**
+                * Returns the original target field name with `target` prepended and camelCased
+                * @param {string} originalFieldName
+                * @returns {string} the target field name
+                */
+                function targetAttrName(originalFieldName) {
+                  /** preserve original renaming structure for pre-existing field maps */
+                  if (originalFieldName === 'tagName') originalFieldName = 'tag';
+                  if (originalFieldName === 'className') originalFieldName = 'class';
+                  /** return the original field name, cap'd and prepended with target to match formatting */
+                  return "target".concat(originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1));
+                }
 
-              /**
-               * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
-               * @param {string} attribute The attribute to check for on the target element
-               * @returns {boolean} Whether the target element has the attribute and can be trusted
-               */
-              function canTrustTargetAttribute(attribute) {
-                return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute]);
-              }
+                /**
+                * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
+                * @param {string} attribute The attribute to check for on the target element
+                * @returns {boolean} Whether the target element has the attribute and can be trusted
+                */
+                function canTrustTargetAttribute(attribute) {
+                  return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute]);
+                }
+              });
             }
           } catch (e) {
             // do nothing for now
@@ -322,9 +324,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       timestamp: this.#toEpoch((0, _now.now)()),
       /** all generic events require pageUrl(s) */
       pageUrl: (0, _cleanUrl.cleanURL)('' + _runtime.initialLocation),
-      currentUrl: (0, _cleanUrl.cleanURL)('' + location),
-      /** Specific attributes only supplied if harvesting to endpoint version 2 */
-      ...(0, _utils.getVersion2Attributes)(target, this)
+      currentUrl: (0, _cleanUrl.cleanURL)('' + location)
     };
     const eventAttributes = {
       /** Agent-level custom attributes */
@@ -334,7 +334,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
       /** Event-specific attributes take precedence over agent-level custom attributes and fallbacks */
       ...obj
     };
-    this.events.add(eventAttributes);
+    this.events.add({
+      ...eventAttributes,
+      ...(0, _utils.getVersion2Attributes)(target, this)
+    });
+    if ((0, _utils.shouldDuplicate)(target, this.agentRef)) this.addEvent({
+      ...eventAttributes,
+      ...(0, _utils.getVersion2DuplicationAttributes)(target, this)
+    });
   }
   serializer(eventBuffer) {
     return (0, _traverse.applyFnToProps)({

package/dist/cjs/features/generic_events/aggregate/user-actions/aggregated-user-action.js

@@ -7,7 +7,7 @@ exports.AggregatedUserAction = void 0;
 var _constants = require("../../constants");
 var _cleanUrl = require("../../../../common/url/clean-url");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -23,6 +23,7 @@ class AggregatedUserAction {
     this.currentUrl = (0, _cleanUrl.cleanURL)('' + location);
     this.deadClick = false;
     this.errorClick = false;
+    this.targets = selectorInfo.targets;
   }
 
   /**

package/dist/cjs/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -10,7 +10,7 @@ var _aggregatedUserAction = require("./aggregated-user-action");
 var _timer = require("../../../../common/timer/timer");
 var _nreum = require("../../../../common/window/nreum");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -21,7 +21,8 @@ class UserActionsAggregator {
   #deadClickTimer = undefined;
   #domObserver = undefined;
   #errorClickTimer = undefined;
-  constructor() {
+  constructor(agentRef) {
+    this.agentRef = agentRef;
     if ((0, _nreum.gosNREUMOriginals)().o.MO) {
       this.#domObserver = new MutationObserver(this.isLiveClick.bind(this));
     }
@@ -44,7 +45,7 @@ class UserActionsAggregator {
   process(evt, targetFields) {
     if (!evt) return;
     const targetElem = _constants.OBSERVED_WINDOW_EVENTS.includes(evt.type) ? window : evt.target;
-    const selectorInfo = (0, _selectorPath.analyzeElemPath)(targetElem, targetFields);
+    const selectorInfo = (0, _selectorPath.analyzeElemPath)(targetElem, targetFields, this.agentRef);
 
     // if selectorInfo.path is undefined, aggregation will be skipped for this event
     const aggregationKey = getAggregationKey(evt, selectorInfo.path);

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

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

package/dist/esm/common/dom/selector-path.js

@@ -1,8 +1,10 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { getRegisteredTargetsFromId } from '../v2/utils';
+
 /**
  * Generates a CSS selector path for the given element, if possible.
  * Also gather metadata about the element's nearest fields, and whether there are any links or buttons in the path.
@@ -12,12 +14,16 @@
  *
  * @param {HTMLElement} elem
  * @param {Array<string>} [targetFields=[]] specifies which fields to gather from the nearest element in the path
- * @returns {{path: (undefined|string), nearestFields: {}, hasButton: boolean, hasLink: boolean}}
+ * @returns {{path: (undefined|string), nearestFields: {}, targets: Array, hasButton: boolean, hasLink: boolean}}
  */
-export const analyzeElemPath = (elem, targetFields = []) => {
+export const analyzeElemPath = (elem, targetFields = [], agentRef) => {
+  const targets = [];
   const result = {
     path: undefined,
     nearestFields: {},
+    get targets() {
+      return targets.length ? targets : [undefined];
+    },
     hasButton: false,
     hasLink: false
   };
@@ -40,6 +46,10 @@ export const analyzeElemPath = (elem, targetFields = []) => {
       targetFields.forEach(field => {
         result.nearestFields[nearestAttrName(field)] ||= elem[field]?.baseVal || elem[field];
       });
+      const dataAttrs = elem?.dataset;
+      if (dataAttrs.nrMfeId) {
+        targets.push(...getRegisteredTargetsFromId(dataAttrs.nrMfeId, agentRef));
+      }
       pathSelector = buildPathSelector(elem, pathSelector);
       elem = elem.parentNode;
     }

package/dist/esm/common/timing/time-keeper.js

@@ -39,14 +39,19 @@ export class TimeKeeper {
    * @type {boolean}
    */
   #ready = false;
-  #reportedDrift = false;
+
+  /**
+   * The total measured drift in milliseconds. Represents how much performance.now()
+   * has fallen behind Date.now(), which is used to correct timestamp conversions.
+   * @type {number}
+   */
+  #measuredDrift = 0;
   constructor(sessionObj) {
     this.#session = sessionObj;
     this.processStoredDiff();
     isNative(performance.now, Date.now); // will warn the user if these are not native functions.  We need these to be native for time in the agent to be accurate in general.
   }
   #detectDrift() {
-    if (this.#reportedDrift) return;
     try {
       // Drift detection: measures if performance.now() and Date.now() have become desynchronized
       // This can happen when a machine sleeps and the performance timer freezes while Date continues
@@ -57,8 +62,13 @@ export class TimeKeeper {
       // Note: localTimeDiff (server time offset) is NOT part of drift - that's a legitimate offset
       const drift = Date.now() - originTime - performance.now();
       if (drift > 1000) {
-        this.#reportedDrift = true;
-        handle(SUPPORTABILITY_METRIC_CHANNEL, ['Generic/TimeKeeper/ClockDrift/Detected', drift], undefined, FEATURE_NAMES.metrics, this.#session.agentRef.ee);
+        // Check if this is new drift (increase of >1000ms from last measurement)
+        const newDrift = drift - this.#measuredDrift;
+        if (newDrift > 1000) {
+          // Update measured drift and report it
+          this.#measuredDrift = drift;
+          if (this.#session) handle(SUPPORTABILITY_METRIC_CHANNEL, ['Generic/TimeKeeper/ClockDrift/Detected', drift], undefined, FEATURE_NAMES.metrics, this.#session.agentRef.ee);
+        }
       }
     } catch (err) {
       // Silently ignore drift detection errors to avoid breaking normal operation
@@ -109,7 +119,8 @@ export class TimeKeeper {
    */
   convertRelativeTimestamp(relativeTime) {
     this.#detectDrift();
-    return originTime + relativeTime;
+    // Add measured drift to compensate for performance.now() falling behind
+    return originTime + relativeTime + this.#measuredDrift;
   }
 
   /**
@@ -120,7 +131,8 @@ export class TimeKeeper {
    */
   convertAbsoluteTimestamp(timestamp) {
     this.#detectDrift();
-    return timestamp - originTime;
+    // Subtract measured drift since we're converting from absolute to relative
+    return timestamp - originTime - this.#measuredDrift;
   }
 
   /**

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

@@ -14,7 +14,7 @@ import { applyFnToProps } from '../../../common/util/traverse';
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator';
 import { isIFrameWindow } from '../../../common/dom/iframe';
 import { isPureObject } from '../../../common/util/type-check';
-import { getVersion2Attributes } from '../../../common/v2/utils';
+import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate } from '../../../common/v2/utils';
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME;
   #userActionAggregator;
@@ -54,7 +54,7 @@ export class Aggregate extends AggregateBase {
       }
       let addUserAction = () => {/** no-op */};
       if (isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.#userActionAggregator = new UserActionsAggregator();
+        this.#userActionAggregator = new UserActionsAggregator(this.agentRef);
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.#userActionAggregator.aggregationEvent);
         addUserAction = aggregatedUserAction => {
           try {
@@ -66,56 +66,58 @@ export class Aggregate extends AggregateBase {
                 timeStamp,
                 type
               } = aggregatedUserAction.event;
-              const userActionEvent = {
-                eventType: 'UserAction',
-                timestamp: this.#toEpoch(timeStamp),
-                action: type,
-                actionCount: aggregatedUserAction.count,
-                actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
-                actionMs: aggregatedUserAction.relativeMs,
-                rageClick: aggregatedUserAction.rageClick,
-                target: aggregatedUserAction.selectorPath,
-                currentUrl: aggregatedUserAction.currentUrl,
-                ...(isIFrameWindow(window) && {
-                  iframe: true
-                }),
-                ...this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
-                  /** prevent us from capturing an obscenely long value */
-                  if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128);
-                  return acc;
-                }, {}),
-                ...aggregatedUserAction.nearestTargetFields,
-                ...(aggregatedUserAction.deadClick && {
-                  deadClick: true
-                }),
-                ...(aggregatedUserAction.errorClick && {
-                  errorClick: true
-                })
-              };
-              this.addEvent(userActionEvent);
-              this.#trackUserActionSM(userActionEvent);
+              aggregatedUserAction.targets.forEach(mfeTarget => {
+                const userActionEvent = {
+                  eventType: 'UserAction',
+                  timestamp: this.#toEpoch(timeStamp),
+                  action: type,
+                  actionCount: aggregatedUserAction.count,
+                  actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
+                  actionMs: aggregatedUserAction.relativeMs,
+                  rageClick: aggregatedUserAction.rageClick,
+                  target: aggregatedUserAction.selectorPath,
+                  currentUrl: aggregatedUserAction.currentUrl,
+                  ...(isIFrameWindow(window) && {
+                    iframe: true
+                  }),
+                  ...this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
+                    /** prevent us from capturing an obscenely long value */
+                    if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128);
+                    return acc;
+                  }, {}),
+                  ...aggregatedUserAction.nearestTargetFields,
+                  ...(aggregatedUserAction.deadClick && {
+                    deadClick: true
+                  }),
+                  ...(aggregatedUserAction.errorClick && {
+                    errorClick: true
+                  })
+                };
+                this.addEvent(userActionEvent, mfeTarget);
+                this.#trackUserActionSM(userActionEvent);
 
-              /**
-               * Returns the original target field name with `target` prepended and camelCased
-               * @param {string} originalFieldName
-               * @returns {string} the target field name
-               */
-              function targetAttrName(originalFieldName) {
-                /** preserve original renaming structure for pre-existing field maps */
-                if (originalFieldName === 'tagName') originalFieldName = 'tag';
-                if (originalFieldName === 'className') originalFieldName = 'class';
-                /** return the original field name, cap'd and prepended with target to match formatting */
-                return "target".concat(originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1));
-              }
+                /**
+                * Returns the original target field name with `target` prepended and camelCased
+                * @param {string} originalFieldName
+                * @returns {string} the target field name
+                */
+                function targetAttrName(originalFieldName) {
+                  /** preserve original renaming structure for pre-existing field maps */
+                  if (originalFieldName === 'tagName') originalFieldName = 'tag';
+                  if (originalFieldName === 'className') originalFieldName = 'class';
+                  /** return the original field name, cap'd and prepended with target to match formatting */
+                  return "target".concat(originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1));
+                }
 
-              /**
-               * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
-               * @param {string} attribute The attribute to check for on the target element
-               * @returns {boolean} Whether the target element has the attribute and can be trusted
-               */
-              function canTrustTargetAttribute(attribute) {
-                return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute]);
-              }
+                /**
+                * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
+                * @param {string} attribute The attribute to check for on the target element
+                * @returns {boolean} Whether the target element has the attribute and can be trusted
+                */
+                function canTrustTargetAttribute(attribute) {
+                  return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute]);
+                }
+              });
             }
           } catch (e) {
             // do nothing for now
@@ -315,9 +317,7 @@ export class Aggregate extends AggregateBase {
       timestamp: this.#toEpoch(now()),
       /** all generic events require pageUrl(s) */
       pageUrl: cleanURL('' + initialLocation),
-      currentUrl: cleanURL('' + location),
-      /** Specific attributes only supplied if harvesting to endpoint version 2 */
-      ...getVersion2Attributes(target, this)
+      currentUrl: cleanURL('' + location)
     };
     const eventAttributes = {
       /** Agent-level custom attributes */
@@ -327,7 +327,14 @@ export class Aggregate extends AggregateBase {
       /** Event-specific attributes take precedence over agent-level custom attributes and fallbacks */
       ...obj
     };
-    this.events.add(eventAttributes);
+    this.events.add({
+      ...eventAttributes,
+      ...getVersion2Attributes(target, this)
+    });
+    if (shouldDuplicate(target, this.agentRef)) this.addEvent({
+      ...eventAttributes,
+      ...getVersion2DuplicationAttributes(target, this)
+    });
   }
   serializer(eventBuffer) {
     return applyFnToProps({

package/dist/esm/features/generic_events/aggregate/user-actions/aggregated-user-action.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { RAGE_CLICK_THRESHOLD_EVENTS, RAGE_CLICK_THRESHOLD_MS } from '../../constants';
@@ -16,6 +16,7 @@ export class AggregatedUserAction {
     this.currentUrl = cleanURL('' + location);
     this.deadClick = false;
     this.errorClick = false;
+    this.targets = selectorInfo.targets;
   }
 
   /**

package/dist/esm/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { analyzeElemPath } from '../../../../common/dom/selector-path';
@@ -14,7 +14,8 @@ export class UserActionsAggregator {
   #deadClickTimer = undefined;
   #domObserver = undefined;
   #errorClickTimer = undefined;
-  constructor() {
+  constructor(agentRef) {
+    this.agentRef = agentRef;
     if (gosNREUMOriginals().o.MO) {
       this.#domObserver = new MutationObserver(this.isLiveClick.bind(this));
     }
@@ -37,7 +38,7 @@ export class UserActionsAggregator {
   process(evt, targetFields) {
     if (!evt) return;
     const targetElem = OBSERVED_WINDOW_EVENTS.includes(evt.type) ? window : evt.target;
-    const selectorInfo = analyzeElemPath(targetElem, targetFields);
+    const selectorInfo = analyzeElemPath(targetElem, targetFields, this.agentRef);
 
     // if selectorInfo.path is undefined, aggregation will be skipped for this event
     const aggregationKey = getAggregationKey(evt, selectorInfo.path);

package/dist/types/common/dom/selector-path.d.ts

@@ -1,6 +1,7 @@
-export function analyzeElemPath(elem: HTMLElement, targetFields?: Array<string>): {
+export function analyzeElemPath(elem: HTMLElement, targetFields?: Array<string>, agentRef: any): {
     path: (undefined | string);
     nearestFields: {};
+    targets: any[];
     hasButton: boolean;
     hasLink: boolean;
 };

package/dist/types/common/dom/selector-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selector-path.d.ts","sourceRoot":"","sources":["../../../../src/common/dom/selector-path.js"],"names":[],"mappings":"AAgBO,sCAJI,WAAW,iBACX,KAAK,CAAC,MAAM,CAAC,GACX;IAAC,IAAI,EAAE,CAAC,SAAS,GAAC,MAAM,CAAC,CAAC;IAAC,aAAa,EAAE,EAAE,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAC,CA2B/F"}
+{"version":3,"file":"selector-path.d.ts","sourceRoot":"","sources":["../../../../src/common/dom/selector-path.js"],"names":[],"mappings":"AAkBO,sCAJI,WAAW,iBACX,KAAK,CAAC,MAAM,CAAC,kBACX;IAAC,IAAI,EAAE,CAAC,SAAS,GAAC,MAAM,CAAC,CAAC;IAAC,aAAa,EAAE,EAAE,CAAC;IAAC,OAAO,QAAQ;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAC,CAkC/G"}

package/dist/types/common/timing/time-keeper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-keeper.d.ts","sourceRoot":"","sources":["../../../../src/common/timing/time-keeper.js"],"names":[],"mappings":"AAUA;;;;GAIG;AACH;IA6BE,6BAIC;IAsBD,qBAEC;IAED,kCAEC;IAED,4BAEC;IAED;;;;;;OAMG;IACH,8BALsB,cAAc,aACf,MAAM,WACR,MAAM,gBACD,MAAM,QAqB7B;IAED;;;;;OAKG;IACH,uCAHwB,MAAM,GACjB,MAAM,CAKlB;IAED;;;;;OAKG;IACH,0CAFa,MAAM,CAKlB;IAED;;;;OAIG;IACH,oCAHqB,MAAM,GACf,MAAM,CAKjB;IAED;;;;OAIG;IACH,uCAHW,mBAAmB,GACjB,MAAM,CAKlB;IAED,+FAA+F;IAC/F,0BASC;;CACF"}
+{"version":3,"file":"time-keeper.d.ts","sourceRoot":"","sources":["../../../../src/common/timing/time-keeper.js"],"names":[],"mappings":"AAUA;;;;GAIG;AACH;IAkCE,6BAIC;IA0BD,qBAEC;IAED,kCAEC;IAED,4BAEC;IAED;;;;;;OAMG;IACH,8BALsB,cAAc,aACf,MAAM,WACR,MAAM,gBACD,MAAM,QAqB7B;IAED;;;;;OAKG;IACH,uCAHwB,MAAM,GACjB,MAAM,CAMlB;IAED;;;;;OAKG;IACH,0CAFa,MAAM,CAMlB;IAED;;;;OAIG;IACH,oCAHqB,MAAM,GACf,MAAM,CAKjB;IAED;;;;OAIG;IACH,uCAHW,mBAAmB,GACjB,MAAM,CAKlB;IAED,+FAA+F;IAC/F,0BASC;;CACF"}

package/dist/types/features/generic_events/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAAiC;IAGjC,2BAqQC;IAnQC,gCAAkG;IAsQpG;;;;;;;;;;;;OAYG;IACH,eAJW,MAAM,YAAC,WACP,MAAM,YAAC,QAmCjB;IAED,qCAEC;IAED;;;MAEC;;CAsBF;8BAjW6B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAAiC;IAGjC,2BAyQC;IAvQC,gCAAkG;IA0QpG;;;;;;;;;;;;OAYG;IACH,eAJW,MAAM,YAAC,WACP,MAAM,YAAC,QAkCjB;IAED,qCAEC;IAED;;;MAEC;;CAsBF;8BApW6B,4BAA4B"}

package/dist/types/features/generic_events/aggregate/user-actions/aggregated-user-action.d.ts

@@ -10,6 +10,7 @@ export class AggregatedUserAction {
     currentUrl: string;
     deadClick: boolean;
     errorClick: boolean;
+    targets: any;
     /**
      * Aggregates the count and maintains the relative MS array for matching events
      * Will determine if a rage click was observed as part of the aggregation

package/dist/types/features/generic_events/aggregate/user-actions/aggregated-user-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregated-user-action.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/aggregated-user-action.js"],"names":[],"mappings":"AAOA;IACE,yCAWC;IAVC,WAAgB;IAChB,cAAc;IACd,iBAAyC;IACzC,qBAAqB;IACrB,kBAAqC;IACrC,+BAA0B;IAC1B,yBAAqD;IACrD,mBAAyC;IACzC,mBAAsB;IACtB,oBAAuB;IAGzB;;;;;OAKG;IACH,eAHW,KAAK,GACH,IAAI,CAMhB;IAED;;;OAGG;IACH,eAFa,OAAO,CAKnB;CACF"}
+{"version":3,"file":"aggregated-user-action.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/aggregated-user-action.js"],"names":[],"mappings":"AAOA;IACE,yCAYC;IAXC,WAAgB;IAChB,cAAc;IACd,iBAAyC;IACzC,qBAAqB;IACrB,kBAAqC;IACrC,+BAA0B;IAC1B,yBAAqD;IACrD,mBAAyC;IACzC,mBAAsB;IACtB,oBAAuB;IACvB,aAAmC;IAGrC;;;;;OAKG;IACH,eAHW,KAAK,GACH,IAAI,CAMhB;IAED;;;OAGG;IACH,eAFa,OAAO,CAKnB;CACF"}

package/dist/types/features/generic_events/aggregate/user-actions/user-actions-aggregator.d.ts

@@ -1,4 +1,6 @@
 export class UserActionsAggregator {
+    constructor(agentRef: any);
+    agentRef: any;
     get aggregationEvent(): AggregatedUserAction | undefined;
     /**
      * Process the event and determine if a new aggregation set should be made or if it should increment the current aggregation

package/dist/types/features/generic_events/aggregate/user-actions/user-actions-aggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-actions-aggregator.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js"],"names":[],"mappings":"AAUA;IAcE,yDAQC;IAED;;;;OAIG;IACH,aAHW,KAAK,sBACH,oBAAoB,GAAC,SAAS,CA2B1C;IAED,yBAKC;IA0CD,oBAEC;;CACF;qCA9GoC,0BAA0B"}
+{"version":3,"file":"user-actions-aggregator.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js"],"names":[],"mappings":"AAUA;IAQE,2BAKC;IAJC,cAAwB;IAM1B,yDAQC;IAED;;;;OAIG;IACH,aAHW,KAAK,sBACH,oBAAoB,GAAC,SAAS,CA2B1C;IAED,yBAKC;IA0CD,oBAEC;;CACF;qCA/GoC,0BAA0B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.313.1-rc.2",
+  "version": "1.313.1-rc.4",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",

package/src/common/dom/selector-path.js

@@ -1,8 +1,10 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { getRegisteredTargetsFromId } from '../v2/utils'
+
 /**
  * Generates a CSS selector path for the given element, if possible.
  * Also gather metadata about the element's nearest fields, and whether there are any links or buttons in the path.
@@ -12,10 +14,11 @@
  *
  * @param {HTMLElement} elem
  * @param {Array<string>} [targetFields=[]] specifies which fields to gather from the nearest element in the path
- * @returns {{path: (undefined|string), nearestFields: {}, hasButton: boolean, hasLink: boolean}}
+ * @returns {{path: (undefined|string), nearestFields: {}, targets: Array, hasButton: boolean, hasLink: boolean}}
  */
-export const analyzeElemPath = (elem, targetFields = []) => {
-  const result = { path: undefined, nearestFields: {}, hasButton: false, hasLink: false }
+export const analyzeElemPath = (elem, targetFields = [], agentRef) => {
+  const targets = []
+  const result = { path: undefined, nearestFields: {}, get targets () { return targets.length ? targets : [undefined] }, hasButton: false, hasLink: false }
   if (!elem) return result
   if (elem === window) { result.path = 'window'; return result }
   if (elem === document) { result.path = 'document'; return result }
@@ -30,6 +33,12 @@ export const analyzeElemPath = (elem, targetFields = []) => {
       result.hasButton ||= tagName === 'button' || (tagName === 'input' && elem.type.toLowerCase() === 'button')
 
       targetFields.forEach(field => { result.nearestFields[nearestAttrName(field)] ||= (elem[field]?.baseVal || elem[field]) })
+
+      const dataAttrs = elem?.dataset
+      if (dataAttrs.nrMfeId) {
+        targets.push(...getRegisteredTargetsFromId(dataAttrs.nrMfeId, agentRef))
+      }
+
       pathSelector = buildPathSelector(elem, pathSelector)
       elem = elem.parentNode
     }

package/src/common/timing/time-keeper.js

@@ -40,7 +40,12 @@ export class TimeKeeper {
    */
   #ready = false
 
-  #reportedDrift = false
+  /**
+   * The total measured drift in milliseconds. Represents how much performance.now()
+   * has fallen behind Date.now(), which is used to correct timestamp conversions.
+   * @type {number}
+   */
+  #measuredDrift = 0
 
   constructor (sessionObj) {
     this.#session = sessionObj
@@ -49,7 +54,6 @@ export class TimeKeeper {
   }
 
   #detectDrift () {
-    if (this.#reportedDrift) return
     try {
       // Drift detection: measures if performance.now() and Date.now() have become desynchronized
       // This can happen when a machine sleeps and the performance timer freezes while Date continues
@@ -60,8 +64,13 @@ export class TimeKeeper {
       // Note: localTimeDiff (server time offset) is NOT part of drift - that's a legitimate offset
       const drift = (Date.now() - originTime) - performance.now()
       if (drift > 1000) {
-        this.#reportedDrift = true
-        handle(SUPPORTABILITY_METRIC_CHANNEL, ['Generic/TimeKeeper/ClockDrift/Detected', drift], undefined, FEATURE_NAMES.metrics, this.#session.agentRef.ee)
+        // Check if this is new drift (increase of >1000ms from last measurement)
+        const newDrift = drift - this.#measuredDrift
+        if (newDrift > 1000) {
+          // Update measured drift and report it
+          this.#measuredDrift = drift
+          if (this.#session) handle(SUPPORTABILITY_METRIC_CHANNEL, ['Generic/TimeKeeper/ClockDrift/Detected', drift], undefined, FEATURE_NAMES.metrics, this.#session.agentRef.ee)
+        }
       }
     } catch (err) {
       // Silently ignore drift detection errors to avoid breaking normal operation
@@ -116,7 +125,8 @@ export class TimeKeeper {
    */
   convertRelativeTimestamp (relativeTime) {
     this.#detectDrift()
-    return originTime + relativeTime
+    // Add measured drift to compensate for performance.now() falling behind
+    return originTime + relativeTime + this.#measuredDrift
   }
 
   /**
@@ -127,7 +137,8 @@ export class TimeKeeper {
    */
   convertAbsoluteTimestamp (timestamp) {
     this.#detectDrift()
-    return timestamp - originTime
+    // Subtract measured drift since we're converting from absolute to relative
+    return timestamp - originTime - this.#measuredDrift
   }
 
   /**

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

@@ -14,7 +14,7 @@ import { applyFnToProps } from '../../../common/util/traverse'
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator'
 import { isIFrameWindow } from '../../../common/dom/iframe'
 import { isPureObject } from '../../../common/util/type-check'
-import { getVersion2Attributes } from '../../../common/v2/utils'
+import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate } from '../../../common/v2/utils'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -61,7 +61,7 @@ export class Aggregate extends AggregateBase {
 
       let addUserAction = () => { /** no-op */ }
       if (isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.#userActionAggregator = new UserActionsAggregator()
+        this.#userActionAggregator = new UserActionsAggregator(this.agentRef)
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.#userActionAggregator.aggregationEvent)
 
         addUserAction = (aggregatedUserAction) => {
@@ -70,50 +70,54 @@ export class Aggregate extends AggregateBase {
              * so we still need to validate that an event was given to this method before we try to add */
             if (aggregatedUserAction?.event) {
               const { target, timeStamp, type } = aggregatedUserAction.event
-              const userActionEvent = {
-                eventType: 'UserAction',
-                timestamp: this.#toEpoch(timeStamp),
-                action: type,
-                actionCount: aggregatedUserAction.count,
-                actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
-                actionMs: aggregatedUserAction.relativeMs,
-                rageClick: aggregatedUserAction.rageClick,
-                target: aggregatedUserAction.selectorPath,
-                currentUrl: aggregatedUserAction.currentUrl,
-                ...(isIFrameWindow(window) && { iframe: true }),
-                ...(this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
+
+              aggregatedUserAction.targets.forEach(mfeTarget => {
+                const userActionEvent = {
+                  eventType: 'UserAction',
+                  timestamp: this.#toEpoch(timeStamp),
+                  action: type,
+                  actionCount: aggregatedUserAction.count,
+                  actionDuration: aggregatedUserAction.relativeMs[aggregatedUserAction.relativeMs.length - 1],
+                  actionMs: aggregatedUserAction.relativeMs,
+                  rageClick: aggregatedUserAction.rageClick,
+                  target: aggregatedUserAction.selectorPath,
+                  currentUrl: aggregatedUserAction.currentUrl,
+                  ...(isIFrameWindow(window) && { iframe: true }),
+                  ...(this.agentRef.init.user_actions.elementAttributes.reduce((acc, field) => {
                   /** prevent us from capturing an obscenely long value */
-                  if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128)
-                  return acc
-                }, {})),
-                ...aggregatedUserAction.nearestTargetFields,
-                ...(aggregatedUserAction.deadClick && { deadClick: true }),
-                ...(aggregatedUserAction.errorClick && { errorClick: true })
-              }
-              this.addEvent(userActionEvent)
-              this.#trackUserActionSM(userActionEvent)
-
-              /**
+                    if (canTrustTargetAttribute(field)) acc[targetAttrName(field)] = String(target[field]).trim().slice(0, 128)
+                    return acc
+                  }, {})),
+                  ...aggregatedUserAction.nearestTargetFields,
+                  ...(aggregatedUserAction.deadClick && { deadClick: true }),
+                  ...(aggregatedUserAction.errorClick && { errorClick: true })
+                }
+                this.addEvent(userActionEvent, mfeTarget)
+
+                this.#trackUserActionSM(userActionEvent)
+
+                /**
                * Returns the original target field name with `target` prepended and camelCased
                * @param {string} originalFieldName
                * @returns {string} the target field name
                */
-              function targetAttrName (originalFieldName) {
+                function targetAttrName (originalFieldName) {
                 /** preserve original renaming structure for pre-existing field maps */
-                if (originalFieldName === 'tagName') originalFieldName = 'tag'
-                if (originalFieldName === 'className') originalFieldName = 'class'
-                /** return the original field name, cap'd and prepended with target to match formatting */
-                return `target${originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1)}`
-              }
+                  if (originalFieldName === 'tagName') originalFieldName = 'tag'
+                  if (originalFieldName === 'className') originalFieldName = 'class'
+                  /** return the original field name, cap'd and prepended with target to match formatting */
+                  return `target${originalFieldName.charAt(0).toUpperCase() + originalFieldName.slice(1)}`
+                }
 
-              /**
+                /**
                * Only trust attributes that exist on HTML element targets, which excludes the window and the document targets
                * @param {string} attribute The attribute to check for on the target element
                * @returns {boolean} Whether the target element has the attribute and can be trusted
                */
-              function canTrustTargetAttribute (attribute) {
-                return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute])
-              }
+                function canTrustTargetAttribute (attribute) {
+                  return !!(aggregatedUserAction.selectorPath !== 'window' && aggregatedUserAction.selectorPath !== 'document' && target instanceof HTMLElement && target?.[attribute])
+                }
+              })
             }
           } catch (e) {
             // do nothing for now
@@ -314,9 +318,7 @@ export class Aggregate extends AggregateBase {
       timestamp: this.#toEpoch(now()),
       /** all generic events require pageUrl(s) */
       pageUrl: cleanURL('' + initialLocation),
-      currentUrl: cleanURL('' + location),
-      /** Specific attributes only supplied if harvesting to endpoint version 2 */
-      ...(getVersion2Attributes(target, this))
+      currentUrl: cleanURL('' + location)
     }
 
     const eventAttributes = {
@@ -328,7 +330,8 @@ export class Aggregate extends AggregateBase {
       ...obj
     }
 
-    this.events.add(eventAttributes)
+    this.events.add({ ...eventAttributes, ...getVersion2Attributes(target, this) })
+    if (shouldDuplicate(target, this.agentRef)) this.addEvent({ ...eventAttributes, ...getVersion2DuplicationAttributes(target, this) })
   }
 
   serializer (eventBuffer) {

package/src/features/generic_events/aggregate/user-actions/aggregated-user-action.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { RAGE_CLICK_THRESHOLD_EVENTS, RAGE_CLICK_THRESHOLD_MS } from '../../constants'
@@ -17,6 +17,7 @@ export class AggregatedUserAction {
     this.currentUrl = cleanURL('' + location)
     this.deadClick = false
     this.errorClick = false
+    this.targets = selectorInfo.targets
   }
 
   /**

package/src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { analyzeElemPath } from '../../../../common/dom/selector-path'
@@ -16,7 +16,8 @@ export class UserActionsAggregator {
   #domObserver = undefined
   #errorClickTimer = undefined
 
-  constructor () {
+  constructor (agentRef) {
+    this.agentRef = agentRef
     if (gosNREUMOriginals().o.MO) {
       this.#domObserver = new MutationObserver(this.isLiveClick.bind(this))
     }
@@ -40,7 +41,7 @@ export class UserActionsAggregator {
   process (evt, targetFields) {
     if (!evt) return
     const targetElem = OBSERVED_WINDOW_EVENTS.includes(evt.type) ? window : evt.target
-    const selectorInfo = analyzeElemPath(targetElem, targetFields)
+    const selectorInfo = analyzeElemPath(targetElem, targetFields, this.agentRef)
 
     // if selectorInfo.path is undefined, aggregation will be skipped for this event
     const aggregationKey = getAggregationKey(evt, selectorInfo.path)