@newrelic/browser-agent 1.320.0 → 1.320.1

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

@@ -145,6 +145,7 @@ export class Aggregate extends AggregateBase {
     if (!eventBuffer.length) return;
     const {
       addString,
+      addStringRaw,
       addStringWithTruncation
     } = createStringAdders(getAddStringContext, this.obfuscator);
     let payload = 'bel.7;';
@@ -158,11 +159,11 @@ export class Aggregate extends AggregateBase {
       // callbackEnd
       numeric(0),
       // no callbackDuration for non-SPA events
-      addString(event.method), numeric(event.status), addString(event.domain), addString(event.path), numeric(event.requestSize), numeric(event.responseSize), event.type === 'fetch' ? 1 : '', addString(0),
+      addStringRaw(event.method), numeric(event.status), addString(event.domain), addString(event.path), numeric(event.requestSize), numeric(event.responseSize), event.type === 'fetch' ? 1 : '', addStringRaw(0),
       // nodeId
-      nullable(event.spanId, addString, true) +
+      nullable(event.spanId, addStringRaw, true) +
       // guid
-      nullable(event.traceId, addString, true) +
+      nullable(event.traceId, addStringRaw, true) +
       // traceId
       nullable(event.spanTimestamp, numeric, false) // timestamp
       ];
@@ -172,14 +173,21 @@ export class Aggregate extends AggregateBase {
       const jsAttributes = this.agentRef.info.jsAttributes;
 
       // Regular attributes: obfuscate only
-      const regularAttrs = addCustomAttributes({
+      let regularAttrs = addCustomAttributes({
         ...(jsAttributes || {}),
-        [AJAX_ID]: event[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
         ...(event.gql || {})
-      }, addString);
+      }, {
+        addKey: addStringRaw,
+        addVal: addString
+      });
+      regularAttrs.push(...addCustomAttributes({
+        [AJAX_ID]: event[AJAX_ID] // all AjaxRequest events should have a unique identifier to allow for easier grouping and analysis in the UI
+      }, {
+        addKey: addStringRaw,
+        addVal: addStringRaw
+      }));
 
       // Payload attributes: obfuscate then truncate
       const payloadAttrs = addCustomAttributes({
@@ -198,7 +206,10 @@ export class Aggregate extends AggregateBase {
         ...(event.responseHeaders ? {
           responseHeaders: event.responseHeaders
         } : {})
-      }, addStringWithTruncation);
+      }, {
+        addKey: addStringRaw,
+        addVal: addStringWithTruncation
+      });
       const attrParts = [...regularAttrs, ...payloadAttrs];
       fields.unshift(numeric(attrParts.length));
       insert += fields.join(',');

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

@@ -23,6 +23,7 @@ import { loadTime } from '../../../common/vitals/load-time';
 import { webdriverDetected } from '../../../common/util/webdriver-detection';
 import { cleanURL } from '../../../common/url/clean-url';
 import { EVENT_TYPES } from '../../../common/constants/events';
+import { createStringAdders } from '../../../common/payloads/payloads';
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME;
   #handleVitalMetric = ({
@@ -98,6 +99,7 @@ export class Aggregate extends AggregateBase {
     if (name !== VITAL_NAMES.CUMULATIVE_LAYOUT_SHIFT && cumulativeLayoutShift.current.value >= 0) {
       attrs.cls = cumulativeLayoutShift.current.value;
     }
+    attrs.webdriverDetected = webdriverDetected;
     const timing = {
       name,
       value,
@@ -127,15 +129,9 @@ export class Aggregate extends AggregateBase {
       loadState: document.readyState
     });
   }
-  appendGlobalCustomAttributes(timing) {
-    var timingAttributes = timing.attrs || {};
-    var reservedAttributes = ['size', 'eid', 'cls', 'type', 'fid', 'elTag', 'elUrl', 'net-type', 'net-etype', 'net-rtt', 'net-dlink'];
-    Object.entries(this.agentRef.info.jsAttributes || {}).forEach(([key, val]) => {
-      if (reservedAttributes.indexOf(key) < 0) {
-        timingAttributes[key] = val;
-      }
-    });
-    timingAttributes.webdriverDetected = webdriverDetected;
+  #getGlobalCustomAttributes() {
+    const reservedAttributes = ['size', 'eid', 'cls', 'type', 'fid', 'elTag', 'elUrl', 'net-type', 'net-etype', 'net-rtt', 'net-dlink', 'webdriverDetected'];
+    return Object.fromEntries(Object.entries(this.agentRef.info.jsAttributes || {}).filter(([key]) => !reservedAttributes.includes(key)));
   }
   preHarvestChecks() {
     this.checkForFirstInteraction();
@@ -145,15 +141,34 @@ export class Aggregate extends AggregateBase {
   // serialize array of timing data
   serializer(eventBuffer) {
     if (!eventBuffer?.length) return '';
-    var addString = getAddStringContext(this.obfuscator);
+    const {
+      addString,
+      addStringRaw
+    } = createStringAdders(getAddStringContext, this.obfuscator);
+    const keepOrigValue = {
+      addKey: addStringRaw,
+      addVal: addStringRaw
+    };
+    const obfuscateValue = {
+      addKey: addStringRaw,
+      addVal: addString
+    };
     var payload = 'bel.6;';
     for (var i = 0; i < eventBuffer.length; i++) {
       var timing = eventBuffer[i];
       payload += 'e,';
-      payload += addString(timing.name) + ',';
+      payload += addStringRaw(timing.name) + ',';
       payload += nullable(timing.value, numeric, false) + ',';
-      this.appendGlobalCustomAttributes(timing);
-      var attrParts = addCustomAttributes(timing.attrs, addString);
+      const userAttrs = this.#getGlobalCustomAttributes();
+      const {
+        pageUrl,
+        ...systemReservedAttrs
+      } = timing.attrs || {};
+      var attrParts = addCustomAttributes(systemReservedAttrs, keepOrigValue);
+      attrParts.push(...addCustomAttributes(userAttrs, obfuscateValue));
+      if (pageUrl) attrParts.push(...addCustomAttributes({
+        pageUrl
+      }, obfuscateValue));
       if (attrParts && attrParts.length > 0) {
         payload += numeric(attrParts.length) + ';' + attrParts.join(';');
       }

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

@@ -41,6 +41,7 @@ export class AjaxNode extends BelNode {
   serialize(parentStartTimestamp, agentRef, ajaxObfuscator) {
     const {
       addString,
+      addStringRaw,
       addStringWithTruncation
     } = createStringAdders(getAddStringContext, ajaxObfuscator);
     const nodeList = [];
@@ -56,13 +57,21 @@ export class AjaxNode extends BelNode {
     // callbackEnd is relative to end
     numeric(this.callbackDuration),
     // not relative
-    addString(this.method), numeric(this.status), addString(this.domain), addString(this.path), numeric(this.txSize), numeric(this.rxSize), this.requestedWith, addString(this.nodeId), nullable(this.spanId, addString, true) + nullable(this.traceId, addString, true) + nullable(this.spanTimestamp, numeric)];
+    addStringRaw(this.method), numeric(this.status), addString(this.domain), addString(this.path), numeric(this.txSize), numeric(this.rxSize), this.requestedWith, addStringRaw(this.nodeId), nullable(this.spanId, addStringRaw, true) + nullable(this.traceId, addStringRaw, true) + nullable(this.spanTimestamp, numeric)];
     // Regular attributes: obfuscate only
     const regularAttrs = addCustomAttributes({
-      [AJAX_ID]: this[AJAX_ID],
       ...(this.targetAttributes || {}),
       ...(this.gql || {})
-    }, addString);
+    }, {
+      addKey: addStringRaw,
+      addVal: addString
+    });
+    regularAttrs.push(...addCustomAttributes({
+      [AJAX_ID]: this[AJAX_ID]
+    }, {
+      addKey: addStringRaw,
+      addVal: addStringRaw
+    }));
 
     // Payload attributes: obfuscate then truncate
     const payloadAttrs = addCustomAttributes({
@@ -81,7 +90,10 @@ export class AjaxNode extends BelNode {
       ...(this.responseHeaders ? {
         responseHeaders: this.responseHeaders
       } : {})
-    }, addStringWithTruncation);
+    }, {
+      addKey: addStringRaw,
+      addVal: addStringWithTruncation
+    });
     let allAttachedNodes = [...regularAttrs, ...payloadAttrs];
     this.children.forEach(node => allAttachedNodes.push(node.serialize())); // no children is expected under ajax nodes at this time
 

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

@@ -9,6 +9,7 @@ import { now } from '../../../common/timing/now';
 import { cleanURL } from '../../../common/url/clean-url';
 import { NODE_TYPE, INTERACTION_STATUS, INTERACTION_TYPE, API_TRIGGER_NAME, IPL_TRIGGER_NAME, NO_LONG_TASK_WINDOW } from '../constants';
 import { BelNode } from './bel-node';
+import { createStringAdders } from '../../../common/payloads/payloads';
 
 /**
  * link https://github.com/newrelic/nr-querypack/blob/main/schemas/bel/7.qpschema
@@ -127,7 +128,10 @@ export class Interaction extends BelNode {
    */
   serialize(firstStartTimeOfPayload, agentRef, interactionObfuscator, ajaxObfuscator) {
     const isFirstIxnOfPayload = firstStartTimeOfPayload === undefined;
-    const addString = getAddStringContext(interactionObfuscator);
+    const {
+      addString,
+      addStringRaw
+    } = createStringAdders(getAddStringContext, interactionObfuscator);
     const nodeList = [];
     let ixnType;
     if (this.trigger === IPL_TRIGGER_NAME) ixnType = INTERACTION_TYPE.INITIAL_PAGE_LOAD;else if (this.newURL !== this.oldURL) ixnType = INTERACTION_TYPE.ROUTE_CHANGE;else ixnType = INTERACTION_TYPE.UNSPECIFIED;
@@ -143,12 +147,15 @@ export class Interaction extends BelNode {
     // callbackEnd -- relative to start; not used by BrowserInteraction events so these are always 0
     numeric(0),
     // not relative; always 0 for BrowserInteraction
-    addString(this.trigger), addString(cleanURL(this.initialPageURL, true)), addString(cleanURL(this.oldURL, true)), addString(cleanURL(this.newURL, true)), addString(this.customName), ixnType, nullable(this.queueTime, numeric, true) + nullable(this.appTime, numeric, true) + nullable(this.oldRoute, addString, true) + nullable(this.newRoute, addString, true) + addString(this.id), addString(this.nodeId), nullable(this.firstPaint, numeric, true) + nullable(this.firstContentfulPaint, numeric)];
+    addStringRaw(this.trigger), addString(cleanURL(this.initialPageURL, true)), addString(cleanURL(this.oldURL, true)), addString(cleanURL(this.newURL, true)), addString(this.customName), ixnType, nullable(this.queueTime, numeric, true) + nullable(this.appTime, numeric, true) + nullable(this.oldRoute, addString, true) + nullable(this.newRoute, addString, true) + addStringRaw(this.id), addStringRaw(this.nodeId), nullable(this.firstPaint, numeric, true) + nullable(this.firstContentfulPaint, numeric)];
     const customAttributes = {
       ...agentRef.info.jsAttributes,
       ...this.customAttributes
     }; // attrs specific to this interaction should have precedence over the general custom attrs
-    const allAttachedNodes = addCustomAttributes(customAttributes || {}, addString); // start with all custom attributes
+    const allAttachedNodes = addCustomAttributes(customAttributes || {}, {
+      addKey: addStringRaw,
+      addVal: addString
+    }); // start with all custom attributes
     if (agentRef.info.atts) allAttachedNodes.push('a,' + addString(agentRef.info.atts)); // add apm provided attributes
     /* 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.)

package/dist/types/common/payloads/payloads.d.ts

@@ -40,14 +40,15 @@ export function isLikelyHumanReadable(headers: Object, data: any): boolean;
  */
 export function truncateAsString(data: any): string;
 /**
- * Creates string adder functions for BEL serialization with obfuscation and optional truncation.
+ * Creates string adder functions for BEL serialization with obfuscation and optional truncation, as well as raw string.
  * This ensures a single string table is used while providing separate handling for regular vs payload attributes.
  * @param {Function} getAddStringContext - Function that creates a new string table context
  * @param {Object} obfuscator - Optional obfuscator instance for string obfuscation
- * @returns {{addString: Function, addStringWithTruncation: Function}} Object containing both string adder functions
+ * @returns {{addString: Function, addStringRaw: Function, addStringWithTruncation: Function}} Object containing various string adder functions
  */
 export function createStringAdders(getAddStringContext: Function, obfuscator: Object): {
     addString: Function;
+    addStringRaw: Function;
     addStringWithTruncation: Function;
 };
 //# sourceMappingURL=payloads.d.ts.map

package/dist/types/common/payloads/payloads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payloads.d.ts","sourceRoot":"","sources":["../../../../src/common/payloads/payloads.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;GAYG;AACH,+CAVW,MAAM,+EAEd;IAAsB,UAAU,EAAxB,MAAM;IACS,YAAY,EAA3B,OAAO;IACO,WAAW,EAAzB,MAAM;IACQ,eAAe,EAA7B,MAAM;IACS,eAAe;CACtC,YAAQ,MAAM,EAAE,GACN,OAAO,CAqBnB;AAED;;;;GAIG;AACH,yCAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CAgB5B;AAED;;;;;GAKG;AACH,+CAJW,MAAM,QACN,GAAC,GACC,OAAO,CA2BnB;AAED;;;;;;GAMG;AACH,uCAHW,GAAC,GACC,MAAM,CA2BlB;AAED;;;;;;GAMG;AACH,8EAHW,MAAM,GACJ;IAAC,SAAS,WAAW;IAAC,uBAAuB,WAAU;CAAC,CAiBpE"}
+{"version":3,"file":"payloads.d.ts","sourceRoot":"","sources":["../../../../src/common/payloads/payloads.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;GAYG;AACH,+CAVW,MAAM,+EAEd;IAAsB,UAAU,EAAxB,MAAM;IACS,YAAY,EAA3B,OAAO;IACO,WAAW,EAAzB,MAAM;IACQ,eAAe,EAA7B,MAAM;IACS,eAAe;CACtC,YAAQ,MAAM,EAAE,GACN,OAAO,CAqBnB;AAED;;;;GAIG;AACH,yCAHW,MAAM,GACJ,MAAM,GAAC,SAAS,CAgB5B;AAED;;;;;GAKG;AACH,+CAJW,MAAM,QACN,GAAC,GACC,OAAO,CA2BnB;AAED;;;;;;GAMG;AACH,uCAHW,GAAC,GACC,MAAM,CA2BlB;AAED;;;;;;GAMG;AACH,8EAHW,MAAM,GACJ;IAAC,SAAS,WAAW;IAAC,YAAY,WAAW;IAAC,uBAAuB,WAAU;CAAC,CAkB5F"}

package/dist/types/common/serialize/bel-serializer.d.ts

@@ -1,5 +1,13 @@
 export function nullable(val: any, fn: any, comma: any): string;
 export function numeric(n: any, noDefault: any): string;
 export function getAddStringContext(obfuscator: any, truncator: any): (str: any, obfuscate?: boolean) => string;
-export function addCustomAttributes(attrs: any, addString: any): any[];
+/**
+ * Attributes are serialized according to their types, using the provided serializers.  Only the first 64 attributes will be added to the payload.
+ * @param attrs
+ * @param serializers
+ * @param {function} serializers.addKey -function for serializing attribute keys
+ * @param {function} serializers.addVal - function for serializing attribute values
+ * @returns {*[]}
+ */
+export function addCustomAttributes(attrs: any, serializers: any): any[];
 //# sourceMappingURL=bel-serializer.d.ts.map

package/dist/types/common/serialize/bel-serializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bel-serializer.d.ts","sourceRoot":"","sources":["../../../../src/common/serialize/bel-serializer.js"],"names":[],"mappings":"AAUA,gEAIC;AAED,wDAKC;AAED,gHAiBC;AAED,uEAwCC"}
+{"version":3,"file":"bel-serializer.d.ts","sourceRoot":"","sources":["../../../../src/common/serialize/bel-serializer.js"],"names":[],"mappings":"AAUA,gEAIC;AAED,wDAKC;AAED,gHAiBC;AAED;;;;;;;GAOG;AACH,mEAFa,GAAC,EAAE,CA2Cf"}

package/dist/types/common/v2/mfe-vitals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mfe-vitals.d.ts","sourceRoot":"","sources":["../../../../src/common/v2/mfe-vitals.js"],"names":[],"mappings":"AAqHA;;;;;GAKG;AACH,uCAJW,iBAAiB,WACjB,kBAAkB,GAChB,iBAAiB,CAuM7B;iCAtTY,OAAO,sCAAsC,EAAE,kBAAkB;gCACjE,OAAO,sCAAsC,EAAE,iBAAiB;gCAChE,OAAO,sCAAsC,EAAE,iBAAiB"}
+{"version":3,"file":"mfe-vitals.d.ts","sourceRoot":"","sources":["../../../../src/common/v2/mfe-vitals.js"],"names":[],"mappings":"AAqHA;;;;;GAKG;AACH,uCAJW,iBAAiB,WACjB,kBAAkB,GAChB,iBAAiB,CAkO7B;iCAjVY,OAAO,sCAAsC,EAAE,kBAAkB;gCACjE,OAAO,sCAAsC,EAAE,iBAAiB;gCAChE,OAAO,sCAAsC,EAAE,iBAAiB"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/ajax/aggregate/index.js"],"names":[],"mappings":"AAoBA;IACE,2BAAiC;IAEjC,2BA6BC;IAvBC,uBAA4D;IAyB9D,0GA2FC;IAED,+CAOC;IAED,iDAoEC;CACF;8BAvN6B,4BAA4B;2BAK/B,gCAAgC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/ajax/aggregate/index.js"],"names":[],"mappings":"AAoBA;IACE,2BAAiC;IAEjC,2BA6BC;IAvBC,uBAA4D;IAyB9D,0GA2FC;IAED,+CAOC;IAED,iDAuEC;CACF;8BA1N6B,4BAA4B;2BAK/B,gCAAgC"}

package/dist/types/features/page_view_timing/aggregate/index.d.ts

@@ -19,7 +19,6 @@ export class Aggregate extends AggregateBase {
      * @returns {void}
      */
     checkForFirstInteraction(): void;
-    appendGlobalCustomAttributes(timing: any): void;
     preHarvestChecks(): boolean;
     serializer(eventBuffer: any): string;
     #private;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/page_view_timing/aggregate/index.js"],"names":[],"mappings":"AA0BA;IACE,2BAAiC;IAMjC,2BA+BC;IA7BC,4BAA+B;IAC/B,0BAA6B;IAK7B,uBAA2D;IAyB7D;;;OAGG;IACH,6BAFW,MAAM,QAOhB;IAED;;;;MA+BC;IAED;;;OAGG;IACH,4BAFa,IAAI,CAahB;IAED,gDAWC;IAED,4BAGC;IAGD,qCAwBC;;CACF;8BAjK6B,4BAA4B;2BAC/B,gCAAgC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/page_view_timing/aggregate/index.js"],"names":[],"mappings":"AA2BA;IACE,2BAAiC;IAMjC,2BA+BC;IA7BC,4BAA+B;IAC/B,0BAA6B;IAK7B,uBAA2D;IAyB7D;;;OAGG;IACH,6BAFW,MAAM,QAOhB;IAED;;;;MAiCC;IAED;;;OAGG;IACH,4BAFa,IAAI,CAahB;IAWD,4BAGC;IAGD,qCA8BC;;CACF;8BAtK6B,4BAA4B;2BAC/B,gCAAgC"}

package/dist/types/features/soft_navigations/aggregate/ajax-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ajax-node.d.ts","sourceRoot":"","sources":["../../../../../src/features/soft_navigations/aggregate/ajax-node.js"],"names":[],"mappings":"AAUA;IACE,8CA8BC;IA5BC,gBAA6B;IAC7B,YAA8B;IAC9B,YAA8B;IAC9B,YAA8B;IAC9B,UAA0B;IAC1B,YAAmC;IACnC,YAAoC;IACpC,+BAAwD;IACxD,YAA8B;IAC9B,aAAgC;IAChC,mBAA4C;IAC5C,SAAwB;IACxB,sBAAkD;IAIlD,iBAAwC;IACxC,oBAA8C;IAC9C,kBAA0C;IAC1C,kBAA0C;IAC1C,qBAAgD;IAK9C,iBAAoE;IAKxE,iFA+CC;IAhEC,sBAAkC;CAiErC;wBAnFuB,YAAY"}
+{"version":3,"file":"ajax-node.d.ts","sourceRoot":"","sources":["../../../../../src/features/soft_navigations/aggregate/ajax-node.js"],"names":[],"mappings":"AAUA;IACE,8CA8BC;IA5BC,gBAA6B;IAC7B,YAA8B;IAC9B,YAA8B;IAC9B,YAA8B;IAC9B,UAA0B;IAC1B,YAAmC;IACnC,YAAoC;IACpC,+BAAwD;IACxD,YAA8B;IAC9B,aAAgC;IAChC,mBAA4C;IAC5C,SAAwB;IACxB,sBAAkD;IAIlD,iBAAwC;IACxC,oBAA8C;IAC9C,kBAA0C;IAC1C,kBAA0C;IAC1C,qBAAgD;IAK9C,iBAAoE;IAKxE,iFAkDC;IAnEC,sBAAkC;CAoErC;wBAtFuB,YAAY"}

package/dist/types/features/soft_navigations/aggregate/interaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["../../../../../src/features/soft_navigations/aggregate/interaction.js"],"names":[],"mappings":"AAYA;;IAEI;AACJ;IAoBE,0FAaC;IAhCD,WAAmB;IACnB,uBAAgC;IAChC,gBAAU;IACV,qBAAqB;IACrB,oBAAoB;IACpB,eAAS;IACT,aAAO;IACP,cAAQ;IACR,+EAA+E;IAC/E,eAA8B;IAC9B,qBAAgB;IAChB,yBAAoB;IACpB,sBAAoB;IACpB,6BAA2B;IAC3B,cAAW;IACX,kBAAa;IACb,uBAAiB;IACjB,wBAAkB;IAIhB,gBAAoC;IACpC,aAAsB;IAEtB,cAAiC;IACjC,wCAGE;IACF,mBAAyC;IAAxB,qBAAwB;IAEzC,YAAsE;IAAxD,YAAwD;IAGxE,iDAKC;IAED,gCAGC;IAED,oCAUC;IAED,8BAIC;IAED,6DAeC;IAmBD;;;;;;OAMG;IACH,0BAHW,mBAAmB,WAM7B;IAGD,uBAAoB;IACpB,iCAA8B;IAC9B,sBAAmB;IAEnB;;;;;;;OAOG;IACH,qDALW,KAAK,yBACL,UAAU,kBACV,UAAU,UAgDpB;;CACF;wBA/KuB,YAAY"}
+{"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["../../../../../src/features/soft_navigations/aggregate/interaction.js"],"names":[],"mappings":"AAaA;;IAEI;AACJ;IAoBE,0FAaC;IAhCD,WAAmB;IACnB,uBAAgC;IAChC,gBAAU;IACV,qBAAqB;IACrB,oBAAoB;IACpB,eAAS;IACT,aAAO;IACP,cAAQ;IACR,+EAA+E;IAC/E,eAA8B;IAC9B,qBAAgB;IAChB,yBAAoB;IACpB,sBAAoB;IACpB,6BAA2B;IAC3B,cAAW;IACX,kBAAa;IACb,uBAAiB;IACjB,wBAAkB;IAIhB,gBAAoC;IACpC,aAAsB;IAEtB,cAAiC;IACjC,wCAGE;IACF,mBAAyC;IAAxB,qBAAwB;IAEzC,YAAsE;IAAxD,YAAwD;IAGxE,iDAKC;IAED,gCAGC;IAED,oCAUC;IAED,8BAIC;IAED,6DAeC;IAmBD;;;;;;OAMG;IACH,0BAHW,mBAAmB,WAM7B;IAGD,uBAAoB;IACpB,iCAA8B;IAC9B,sBAAmB;IAEnB;;;;;;;OAOG;IACH,qDALW,KAAK,yBACL,UAAU,kBACV,UAAU,UAgDpB;;CACF;wBAhLuB,YAAY"}

package/package.json

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

package/src/common/payloads/payloads.js

@@ -129,11 +129,11 @@ export function truncateAsString (data) {
 }
 
 /**
- * Creates string adder functions for BEL serialization with obfuscation and optional truncation.
+ * Creates string adder functions for BEL serialization with obfuscation and optional truncation, as well as raw string.
  * This ensures a single string table is used while providing separate handling for regular vs payload attributes.
  * @param {Function} getAddStringContext - Function that creates a new string table context
  * @param {Object} obfuscator - Optional obfuscator instance for string obfuscation
- * @returns {{addString: Function, addStringWithTruncation: Function}} Object containing both string adder functions
+ * @returns {{addString: Function, addStringRaw: Function, addStringWithTruncation: Function}} Object containing various string adder functions
  */
 export function createStringAdders (getAddStringContext, obfuscator) {
   const addStringRaw = getAddStringContext()
@@ -148,6 +148,7 @@ export function createStringAdders (getAddStringContext, obfuscator) {
 
   return {
     addString: (str) => processString(str, false),
+    addStringRaw: (str) => addStringRaw(str),
     addStringWithTruncation: (str) => processString(str, true)
   }
 }

package/src/common/serialize/bel-serializer.js

@@ -40,7 +40,16 @@ export function getAddStringContext (obfuscator, truncator) {
   }
 }
 
-export function addCustomAttributes (attrs, addString) {
+/**
+ * Attributes are serialized according to their types, using the provided serializers.  Only the first 64 attributes will be added to the payload.
+ * @param attrs
+ * @param serializers
+ * @param {function} serializers.addKey -function for serializing attribute keys
+ * @param {function} serializers.addVal - function for serializing attribute values
+ * @returns {*[]}
+ */
+export function addCustomAttributes (attrs, serializers) {
+  const { addKey, addVal } = serializers
   var attrParts = []
 
   Object.entries(attrs || {}).forEach(([key, val]) => {
@@ -48,13 +57,13 @@ export function addCustomAttributes (attrs, addString) {
     var type = 5
     var serializedValue
     // add key to string table first
-    key = addString(key, false)
+    key = addKey(key)
 
     switch (typeof val) {
       case 'object':
         if (val) {
           // serialize objects to strings
-          serializedValue = addString(stringify(val))
+          serializedValue = addVal(stringify(val))
         } else {
           // null attribute type
           type = 9
@@ -73,7 +82,7 @@ export function addCustomAttributes (attrs, addString) {
         type = 9
         break
       default:
-        serializedValue = addString(val)
+        serializedValue = addVal(val)
     }
 
     attrParts.push([type, key + (serializedValue ? ',' + serializedValue : '')])

package/src/common/v2/mfe-vitals.js

@@ -124,6 +124,9 @@ const observePerformance = (observers, config, onEntry) => {
 export function trackMFEVitals (target, timings) {
   let fcpObservedAt
   let lcpObservedAt
+  // Once disconnect() runs, no further vitals data should be written - even from an observer callback that was
+  // already in flight when disconnect() was called.
+  let disconnected = false
 
   const getTimeRelativeToScriptStart = (capturedAt) => {
     if (capturedAt == null) return capturedAt
@@ -132,12 +135,21 @@ export function trackMFEVitals (target, timings) {
 
   const vitals = {
     fcp: {
-      get value () { return getTimeRelativeToScriptStart(fcpObservedAt) },
-      set value (v) { fcpObservedAt = v }
+      // A clock freeze/tab suspend between script registration and first paint can make this value huge once the
+      // tab resumes. Rather than report a multi-hour "FCP", drop it so bad data doesn't reach the backend.
+      get value () {
+        const relative = getTimeRelativeToScriptStart(fcpObservedAt)
+        return relative > CORRELATION_STALE_THRESHOLD_MS ? undefined : relative
+      },
+      set value (v) { if (!disconnected) fcpObservedAt = v }
     },
     lcp: {
-      get value () { return getTimeRelativeToScriptStart(lcpObservedAt) },
-      set value (v) { lcpObservedAt = v }
+      // LCP can never occur before FCP, so if FCP was dropped as invalid, LCP is derived from the same untrustworthy clock and must be dropped too.
+      get value () {
+        if (vitals.fcp.value === undefined) return undefined
+        return getTimeRelativeToScriptStart(lcpObservedAt)
+      },
+      set value (v) { if (!disconnected) lcpObservedAt = v }
     },
     cls: {
       value: undefined
@@ -159,15 +171,22 @@ export function trackMFEVitals (target, timings) {
   }, CORRELATION_STALE_THRESHOLD_MS)
 
   const populateVitalMinimums = () => {
-    fcpObservedAt ??= now()
+    if (disconnected) return
+    if (fcpObservedAt == null) {
+      const capturedAt = now()
+      // If the very first observed render already exceeds the window, the clock is untrustworthy for this
+      // MFE (e.g. tab was frozen/suspended between registration and paint) - shut everything down instead
+      // of seeding vitals with data derived from it.
+      if (getTimeRelativeToScriptStart(capturedAt) > CORRELATION_STALE_THRESHOLD_MS) {
+        vitals.disconnect()
+        return
+      }
+      fcpObservedAt = capturedAt
+    }
     lcpObservedAt ??= now()
     vitals.cls.value ??= 0
   }
 
-  // if the MFE has already rendered something on the page before we could set up listeners, just populate vital minimums immediately
-  const existingRoots = globalScope.document?.querySelectorAll(`[data-nr-mfe-id="${escapeSelectorValue(target.id)}"]`)
-  if (Array.from(existingRoots || []).some(x => isMatch(x.dataset, target))) populateVitalMinimums()
-
   // Track FCP - first contentful paint
   const fcpObs = observeMutations(target, (_, obs) => {
     // An observed "FCP" means _something_ rendered, so at minimum we can populate all the baseline values for the vitals
@@ -183,12 +202,13 @@ export function trackMFEVitals (target, timings) {
 
   try {
     resizeObs = new globalScope.ResizeObserver((entries) => {
+      if (disconnected) return
       entries.forEach((entry) => {
         try {
           const size = entry.contentRect.width * entry.contentRect.height
           if (size > largestSize) {
             largestSize = size
-            lcpObservedAt = now()
+            vitals.lcp.value = now()
           }
           resizeObs.unobserve(entry.target)
         } catch (e) {
@@ -245,7 +265,7 @@ export function trackMFEVitals (target, timings) {
   // Track CLS - cumulative layout shift
   // Initialize CLS to 0 if browser supports it
   observePerformance(observers, { type: 'layout-shift', buffered: true }, (entry) => {
-    if (entry.hadRecentInput) return
+    if (disconnected || entry.hadRecentInput) return
     ;(entry.sources || []).some(source => {
       if (isInMFE(source.node, target)) {
         // an observed "CLS" means _something_ rendered for the MFE, so at minimum we can make sure all the baseline values are populated for the vitals
@@ -259,7 +279,7 @@ export function trackMFEVitals (target, timings) {
 
   // Track INP - interaction to next paint
   observePerformance(observers, { type: 'event', buffered: true, durationThreshold: 40 }, (entry) => {
-    if (!entry.interactionId || !isInMFE(entry.target, target)) return
+    if (disconnected || !entry.interactionId || !isInMFE(entry.target, target)) return
     if (vitals.inp.value === undefined || entry.duration > vitals.inp.value) {
       // an observed "INP" means _something_ rendered for the MFE, so at minimum we can make sure all the baseline values are populated for the vitals
       populateVitalMinimums()
@@ -276,6 +296,7 @@ export function trackMFEVitals (target, timings) {
 
   // Disconnect all observers
   vitals.disconnect = () => {
+    disconnected = true
     // Disconnect all observers
     observers.forEach(obs => {
       try {
@@ -317,5 +338,11 @@ export function trackMFEVitals (target, timings) {
     globalScope.addEventListener(type, vitals.disconnect, { once: true, passive: true })
   })
 
+  // If the MFE has already rendered something on the page before we could set up listeners, just populate vital
+  // minimums immediately. Done last, once `observers` is fully populated and `vitals.disconnect` has its real
+  // implementation, so a stale-clock detection here can actually tear everything down instead of no-op'ing.
+  const existingRoots = globalScope.document?.querySelectorAll(`[data-nr-mfe-id="${escapeSelectorValue(target.id)}"]`)
+  if (Array.from(existingRoots || []).some(x => isMatch(x.dataset, target))) populateVitalMinimums()
+
   return vitals
 }

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

@@ -157,7 +157,7 @@ export class Aggregate extends AggregateBase {
   serializer (eventBuffer) {
     if (!eventBuffer.length) return
 
-    const { addString, addStringWithTruncation } = createStringAdders(getAddStringContext, this.obfuscator)
+    const { addString, addStringRaw, addStringWithTruncation } = createStringAdders(getAddStringContext, this.obfuscator)
 
     let payload = 'bel.7;'
 
@@ -174,16 +174,16 @@ export class Aggregate extends AggregateBase {
         numeric(event.endTime - event.startTime),
         numeric(0), // callbackEnd
         numeric(0), // no callbackDuration for non-SPA events
-        addString(event.method),
+        addStringRaw(event.method),
         numeric(event.status),
         addString(event.domain),
         addString(event.path),
         numeric(event.requestSize),
         numeric(event.responseSize),
         event.type === 'fetch' ? 1 : '',
-        addString(0), // nodeId
-        nullable(event.spanId, addString, true) + // guid
-        nullable(event.traceId, addString, true) + // traceId
+        addStringRaw(0), // nodeId
+        nullable(event.spanId, addStringRaw, true) + // guid
+        nullable(event.traceId, addStringRaw, true) + // traceId
         nullable(event.spanTimestamp, numeric, false) // timestamp
       ]
 
@@ -193,12 +193,15 @@ export class Aggregate extends AggregateBase {
       const jsAttributes = this.agentRef.info.jsAttributes
 
       // Regular attributes: obfuscate only
-      const regularAttrs = addCustomAttributes({
+      let regularAttrs = addCustomAttributes({
         ...(jsAttributes || {}),
-        [AJAX_ID]: event[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
         ...(event.gql || {})
-      }, addString)
+      }, { addKey: addStringRaw, addVal: addString })
+
+      regularAttrs.push(...addCustomAttributes({
+        [AJAX_ID]: event[AJAX_ID] // all AjaxRequest events should have a unique identifier to allow for easier grouping and analysis in the UI
+      }, { addKey: addStringRaw, addVal: addStringRaw }))
 
       // Payload attributes: obfuscate then truncate
       const payloadAttrs = addCustomAttributes({
@@ -207,7 +210,7 @@ export class Aggregate extends AggregateBase {
         ...(event.requestQuery ? { requestQuery: event.requestQuery } : {}),
         ...(event.responseBody ? { responseBody: event.responseBody } : {}),
         ...(event.responseHeaders ? { responseHeaders: event.responseHeaders } : {})
-      }, addStringWithTruncation)
+      }, { addKey: addStringRaw, addVal: addStringWithTruncation })
 
       const attrParts = [...regularAttrs, ...payloadAttrs]
       fields.unshift(numeric(attrParts.length))

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

@@ -23,6 +23,7 @@ import { loadTime } from '../../../common/vitals/load-time'
 import { webdriverDetected } from '../../../common/util/webdriver-detection'
 import { cleanURL } from '../../../common/url/clean-url'
 import { EVENT_TYPES } from '../../../common/constants/events'
+import { createStringAdders } from '../../../common/payloads/payloads'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -93,6 +94,8 @@ export class Aggregate extends AggregateBase {
       attrs.cls = cumulativeLayoutShift.current.value
     }
 
+    attrs.webdriverDetected = webdriverDetected
+
     const timing = {
       name,
       value,
@@ -125,17 +128,13 @@ export class Aggregate extends AggregateBase {
     })
   }
 
-  appendGlobalCustomAttributes (timing) {
-    var timingAttributes = timing.attrs || {}
+  #getGlobalCustomAttributes () {
+    const reservedAttributes = ['size', 'eid', 'cls', 'type', 'fid', 'elTag', 'elUrl', 'net-type',
+      'net-etype', 'net-rtt', 'net-dlink', 'webdriverDetected']
 
-    var reservedAttributes = ['size', 'eid', 'cls', 'type', 'fid', 'elTag', 'elUrl', 'net-type',
-      'net-etype', 'net-rtt', 'net-dlink']
-    Object.entries(this.agentRef.info.jsAttributes || {}).forEach(([key, val]) => {
-      if (reservedAttributes.indexOf(key) < 0) {
-        timingAttributes[key] = val
-      }
-    })
-    timingAttributes.webdriverDetected = webdriverDetected
+    return Object.fromEntries(
+      Object.entries(this.agentRef.info.jsAttributes || {}).filter(([key]) => !reservedAttributes.includes(key))
+    )
   }
 
   preHarvestChecks () {
@@ -146,7 +145,9 @@ export class Aggregate extends AggregateBase {
   // serialize array of timing data
   serializer (eventBuffer) {
     if (!eventBuffer?.length) return ''
-    var addString = getAddStringContext(this.obfuscator)
+    const { addString, addStringRaw } = createStringAdders(getAddStringContext, this.obfuscator)
+    const keepOrigValue = { addKey: addStringRaw, addVal: addStringRaw }
+    const obfuscateValue = { addKey: addStringRaw, addVal: addString }
 
     var payload = 'bel.6;'
 
@@ -154,12 +155,16 @@ export class Aggregate extends AggregateBase {
       var timing = eventBuffer[i]
 
       payload += 'e,'
-      payload += addString(timing.name) + ','
+      payload += addStringRaw(timing.name) + ','
       payload += nullable(timing.value, numeric, false) + ','
 
-      this.appendGlobalCustomAttributes(timing)
+      const userAttrs = this.#getGlobalCustomAttributes()
+
+      const { pageUrl, ...systemReservedAttrs } = timing.attrs || {}
+      var attrParts = addCustomAttributes(systemReservedAttrs, keepOrigValue)
+      attrParts.push(...addCustomAttributes(userAttrs, obfuscateValue))
+      if (pageUrl) attrParts.push(...addCustomAttributes({ pageUrl }, obfuscateValue))
 
-      var attrParts = addCustomAttributes(timing.attrs, addString)
       if (attrParts && attrParts.length > 0) {
         payload += numeric(attrParts.length) + ';' + attrParts.join(';')
       }