@newrelic/browser-agent 1.323.0-rc.4 → 1.323.0-rc.6

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

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.323.0-rc.4";
+const VERSION = exports.VERSION = "1.323.0-rc.6";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/constants/env.npm.js

@@ -17,7 +17,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.RRWEB_PACKAGE_NAME = exports.D
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.323.0-rc.4";
+const VERSION = exports.VERSION = "1.323.0-rc.6";
 
 /**
  * Exposes the build type of the agent

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

@@ -133,10 +133,23 @@ class Aggregate extends _aggregateBase.AggregateBase {
         ...event,
         targetAttributes: (0, _utils.getVersion2Attributes)(target, this)
       });
-      if ((0, _utils.shouldDuplicate)(target, this)) this.reportContainerEvent({
-        ...event,
-        targetAttributes: (0, _utils.getVersion2DuplicationAttributes)(target, this)
-      }, ctx);
+      if ((0, _utils.shouldDuplicate)(target, this)) {
+        const duplicateEvent = {
+          ...event,
+          targetAttributes: (0, _utils.getVersion2DuplicationAttributes)(target, this)
+        };
+        /** the container-duplicate copy represents the same single real HTTP call as the MFE event above, so it
+         * needs its own independent trace/span identity -- otherwise the two would collide on the same
+         * spanId/traceId, and BELC could not create two separate Spans/Traces from them. Only the id namespace is
+         * independent; spanTimestamp is intentionally left as-is (event.spanTimestamp), since it still reflects the
+         * real call's actual timing. When `event.spanId` was never set (e.g. distributed tracing is disabled), there
+         * is no span identity to duplicate either -- both copies correctly end up with no spanId/traceId. */
+        if (event.spanId) {
+          duplicateEvent.spanId = (0, _uniqueId.generateSpanId)();
+          duplicateEvent.traceId = (0, _uniqueId.generateTraceId)();
+        }
+        this.reportContainerEvent(duplicateEvent, ctx);
+      }
     } else {
       this.reportContainerEvent(event, ctx);
     }

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.323.0-rc.4";
+export const VERSION = "1.323.0-rc.6";
 
 /**
  * Exposes the build type of the agent

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.323.0-rc.4";
+export const VERSION = "1.323.0-rc.6";
 
 /**
  * Exposes the build type of the agent

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

@@ -16,7 +16,7 @@ import { canCapturePayload, isLikelyHumanReadable, parseQueryString, createStrin
 import { Obfuscator } from '../../../common/util/obfuscate';
 import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate, isMfeTarget } from '../../../common/v2/utils';
 import { EVENT_TYPES } from '../../../common/constants/events';
-import { generateUuid } from '../../../common/ids/unique-id';
+import { generateSpanId, generateTraceId, generateUuid } from '../../../common/ids/unique-id';
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME;
   constructor(agentRef) {
@@ -126,10 +126,23 @@ export class Aggregate extends AggregateBase {
         ...event,
         targetAttributes: getVersion2Attributes(target, this)
       });
-      if (shouldDuplicate(target, this)) this.reportContainerEvent({
-        ...event,
-        targetAttributes: getVersion2DuplicationAttributes(target, this)
-      }, ctx);
+      if (shouldDuplicate(target, this)) {
+        const duplicateEvent = {
+          ...event,
+          targetAttributes: getVersion2DuplicationAttributes(target, this)
+        };
+        /** the container-duplicate copy represents the same single real HTTP call as the MFE event above, so it
+         * needs its own independent trace/span identity -- otherwise the two would collide on the same
+         * spanId/traceId, and BELC could not create two separate Spans/Traces from them. Only the id namespace is
+         * independent; spanTimestamp is intentionally left as-is (event.spanTimestamp), since it still reflects the
+         * real call's actual timing. When `event.spanId` was never set (e.g. distributed tracing is disabled), there
+         * is no span identity to duplicate either -- both copies correctly end up with no spanId/traceId. */
+        if (event.spanId) {
+          duplicateEvent.spanId = generateSpanId();
+          duplicateEvent.traceId = generateTraceId();
+        }
+        this.reportContainerEvent(duplicateEvent, ctx);
+      }
     } else {
       this.reportContainerEvent(event, ctx);
     }

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,iDA2EC;CACF;8BA9N6B,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,0GAwGC;IAED,+CAOC;IAED,iDA2EC;CACF;8BA3O6B,4BAA4B;2BAK/B,gCAAgC"}

package/package.json

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

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

@@ -16,7 +16,7 @@ import { canCapturePayload, isLikelyHumanReadable, parseQueryString, createStrin
 import { Obfuscator } from '../../../common/util/obfuscate'
 import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate, isMfeTarget } from '../../../common/v2/utils'
 import { EVENT_TYPES } from '../../../common/constants/events'
-import { generateUuid } from '../../../common/ids/unique-id'
+import { generateSpanId, generateTraceId, generateUuid } from '../../../common/ids/unique-id'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -139,7 +139,20 @@ export class Aggregate extends AggregateBase {
     /** make a copy of the event for the MFE target if it exists */
     if (isMfeTarget(target)) {
       this.events.add({ ...event, targetAttributes: getVersion2Attributes(target, this) })
-      if (shouldDuplicate(target, this)) this.reportContainerEvent({ ...event, targetAttributes: getVersion2DuplicationAttributes(target, this) }, ctx)
+      if (shouldDuplicate(target, this)) {
+        const duplicateEvent = { ...event, targetAttributes: getVersion2DuplicationAttributes(target, this) }
+        /** the container-duplicate copy represents the same single real HTTP call as the MFE event above, so it
+         * needs its own independent trace/span identity -- otherwise the two would collide on the same
+         * spanId/traceId, and BELC could not create two separate Spans/Traces from them. Only the id namespace is
+         * independent; spanTimestamp is intentionally left as-is (event.spanTimestamp), since it still reflects the
+         * real call's actual timing. When `event.spanId` was never set (e.g. distributed tracing is disabled), there
+         * is no span identity to duplicate either -- both copies correctly end up with no spanId/traceId. */
+        if (event.spanId) {
+          duplicateEvent.spanId = generateSpanId()
+          duplicateEvent.traceId = generateTraceId()
+        }
+        this.reportContainerEvent(duplicateEvent, ctx)
+      }
     } else {
       this.reportContainerEvent(event, ctx)
     }