@newrelic/browser-agent 1.316.0 → 1.317.0

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 { createStringAdders } from '../../../common/payloads/payloads'
 import { AJAX_ID } from '../../ajax/constants'
 import { NODE_TYPE } from '../constants'
 import { BelNode } from './bel-node'
@@ -25,6 +26,13 @@ export class AjaxNode extends BelNode {
     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
 
+    // optional payload metadata attributes
+    this.requestBody = ajaxEvent.requestBody
+    this.requestHeaders = ajaxEvent.requestHeaders
+    this.requestQuery = ajaxEvent.requestQuery
+    this.responseBody = ajaxEvent.responseBody
+    this.responseHeaders = ajaxEvent.responseHeaders
+
     this.start = ajaxEvent.startTime
     this.end = ajaxEvent.endTime
     if (ajaxContext?.latestLongtaskEnd) {
@@ -33,8 +41,9 @@ export class AjaxNode extends BelNode {
     } else this.callbackEnd = this.end // if no long task was observed, callbackEnd is the same as end
   }
 
-  serialize (parentStartTimestamp, agentRef) {
-    const addString = getAddStringContext(agentRef.runtime.obfuscator)
+  serialize (parentStartTimestamp, agentRef, ajaxObfuscator) {
+    const { addString, addStringWithTruncation } = createStringAdders(getAddStringContext, ajaxObfuscator)
+
     const nodeList = []
 
     // IMPORTANT: The order in which addString is called matters and correlates to the order in which string shows up in the harvest payload. Do not re-order the following code.
@@ -55,11 +64,23 @@ export class AjaxNode extends BelNode {
       addString(this.nodeId),
       nullable(this.spanId, addString, true) + nullable(this.traceId, addString, true) + nullable(this.spanTimestamp, numeric)
     ]
-    let allAttachedNodes = addCustomAttributes({
-      ...(this.gql || {}),
+    // Regular attributes: obfuscate only
+    const regularAttrs = addCustomAttributes({
+      [AJAX_ID]: this[AJAX_ID],
       ...(this.targetAttributes || {}),
-      [AJAX_ID]: this[AJAX_ID]
+      ...(this.gql || {})
     }, addString)
+
+    // Payload attributes: obfuscate then truncate
+    const payloadAttrs = addCustomAttributes({
+      ...(this.requestBody ? { requestBody: this.requestBody } : {}),
+      ...(this.requestHeaders ? { requestHeaders: this.requestHeaders } : {}),
+      ...(this.requestQuery ? { requestQuery: this.requestQuery } : {}),
+      ...(this.responseBody ? { responseBody: this.responseBody } : {}),
+      ...(this.responseHeaders ? { responseHeaders: this.responseHeaders } : {})
+    }, addStringWithTruncation)
+
+    let allAttachedNodes = [...regularAttrs, ...payloadAttrs]
     this.children.forEach(node => allAttachedNodes.push(node.serialize())) // no children is expected under ajax nodes at this time
 
     fields[1] = numeric(allAttachedNodes.length)

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

@@ -8,10 +8,12 @@ import { webdriverDetected } from '../../../common/util/webdriver-detection'
 import { loadTime } from '../../../common/vitals/load-time'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { AggregateBase } from '../../utils/aggregate-base'
+import { Obfuscator } from '../../../common/util/obfuscate'
 import { API_TRIGGER_NAME, FEATURE_NAME, INTERACTION_STATUS, INTERACTION_TRIGGERS, IPL_TRIGGER_NAME, NO_LONG_TASK_WINDOW, POPSTATE_MERGE_WINDOW, POPSTATE_TRIGGER } from '../constants'
 import { AjaxNode } from './ajax-node'
 import { InitialPageLoadInteraction } from './initial-page-load-interaction'
 import { Interaction } from './interaction'
+import { EVENT_TYPES } from '../../../common/constants/events'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -20,6 +22,10 @@ export class Aggregate extends AggregateBase {
 
     super.customAttributesAreSeparate = true
 
+    // Create obfuscators for browser interactions and nested AJAX requests
+    this.interactionObfuscator = new Obfuscator(agentRef, EVENT_TYPES.BI)
+    this.ajaxObfuscator = new Obfuscator(agentRef, EVENT_TYPES.AJAX)
+
     this.interactionsToHarvest = this.events
     this.domObserver = domObserver
 
@@ -86,7 +92,7 @@ export class Aggregate extends AggregateBase {
     let firstIxnStartTime
     const serializedIxnList = []
     for (const interaction of eventBuffer) {
-      serializedIxnList.push(interaction.serialize(firstIxnStartTime, this.agentRef))
+      serializedIxnList.push(interaction.serialize(firstIxnStartTime, this.agentRef, this.interactionObfuscator, this.ajaxObfuscator))
       if (firstIxnStartTime === undefined) firstIxnStartTime = Math.floor(interaction.start) // careful not to match or overwrite on 0 value!
     }
     return `bel.7;${serializedIxnList.join(';')}`

package/src/features/soft_navigations/aggregate/initial-page-load-interaction.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 { navTimingValues } from '../../../common/timing/nav-timing'

package/src/features/soft_navigations/aggregate/interaction.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 { globalScope, initialLocation } from '../../../common/constants/runtime'
@@ -133,11 +133,13 @@ export class Interaction extends BelNode {
    * Serializes (BEL) the interaction data for transmission.
    * @param {Number} firstStartTimeOfPayload timestamp
    * @param {Agent} agentRef Pass in the agent reference directly so that the event itself doesnt need to store the pointers and ruin the evaluation of the event size by including unused object references.
+   * @param {Obfuscator} interactionObfuscator Obfuscator for BrowserInteraction event type
+   * @param {Obfuscator} ajaxObfuscator Obfuscator for AjaxRequest event type (passed to child AjaxNodes)
    * @returns {String} A string that is the serialized representation of this interaction.
    */
-  serialize (firstStartTimeOfPayload, agentRef) {
+  serialize (firstStartTimeOfPayload, agentRef, interactionObfuscator, ajaxObfuscator) {
     const isFirstIxnOfPayload = firstStartTimeOfPayload === undefined
-    const addString = getAddStringContext(agentRef.runtime.obfuscator)
+    const addString = getAddStringContext(interactionObfuscator)
     const nodeList = []
     let ixnType
     if (this.trigger === IPL_TRIGGER_NAME) ixnType = INTERACTION_TYPE.INITIAL_PAGE_LOAD
@@ -170,7 +172,7 @@ export class Interaction extends BelNode {
     /* Querypack encoder+decoder quirkiness:
        - If first ixn node of payload is being processed, its children's start time must be offset by this node's start. (firstStartTime should be undefined.)
        - Else for subsequent ixns in the same payload, we go back to using that first ixn node's start to offset their children's start. */
-    this.children.forEach(node => allAttachedNodes.push(node.serialize(isFirstIxnOfPayload ? this.start : firstStartTimeOfPayload, agentRef))) // recursively add the serialized string of every child of this (ixn) bel node
+    this.children.forEach(node => allAttachedNodes.push(node.serialize(isFirstIxnOfPayload ? this.start : firstStartTimeOfPayload, agentRef, ajaxObfuscator))) // recursively add the serialized string of every child of this (ixn) bel node
 
     fields[1] = numeric(allAttachedNodes.length)
     nodeList.push(fields)

package/src/features/utils/aggregate-base.js

@@ -4,7 +4,6 @@
  */
 import { FeatureBase } from './feature-base'
 import { drain } from '../../common/drain/drain'
-import { Obfuscator } from '../../common/util/obfuscate'
 import { FEATURE_NAMES } from '../../loaders/features/features'
 import { Harvester } from '../../common/harvest/harvester'
 import { EventBuffer } from './event-buffer'
@@ -182,8 +181,7 @@ export class AggregateBase extends FeatureBase {
    * This method should run after checkConfiguration, which may reset the agent's info/runtime object that is used here.
    */
   doOnceForAllAggregate (agentRef) {
-    if (!agentRef.runtime.obfuscator) agentRef.runtime.obfuscator = new Obfuscator(agentRef)
-    this.obfuscator = agentRef.runtime.obfuscator
+    // Note: obfuscator is now created per-feature for their specific event types
 
     if (!agentRef.runtime.harvester) agentRef.runtime.harvester = new Harvester(agentRef)
   }