@newrelic/browser-agent 1.316.0 → 1.317.0

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

@@ -11,10 +11,13 @@ var _denyList = require("../../../common/deny-list/deny-list");
 var _constants = require("../constants");
 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");
+var _gql = require("./gql");
+var _payloads = require("../../../common/payloads/payloads");
+var _obfuscate = require("../../../common/util/obfuscate");
 var _utils = require("../../../common/v2/utils");
+var _events = require("../../../common/constants/events");
 var _uniqueId = require("../../../common/ids/unique-id");
 /**
  * Copyright 2020-2026 New Relic, Inc. All rights reserved.
@@ -27,6 +30,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     super(agentRef, _constants.FEATURE_NAME);
     (0, _denyList.setDenyList)(agentRef.runtime.denyList);
     const classThis = this;
+
+    // Create obfuscator for AJAX requests
+    this.obfuscator = new _obfuscate.Obfuscator(agentRef, _events.EVENT_TYPES.AJAX);
     if (!agentRef.init.ajax.block_internal) {
       // if the agent is tracking ITSELF, it can spawn endless ajax requests early if they are large from custom attributes, so we just disable early harvest for ajax in this case.
       super.canHarvestEarly = false;
@@ -91,17 +97,26 @@ class Aggregate extends _aggregateBase.AggregateBase {
       callbackDuration: metrics.cbTime,
       [_constants.AJAX_ID]: (0, _uniqueId.generateUuid)() // all AjaxRequest events should have a unique identifier to allow for easier grouping and analysis in the UI
     };
+    event.gql = params.gql = (0, _gql.parseGQL)({
+      body: ctx.requestBody,
+      query: ctx.parsedOrigin?.search
+    });
+    if (event.gql) event.gql.operationHasErrors = params.gql.operationHasErrors = (0, _gql.hasGQLErrors)(ctx.responseBody);
+    const capturePayloadSetting = this.agentRef.init.ajax.capture_payloads;
+    const shouldCapturePayload = (0, _payloads.canCapturePayload)(capturePayloadSetting, params.status, event.gql?.operationHasErrors);
+    if (shouldCapturePayload) {
+      // Store raw data; obfuscation and truncation will happen in the serializer
+      params.requestQuery = event.requestQuery = (0, _payloads.parseQueryString)(ctx.parsedOrigin?.search);
+      params.requestHeaders = event.requestHeaders = ctx.requestHeaders;
+      params.responseHeaders = event.responseHeaders = ctx.responseHeaders;
+      if ((0, _payloads.isLikelyHumanReadable)(ctx.requestHeaders, ctx.requestBody)) params.requestBody = event.requestBody = ctx.requestBody;
+      if ((0, _payloads.isLikelyHumanReadable)(ctx.responseHeaders, ctx.responseBody)) params.responseBody = event.responseBody = ctx.responseBody;
+    }
     if (ctx.dt) {
       event.spanId = ctx.dt.spanId;
       event.traceId = ctx.dt.traceId;
       event.spanTimestamp = Math.floor(this.agentRef.runtime.timeKeeper.correctAbsoluteTimestamp(ctx.dt.timestamp));
     }
-
-    // parsed from the AJAX body, looking for operationName param & parsing query for operationType
-    event.gql = params.gql = (0, _gql.parseGQL)({
-      body: ctx.body,
-      query: ctx.parsedOrigin?.search
-    });
     if (event.gql) this.reportSupportabilityMetric('Ajax/Events/GraphQL/Bytes-Added', (0, _stringify.stringify)(event.gql).length);
 
     /** make a copy of the event for the MFE target if it exists */
