@newrelic/browser-agent 1.313.1 → 1.314.0

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

@@ -6,13 +6,14 @@ import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { stringify } from '../../../common/util/stringify'
 import { handle } from '../../../common/event-emitter/handle'
 import { setDenyList, shouldCollectEvent } from '../../../common/deny-list/deny-list'
-import { FEATURE_NAME } from '../constants'
+import { AJAX_ID, FEATURE_NAME } from '../constants'
 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'
 import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate } from '../../../common/v2/utils'
+import { generateUuid } from '../../../common/ids/unique-id'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -91,7 +92,8 @@ export class Aggregate extends AggregateBase {
       type,
       startTime,
       endTime,
-      callbackDuration: metrics.cbTime
+      callbackDuration: metrics.cbTime,
+      [AJAX_ID]: generateUuid() // all AjaxRequest events should have a unique identifier to allow for easier grouping and analysis in the UI
     }
 
     if (ctx.dt) {
@@ -168,7 +170,8 @@ export class Aggregate extends AggregateBase {
       const attrParts = addCustomAttributes({
         ...(jsAttributes || {}),
         ...(event.gql || {}),
-        ...(event.targetAttributes || {}) // used to supply the version 2 attributes, either MFE target or duplication attributes for the main agent app
+        ...(event.targetAttributes || {}), // used to supply the version 2 attributes, either MFE target or duplication attributes for the main agent app
+        [AJAX_ID]: event[AJAX_ID] // all AjaxRequest events should have a unique identifier to allow for easier grouping and analysis in the UI
       }, addString)
 
       fields.unshift(numeric(attrParts.length))

package/src/features/ajax/constants.js

@@ -1,7 +1,9 @@
 /**
- * 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 { FEATURE_NAMES } from '../../loaders/features/features'
 
 export const FEATURE_NAME = FEATURE_NAMES.ajax
+
+export const AJAX_ID = 'ajaxRequest.id'

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)) 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)

package/src/features/session_replay/aggregate/index.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
  */
 /**
@@ -209,6 +209,7 @@ export class Aggregate extends AggregateBase {
   }
 
   makeHarvestPayload () {
+    if (this.isRetrying) return this.recorder.retryPayload
     if (this.mode !== MODE.FULL || this.blocked) return // harvests should only be made in FULL mode, and not if the feature is blocked
     if (this.shouldCompress && !this.gzipper) return // if compression is enabled, but the libraries have not loaded, wait for them to load
     if (!this.recorder || !this.timeKeeper?.ready || !(this.recorder.hasSeenSnapshot && this.recorder.hasSeenMeta)) return // if the recorder or the timekeeper is not ready, or the recorder has not yet seen a snapshot, do not harvest
@@ -239,7 +240,6 @@ export class Aggregate extends AggregateBase {
       return
     }
 
-    // TODO -- Gracefully handle the buffer for retries.
     if (!this.agentRef.runtime.session.state.sessionReplaySentFirstChunk) this.syncWithSessionManager({ sessionReplaySentFirstChunk: true })
     this.recorder.clearBuffer()
 
@@ -247,6 +247,8 @@ export class Aggregate extends AggregateBase {
       warn(59, JSON.stringify(this.agentRef.runtime.session.state))
     }
 
+    this.recorder.retryPayload = payload
+
     return payload
   }
 
@@ -338,9 +340,18 @@ export class Aggregate extends AggregateBase {
   }
 
   postHarvestCleanup (result) {
-    // The mutual decision for now is to stop recording and clear buffers if ingest is experiencing 429 rate limiting
-    if (result.status === 429) {
-      this.abort(ABORT_REASONS.TOO_MANY)
+    if (result.sent) {
+      if (result.retry) {
+        warn(70)
+        this.isRetrying = true
+        this.forceStop()
+      } else {
+        this.recorder.retryPayload = undefined
+        if (this.isRetrying) {
+          this.isRetrying = false
+          this.switchToFull()
+        }
+      }
     }
   }
 

package/src/features/session_replay/constants.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 { MODE } from '../../common/session/constants'

package/src/features/session_replay/shared/recorder.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 { record as recorder } from '@newrelic/rrweb'
@@ -45,6 +45,8 @@ export class Recorder {
     this.events = new RecorderEvents(this.shouldFix)
     /** Backlog used for a 2-part sliding window to guarantee a 15-30s buffer window */
     this.backloggedEvents = new RecorderEvents(this.shouldFix)
+    /** Used to hold the harvest contents to facilitate retrying */
+    this.retryPayload = undefined
     /** Only set to true once a snapshot node has been processed.  Used to block harvests from sending before we know we have a snapshot */
     this.hasSeenSnapshot = false
     this.hasSeenMeta = false

package/src/features/soft_navigations/aggregate/ajax-node.js

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { addCustomAttributes, getAddStringContext, nullable, numeric } from '../../../common/serialize/bel-serializer'
+import { AJAX_ID } from '../../ajax/constants'
 import { NODE_TYPE } from '../constants'
 import { BelNode } from './bel-node'
 
@@ -22,6 +23,7 @@ export class AjaxNode extends BelNode {
     this.spanTimestamp = ajaxEvent.spanTimestamp
     this.gql = ajaxEvent.gql
     this.targetAttributes = ajaxEvent.targetAttributes
+    this[AJAX_ID] = ajaxEvent[AJAX_ID] // all AjaxRequest events should have a unique identifier to allow for easier grouping and analysis in the UI
 
     this.start = ajaxEvent.startTime
     this.end = ajaxEvent.endTime
@@ -55,7 +57,8 @@ export class AjaxNode extends BelNode {
     ]
     let allAttachedNodes = addCustomAttributes({
       ...(this.gql || {}),
-      ...(this.targetAttributes || {})
+      ...(this.targetAttributes || {}),
+      [AJAX_ID]: this[AJAX_ID]
     }, addString)
     this.children.forEach(node => allAttachedNodes.push(node.serialize())) // no children is expected under ajax nodes at this time