@@ -129,7 +144,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
   serializer(eventBuffer) {
     if (!eventBuffer.length) return;
-    const addString = (0, _belSerializer.getAddStringContext)(this.agentRef.runtime.obfuscator);
+    const {
+      addString,
+      addStringWithTruncation
+    } = (0, _payloads.createStringAdders)(_belSerializer.getAddStringContext, this.obfuscator);
     let payload = 'bel.7;';
     let firstTimestamp = 0;
     for (let i = 0; i < eventBuffer.length; i++) {
@@ -154,15 +172,35 @@ class Aggregate extends _aggregateBase.AggregateBase {
       // Since configuration objects (like info) are created new each time they are set, we have to grab the current pointer to the attr object here.
       const jsAttributes = this.agentRef.info.jsAttributes;
 
-      // add custom attributes
-      // gql decorators are added as custom attributes to alleviate need for new BEL schema
-      const attrParts = (0, _belSerializer.addCustomAttributes)({
+      // Regular attributes: obfuscate only
+      const regularAttrs = (0, _belSerializer.addCustomAttributes)({
         ...(jsAttributes || {}),
-        ...(event.gql || {}),
+        [_constants.AJAX_ID]: event[_constants.AJAX_ID],
+        // all AjaxRequest events should have a unique identifier to allow for easier grouping and analysis in the UI
         ...(event.targetAttributes || {}),
         // used to supply the version 2 attributes, either MFE target or duplication attributes for the main agent app
-        [_constants.AJAX_ID]: event[_constants.AJAX_ID] // all AjaxRequest events should have a unique identifier to allow for easier grouping and analysis in the UI
+        ...(event.gql || {})
       }, addString);
+
+      // Payload attributes: obfuscate then truncate
+      const payloadAttrs = (0, _belSerializer.addCustomAttributes)({
+        ...(event.requestBody ? {
+          requestBody: event.requestBody
+        } : {}),
+        ...(event.requestHeaders ? {
+          requestHeaders: event.requestHeaders
+        } : {}),
+        ...(event.requestQuery ? {
+          requestQuery: event.requestQuery
+        } : {}),
+        ...(event.responseBody ? {
+          responseBody: event.responseBody
+        } : {}),
+        ...(event.responseHeaders ? {
+          responseHeaders: event.responseHeaders
+        } : {})
+      }, addStringWithTruncation);
+      const attrParts = [...regularAttrs, ...payloadAttrs];
       fields.unshift((0, _belSerializer.numeric)(attrParts.length));
       insert += fields.join(',');
       if (attrParts && attrParts.length > 0) {

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FEATURE_NAME = exports.AJAX_ID = void 0;
+exports.FEATURE_NAME = exports.CAPTURE_PAYLOAD_SETTINGS = exports.AJAX_ID = void 0;
 var _features = require("../../loaders/features/features");
 /**
  * Copyright 2020-2026 New Relic, Inc. All rights reserved.
@@ -11,4 +11,9 @@ var _features = require("../../loaders/features/features");
  */
 
 const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.ajax;
+const CAPTURE_PAYLOAD_SETTINGS = exports.CAPTURE_PAYLOAD_SETTINGS = {
+  NONE: 'none',
+  FAILURES: 'failures',
+  ALL: 'all'
+};
 const AJAX_ID = exports.AJAX_ID = 'ajaxRequest.id';

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

@@ -31,6 +31,7 @@ var handlersLen = handlers.length;
 var origRequest = (0, _nreum.gosNREUMOriginals)().o.REQ;
 var origXHR = (0, _nreum.gosNREUMOriginals)().o.XHR;
 const NR_CAT_HEADER = 'X-NewRelic-App-Data';
+const INTERNAL_ERROR = 'internal-error';
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentRef) {
@@ -77,10 +78,12 @@ class Instrument extends _instrumentBase.InstrumentBase {
 }
 exports.Instrument = Instrument;
 function subscribeToEvents(agentRef, ee, handler, dt) {
+  const shouldInterceptPayloads = [_constants.CAPTURE_PAYLOAD_SETTINGS.ALL, _constants.CAPTURE_PAYLOAD_SETTINGS.FAILURES].includes(agentRef.init.ajax?.capture_payloads);
   ee.on('new-xhr', onNewXhr);
   ee.on('open-xhr-start', onOpenXhrStart);
   ee.on('open-xhr-end', onOpenXhrEnd);
   ee.on('send-xhr-start', onSendXhrStart);
+  ee.on('setRequestHeader-xhr-start', onSetRequestHeader);
   ee.on('xhr-cb-time', onXhrCbTime);
   ee.on('xhr-load-added', onXhrLoadAdded);
   ee.on('xhr-load-removed', onXhrLoadRemoved);
@@ -152,6 +155,13 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
       }
     }
   }
+  function onSetRequestHeader(args, xhr) {
+    // args[0] = header name, args[1] = header value
+    if (shouldInterceptPayloads && args.length >= 2) {
+      this.requestHeaders ??= {};
+      this.requestHeaders[args[0].toLowerCase()] = args[1];
+    }
+  }
   function onSendXhrStart(args, xhr) {
     var metrics = this.metrics;
     var data = args[0];
@@ -161,7 +171,7 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
       if (size) metrics.txSize = size;
     }
     this.startTime = (0, _now.now)();
-    this.body = data;
+    this.requestBody = data;
     this.listener = function (evt) {
       try {
         if (evt.type === 'abort' && !context.loadCaptureCalled) {
@@ -170,7 +180,7 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
         if (evt.type !== 'load' || context.called === context.totalCbs && (context.onloadCalled || typeof xhr.onload !== 'function') && typeof context.end === 'function') context.end(xhr);
       } catch (e) {
         try {
-          ee.emit('internal-error', [e]);
+          ee.emit(INTERNAL_ERROR, [e]);
         } catch (err) {
           // do nothing
         }
@@ -298,8 +308,27 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
     addUrl(this, (0, _extractUrl.extractUrl)(target));
     const method = ('' + (target && target instanceof origRequest && target.method || opts.method || 'GET')).toUpperCase();
     this.params.method = method;
-    this.body = opts.body;
-    this.txSize = (0, _dataSize.dataSize)(opts.body) || 0;
+    this.txSize = (0, _dataSize.dataSize)(opts.body || target?.body) || 0;
+
+    // Capture request headers
+    try {
+      var headers = opts.headers || target?.headers;
+      if (shouldInterceptPayloads && headers) {
+        this.requestHeaders ??= {};
+        if (headers instanceof Headers) {
+          headers.forEach(function (value, key) {
+            this.requestHeaders[key.toLowerCase()] = value;
+          }.bind(this));
+        } else if (typeof headers === 'object') {
+          for (var key in headers) {
+            this.requestHeaders[key.toLowerCase()] = headers[key];
+          }
+        }
+      }
+    } catch (e) {
+      // Silently fail if we can't access headers
+    }
+    this.requestBody = opts.body || target?.body;
   }
 
   // we capture failed call as status 0, the actual error is ignored
@@ -310,19 +339,45 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
     if ((0, _denyList.hasUndefinedHostname)(this.params)) return; // don't bother with fetch to url with no hostname
 
     this.params.status = res ? res.status : 0;
+    const finishAndReport = () => {
+      // convert rxSize to a number - handle both string (from content-length header) and number (from fallback)
+      const num = +this.rxSize;
+      const responseSize = this.rxSize != null && !isNaN(num) ? num : undefined;
+      const metrics = {
+        txSize: this.txSize,
+        rxSize: responseSize,
+        duration: this.endTime - this.startTime
+      };
+      const payload = [this.params, metrics, this.startTime, this.endTime, 'fetch'];
+      this.targets.forEach(target => reportToAgg(payload, this, target));
+    };
 
-    // convert rxSize to a number
-    let responseSize;
-    if (typeof this.rxSize === 'string' && this.rxSize.length > 0) {
-      responseSize = +this.rxSize;
+    /** Since accessing fetch bodies is an async process, these are
+     * reasonable conditions to check to not do needless extra work */
+    if (!res || !shouldInterceptPayloads) {
+      finishAndReport();
+      return;
     }
-    const metrics = {
-      txSize: this.txSize,
-      rxSize: responseSize,
-      duration: (0, _now.now)() - this.startTime
-    };
-    const payload = [this.params, metrics, this.startTime, this.endTime, 'fetch'];
-    this.targets.forEach(target => reportToAgg(payload, this, target));
+
+    // Clone the response to read the body without consuming the original
+    res.clone().text().then(text => {
+      this.responseBody = text;
+      // Use captured payload size as fallback if content-length header was missing or is 0 with a body
+      // Only apply fallback for non-network-error responses (status !== 0)
+      if ((!this.rxSize || this.rxSize === '0' || this.rxSize === 0) && text !== undefined && this.params.status !== 0) {
+        this.rxSize = (0, _dataSize.dataSize)(text);
+      }
+      if (res?.headers) {
+        this.responseHeaders = {};
+        res.headers.forEach(function (value, key) {
+          this.responseHeaders[key.toLowerCase()] = value;
+        }.bind(this));
+      }
+    }).catch(err => {
+      ee.emit(INTERNAL_ERROR, [err]);
+    }).finally(() => {
+      finishAndReport();
+    });
   }
 
   // Create report for XHR request that has finished
@@ -337,7 +392,7 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
     if (params.aborted) return;
     if ((0, _denyList.hasUndefinedHostname)(params)) return; // don't bother with XHR of url with no hostname
 
-    metrics.duration = (0, _now.now)() - this.startTime;
+    metrics.duration = this.endTime - this.startTime;
     if (!this.loadCaptureCalled && xhr.readyState === 4) {
       captureXhrData(this, xhr);
     } else if (params.status == null) {
@@ -346,6 +401,25 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
 
     // Always send cbTime, even if no noticeable time was taken.
     metrics.cbTime = this.cbTime;
+    if (shouldInterceptPayloads) {
+      try {
+        this.responseBody = xhr.responseText;
+      } catch (e) {
+        this.responseBody = xhr.response;
+      }
+
+      // Use captured payload size as fallback if not already determined or is 0 with a body
+      // Only apply fallback for non-network-error responses (status !== 0)
+      if ((!metrics.rxSize || metrics.rxSize === 0) && this.responseBody !== undefined && params.status !== 0) {
+        const size = (0, _dataSize.dataSize)(this.responseBody);
+        if (size !== undefined) metrics.rxSize = size;
+      }
+      try {
+        this.responseHeaders = parseResponseHeaders(xhr.getAllResponseHeaders());
+      } catch (err) {
+        ee.emit(INTERNAL_ERROR, [err]);
+      }
+    }
     const payload = [params, metrics, this.startTime, this.endTime, 'xhr'];
     this.targets.forEach(target => reportToAgg(payload, this, target));
   }
@@ -355,7 +429,8 @@ function subscribeToEvents(agentRef, ee, handler, dt) {
   function captureXhrData(ctx, xhr) {
     ctx.params.status = xhr.status;
     var size = (0, _responseSize.responseSizeFromXhr)(xhr, ctx.lastSize);
-    if (size) ctx.metrics.rxSize = size;
+    // Don't set rxSize for network errors (status 0)
+    if (size !== undefined && xhr.status !== 0) ctx.metrics.rxSize = size;
     if (ctx.sameOrigin && xhr.getAllResponseHeaders().indexOf(NR_CAT_HEADER) >= 0) {
       var header = xhr.getResponseHeader(NR_CAT_HEADER);
       if (header) {
@@ -377,4 +452,17 @@ function addUrl(ctx, url) {
   ctx.parsedOrigin = parsed;
   ctx.sameOrigin = parsed.sameOrigin;
 }
+function parseResponseHeaders(headerStr) {
+  const headers = {};
+  if (!headerStr) return headers;
+  headerStr.split('\r\n').forEach(function (line) {
+    const separatorIndex = line.indexOf(': ');
+    if (separatorIndex > 0) {
+      const name = line.substring(0, separatorIndex);
+      const value = line.substring(separatorIndex + 2);
+      headers[name.toLowerCase()] = value;
+    }
+  });
+  return headers;
+}
 const Ajax = exports.Ajax = Instrument;

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

@@ -12,10 +12,11 @@ var _aggregateBase = require("../../utils/aggregate-base");
 var _console = require("../../../common/util/console");
 var _now = require("../../../common/timing/now");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
-var _traverse = require("../../../common/util/traverse");
+var _obfuscate = require("../../../common/util/obfuscate");
 var _userActionsAggregator = require("./user-actions/user-actions-aggregator");
 var _iframe = require("../../../common/dom/iframe");
 var _typeCheck = require("../../../common/util/type-check");
+var _events = require("../../../common/constants/events");
 var _utils = require("../../../common/v2/utils");
 /**
  * Copyright 2020-2026 New Relic, Inc. All rights reserved.
@@ -28,6 +29,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
   constructor(agentRef) {
     super(agentRef, _constants.FEATURE_NAME);
     this.referrerUrl = _runtime.isBrowserScope && document.referrer ? (0, _cleanUrl.cleanURL)(document.referrer) : undefined;
+
+    // Create generic obfuscator (no specific event types) since this feature handles multiple event types
+    // Will check each event's eventType property at runtime against obfuscation rules
+    this.obfuscator = new _obfuscate.Obfuscator(agentRef);
     this.waitForFlags(['ins']).then(([ins]) => {
       if (!ins) {
         this.blocked = true;
@@ -47,7 +52,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
         (0, _registerHandler.registerHandler)('api-addPageAction', (timestamp, name, attributes, target) => {
           this.addEvent({
             ...attributes,
-            eventType: 'PageAction',
+            eventType: _events.EVENT_TYPES.PA,
             timestamp: this.#toEpoch(timestamp),
             timeSinceLoad: timestamp / 1000,
             actionName: name,
@@ -75,7 +80,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
               } = aggregatedUserAction.event;
               aggregatedUserAction.targets.forEach(mfeTarget => {
                 const userActionEvent = {
-                  eventType: 'UserAction',
+                  eventType: _events.EVENT_TYPES.UA,
                   timestamp: this.#toEpoch(timeStamp),
                   action: type,
                   actionCount: aggregatedUserAction.count,
@@ -162,7 +167,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
                     const detailObj = agentRef.init.performance.capture_detail ? createDetailAttrs(entry.detail) : {};
                     this.addEvent({
                       ...detailObj,
-                      eventType: 'BrowserPerformance',
+                      eventType: _events.EVENT_TYPES.BP,
                       timestamp: this.#toEpoch(entry.startTime),
                       entryName: entry.name,
                       entryDuration: entry.duration,
@@ -228,7 +233,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
             this.reportSupportabilityMetric('Generic/Performance/Resource/Seen');
             const event = {
               ...entryObject,
-              eventType: 'BrowserPerformance',
+              eventType: _events.EVENT_TYPES.BP,
               timestamp: this.#toEpoch(entryObject.startTime),
               entryName: (0, _cleanUrl.cleanURL)(name),
               entryDuration: duration,
@@ -248,7 +253,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
         } = args;
         const event = {
           ...customAttributes,
-          eventType: 'BrowserPerformance',
+          eventType: _events.EVENT_TYPES.BP,
           timestamp: this.#toEpoch(start),
           entryName: n,
           entryDuration: duration,
@@ -260,7 +265,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
         (0, _registerHandler.registerHandler)('ws-complete', nrData => {
           const event = {
             ...nrData,
-            eventType: 'WebSocket',
+            eventType: _events.EVENT_TYPES.WS,
             timestamp: this.#toEpoch(nrData.timestamp),
             openedAt: this.#toEpoch(nrData.openedAt),
             closedAt: this.#toEpoch(nrData.closedAt)
@@ -275,7 +280,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       if (!agentRef.init.feature_flags.includes('no_spv')) {
         (0, _registerHandler.registerHandler)('spv', evt => {
           this.addEvent({
-            eventType: 'SecurityPolicyViolation',
+            eventType: _events.EVENT_TYPES.SPV,
             timestamp: this.#toEpoch(evt.timeStamp),
             blockedUri: evt.blockedURI,
             documentUri: evt.documentURI,
@@ -344,9 +349,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     });
   }
   serializer(eventBuffer) {
-    return (0, _traverse.applyFnToProps)({
+    return this.obfuscator.traverseAndObfuscateEvents({
       ins: eventBuffer
-    }, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string');
+    });
   }
   queryStringsBuilder() {
     return {

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

@@ -4,9 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RESERVED_EVENT_TYPES = exports.RAGE_CLICK_THRESHOLD_MS = exports.RAGE_CLICK_THRESHOLD_EVENTS = exports.OBSERVED_WINDOW_EVENTS = exports.OBSERVED_EVENTS = exports.FRUSTRATION_TIMEOUT_MS = exports.FEATURE_NAME = exports.FEATURE_FLAGS = void 0;
+var _events = require("../../common/constants/events");
 var _features = require("../../loaders/features/features");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -16,7 +17,7 @@ const OBSERVED_WINDOW_EVENTS = exports.OBSERVED_WINDOW_EVENTS = ['focus', 'blur'
 const RAGE_CLICK_THRESHOLD_EVENTS = exports.RAGE_CLICK_THRESHOLD_EVENTS = 4;
 const RAGE_CLICK_THRESHOLD_MS = exports.RAGE_CLICK_THRESHOLD_MS = 1000;
 const FRUSTRATION_TIMEOUT_MS = exports.FRUSTRATION_TIMEOUT_MS = 2000;
-const RESERVED_EVENT_TYPES = exports.RESERVED_EVENT_TYPES = ['PageAction', 'UserAction', 'BrowserPerformance'];
+const RESERVED_EVENT_TYPES = exports.RESERVED_EVENT_TYPES = [_events.EVENT_TYPES.PA, _events.EVENT_TYPES.UA, _events.EVENT_TYPES.BP];
 const FEATURE_FLAGS = exports.FEATURE_FLAGS = {
   RESOURCES: 'experimental.resources',
   REGISTER: 'register'

package/dist/cjs/features/jserrors/aggregate/format-stack-trace.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.formatStackTrace = formatStackTrace;
 exports.truncateSize = truncateSize;
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -16,7 +16,7 @@ function formatStackTrace(stackLines) {
   return truncateStackLines(stackLines).replace(stripNewlinesRegex, '');
 }
 
-// takes array of stack lines and returns string with top 50 and buttom 50 lines
+// takes array of stack lines and returns string with top 50 and bottom 50 lines
 function truncateStackLines(stackLines) {
   var stackString;
   if (stackLines.length > 100) {

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

@@ -16,11 +16,12 @@ var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _now = require("../../../common/timing/now");
-var _traverse = require("../../../common/util/traverse");
+var _obfuscate = require("../../../common/util/obfuscate");
 var _internalErrors = require("./internal-errors");
 var _utils = require("../../../common/v2/utils");
 var _causeString = require("./cause-string");
 var _shortCircuit = require("../../../common/util/short-circuit");
+var _events = require("../../../common/constants/events");
 /**
  * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -41,6 +42,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.observedAt = {};
     this.pageviewReported = {};
     this.errorOnPage = false;
+
+    // Create obfuscators for each event type this feature handles
+    this.errorObfuscator = new _obfuscate.Obfuscator(agentRef, _events.EVENT_TYPES.JSE);
+    this.xhrObfuscator = new _obfuscate.Obfuscator(agentRef, _events.EVENT_TYPES.AJAX);
     (0, _registerHandler.registerHandler)('err', this.processError.bind(this), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('ierr', this.processError.bind(this), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('returnJserror', (jsErrorEvent, softNavAttrs) => this.#storeJserrorForHarvest(jsErrorEvent, softNavAttrs), this.featureName, this.ee);
@@ -56,7 +61,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
     });
   }
   serializer(aggregatorTypeToBucketsMap) {
-    return (0, _traverse.applyFnToProps)(aggregatorTypeToBucketsMap, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string');
+    return {
+      err: this.errorObfuscator.traverseAndObfuscateEvents(aggregatorTypeToBucketsMap.err),
+      ierr: this.errorObfuscator.traverseAndObfuscateEvents(aggregatorTypeToBucketsMap.ierr),
+      xhr: this.xhrObfuscator.traverseAndObfuscateEvents(aggregatorTypeToBucketsMap.xhr)
+    };
   }
   queryStringsBuilder(aggregatorTakeReturnedData) {
     const qs = {};
@@ -258,7 +267,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       params.stack_trace = (0, _formatStackTrace.truncateSize)(stackInfo.stackString);
       this.observedAt[bucketHash] = Math.floor(this.agentRef.runtime.timeKeeper.correctRelativeTimestamp(time));
     } else {
-      params.browser_stack_hash = (0, _stringHashCode.stringHashCode)(stackInfo.stackString);
+      params.browser_stack_hash = (0, _stringHashCode.stringHashCode)((0, _formatStackTrace.truncateSize)(stackInfo.stackString));
     }
     params.releaseIds = (0, _stringify.stringify)(this.agentRef.runtime.releaseIds);
 

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

@@ -11,11 +11,12 @@ var _aggregateBase = require("../../utils/aggregate-base");
 var _constants = require("../constants");
 var _log = require("../shared/log");
 var _utils = require("../shared/utils");
-var _traverse = require("../../../common/util/traverse");
+var _obfuscate = require("../../../common/util/obfuscate");
 var _constants2 = require("../../../common/session/constants");
 var _constants3 = require("../../session_replay/constants");
 var _featureGates = require("../../utils/feature-gates");
 var _utils2 = require("../../../common/v2/utils");
+var _events = require("../../../common/constants/events");
 /**
  * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -39,6 +40,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.harvestOpts.raw = true;
     super.customAttributesAreSeparate = true;
 
+    // Create obfuscator for log entries
+    this.obfuscator = new _obfuscate.Obfuscator(agentRef, _events.EVENT_TYPES.LOG);
+
     // The SessionEntity class can emit a message indicating the session was cleared and reset (expiry, inactivity). This feature must abort and never resume if that occurs.
     this.ee.on(_constants2.SESSION_EVENTS.RESET, () => {
       this.abort(_constants3.ABORT_REASONS.RESET);
@@ -119,7 +123,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       common: {
         /** Attributes in the `common` section are added to `all` logs generated in the payload */
         attributes: {
-          ...(0, _traverse.applyFnToProps)(this.agentRef.info.jsAttributes, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string'),
+          ...this.obfuscator.traverseAndObfuscateEvents(this.agentRef.info.jsAttributes),
           ...(this.harvestEndpointVersion === 1 && {
             'entity.guid': this.agentRef.runtime.appMetadata.agents[0].entityGuid,
             appId: this.agentRef.info.applicationID
@@ -144,7 +148,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
         }
       },
       /** logs section contains individual unique log entries */
-      logs: (0, _traverse.applyFnToProps)(eventBuffer, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string')
+      logs: this.obfuscator.traverseAndObfuscateEvents(eventBuffer)
     }];
   }
   queryStringsBuilder() {

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

@@ -14,8 +14,9 @@ var _runtime = require("../../../common/constants/runtime");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _iframe = require("../../../common/dom/iframe");
 var _harvestMetadata = require("./harvest-metadata");
+var _obfuscate = require("../../../common/util/obfuscate");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -28,6 +29,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     super(agentRef, _constants.FEATURE_NAME);
     this.harvestOpts.aggregatorTypes = ['cm', 'sm']; // the types in EventAggregator this feature cares about
 
+    // Create a generic obfuscator for checking if rules are configured
+    this.obfuscator = new _obfuscate.Obfuscator(agentRef);
+
     /** all the harvest metadata metrics need to be evaluated simulataneously at unload time so just temporarily buffer them and dont make SMs immediately from the data */
     this.harvestMetadata = {};
     this.harvestOpts.beforeUnload = () => {

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

@@ -17,11 +17,12 @@ var _firstPaint = require("../../../common/vitals/first-paint");
 var _timeToFirstByte = require("../../../common/vitals/time-to-first-byte");
 var _now = require("../../../common/timing/now");
 var _timeKeeper = require("../../../common/timing/time-keeper");
-var _traverse = require("../../../common/util/traverse");
+var _obfuscate = require("../../../common/util/obfuscate");
 var _harvester = require("../../../common/harvest/harvester");
 var _features = require("../../../loaders/features/features");
 var _submitData = require("../../../common/util/submit-data");
 var _webdriverDetection = require("../../../common/util/webdriver-detection");
+var _events = require("../../../common/constants/events");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  * Copyright 2020-2026 New Relic, Inc. All rights reserved.
@@ -38,6 +39,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.firstByteToWindowLoad = 0; // our "frontend" duration
     this.firstByteToDomContent = 0; // our "dom processing" duration
     this.retries = 0;
+
+    // Create obfuscator for page view events
+    this.obfuscator = new _obfuscate.Obfuscator(agentRef, _events.EVENT_TYPES.PVE);
     agentRef.runtime.timeKeeper = new _timeKeeper.TimeKeeper(agentRef.runtime.session);
     if (_runtime.isBrowserScope) {
       _timeToFirstByte.timeToFirstByte.subscribe(({
@@ -86,12 +90,12 @@ class Aggregate extends _aggregateBase.AggregateBase {
     };
     if (this.agentRef.runtime.session) queryParameters.fsh = Number(this.agentRef.runtime.session.isNew); // "first session harvest" aka RUM request or PageView event of a session
 
-    let body = (0, _traverse.applyFnToProps)({
+    let body = this.obfuscator.traverseAndObfuscateEvents({
       ja: {
         ...customAttributes,
         webdriverDetected: _webdriverDetection.webdriverDetected
       }
-    }, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string');
+    });
     if (_runtime.globalScope.performance) {
       const navTimingEntry = (0, _runtime.getNavigationEntry)();
       if (navTimingEntry) {

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

@@ -10,6 +10,7 @@ var _handle = require("../../../common/event-emitter/handle");
 var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
+var _obfuscate = require("../../../common/util/obfuscate");
 var _cumulativeLayoutShift = require("../../../common/vitals/cumulative-layout-shift");
 var _firstContentfulPaint = require("../../../common/vitals/first-contentful-paint");
 var _firstPaint = require("../../../common/vitals/first-paint");
@@ -22,6 +23,7 @@ var _eventOrigin = require("../../../common/util/event-origin");
 var _loadTime = require("../../../common/vitals/load-time");
 var _webdriverDetection = require("../../../common/util/webdriver-detection");
 var _cleanUrl = require("../../../common/url/clean-url");
+var _events = require("../../../common/constants/events");
 /**
  * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -41,6 +43,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.curSessEndRecorded = false;
     this.firstIxnRecorded = false;
     super.customAttributesAreSeparate = true;
+
+    // Create obfuscator for page view timing events
+    this.obfuscator = new _obfuscate.Obfuscator(agentRef, _events.EVENT_TYPES.PVT);
     (0, _registerHandler.registerHandler)('docHidden', msTimestamp => this.endCurrentSession(msTimestamp), this.featureName, this.ee);
     // Add the time of _window pagehide event_ firing to the next PVT harvest == NRDB windowUnload attr:
     (0, _registerHandler.registerHandler)('winPagehide', msTimestamp => this.addTiming('unload', msTimestamp, null), this.featureName, this.ee);
@@ -146,7 +151,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
   // serialize array of timing data
   serializer(eventBuffer) {
     if (!eventBuffer?.length) return '';
-    var addString = (0, _belSerializer.getAddStringContext)(this.agentRef.runtime.obfuscator);
+    var addString = (0, _belSerializer.getAddStringContext)(this.obfuscator);
     var payload = 'bel.6;';
     for (var i = 0; i < eventBuffer.length; i++) {
       var timing = eventBuffer[i];