@newrelic/browser-agent 1.311.0 → 1.312.0

package/src/common/util/script-tracker.js

@@ -54,7 +54,7 @@ if (globalScope.PerformanceObserver?.supportedEntryTypes.includes('resource')) {
  * @param {string} stack The error stack trace
  * @returns {string[]} Array of cleaned URLs found in the stack trace
  */
-function extractUrlsFromStack (stack) {
+export function extractUrlsFromStack (stack) {
   if (!stack || typeof stack !== 'string') return []
 
   const urls = new Set()
@@ -80,7 +80,7 @@ function extractUrlsFromStack (stack) {
  * Returns a deep stack trace by temporarily increasing the stack trace limit.
  * @returns {Error.stack | undefined}
  */
-function getDeepStackTrace () {
+export function getDeepStackTrace () {
   let stack
   try {
     const originalStackLimit = Error.stackTraceLimit

package/src/common/util/stringify.js

@@ -7,35 +7,18 @@ import { ee } from '../event-emitter/contextual-ee'
 
 /**
  * Returns a function for use as a replacer parameter in JSON.stringify() to handle circular references.
- * Uses an array to track the current ancestor chain, allowing the same object to appear
- * multiple times in the structure as long as it's not a circular reference.
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Cyclic_object_value MDN - Cyclical object value}
- * @returns {Function} A function that filters out circular references while allowing duplicate references.
+ * @returns {Function} A function that filters out values it has seen before.
  */
 const getCircularReplacer = () => {
-  const stack = []
-
-  return function (key, value) {
-    if (stack.length > 0) {
-      // Find where we are in the stack
-      const thisPos = stack.indexOf(this)
-      if (~thisPos) {
-        // We're still in the stack, trim it
-        stack.splice(thisPos + 1)
-      } else {
-        // We're not in the stack, add ourselves
-        stack.push(this)
-      }
-
-      // Check if value is in the current ancestor chain
-      if (~stack.indexOf(value)) {
+  const seen = new WeakSet()
+  return (key, value) => {
+    if (typeof value === 'object' && value !== null) {
+      if (seen.has(value)) {
         return
       }
-    } else {
-      // First call, initialize with root
-      stack.push(value)
+      seen.add(value)
     }
-
     return value
   }
 }

package/src/common/util/v2.js

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { extractUrlsFromStack, getDeepStackTrace } from './script-tracker'
+
 /**
  * @enum {string}
  * @readonly
@@ -14,6 +16,30 @@ export const V2_TYPES = {
   BA: 'BA'
 }
 
+/**
+ * Returns the registered target associated with a given ID. Returns an empty array if no target is found.
+ * @param {string|number} id
+ * @param {*} agentRef the agent reference
+ * @returns {import("../../interfaces/registered-entity").RegisterAPIMetadataTarget[]}
+ */
+export function getRegisteredTargetsFromId (id, agentRef) {
+  if (!id || !agentRef?.init.api.allow_registered_children) return []
+  const registeredEntities = agentRef.runtime.registeredEntities
+  return registeredEntities?.filter(entity => String(entity.metadata.target.id) === String(id)).map(entity => entity.metadata.target) || []
+}
+
+/**
+ * Returns the registered target(s) associated with a given filename if found in the resource timing API during registration. Returns an empty array if no target is found.
+ * @param {string} filename
+ * @param {*} agentRef
+ * @returns {import("../../interfaces/registered-entity").RegisterAPIMetadataTarget[]}
+ */
+export function getRegisteredTargetsFromFilename (filename, agentRef) {
+  if (!filename || !agentRef?.init.api.allow_registered_children) return []
+  const registeredEntities = agentRef.runtime.registeredEntities
+  return registeredEntities?.filter(entity => entity.metadata.timings?.asset?.endsWith(filename)).map(entity => entity.metadata.target) || []
+}
+
 /**
  * When given a valid target, returns an object with the V2 payload attributes.  Returns an empty object otherwise.
  * @note Field names may change as the schema is finalized
@@ -23,7 +49,7 @@ export const V2_TYPES = {
  * @returns {Object} returns an empty object if args are not supplied or the aggregate instance is not supporting version 2
  */
 export function getVersion2Attributes (target, aggregateInstance) {
-  if (aggregateInstance?.harvestEndpointVersion !== 2) return {}
+  if (!supportsV2(aggregateInstance)) return {}
   const containerAgentEntityGuid = aggregateInstance.agentRef.runtime.appMetadata.agents[0].entityGuid
   /** if there's no target, but we are in v2 mode, this means the data belongs to the container agent */
   if (!target) {
@@ -33,11 +59,62 @@ export function getVersion2Attributes (target, aggregateInstance) {
     }
   }
   /** otherwise, the data belongs to the target (MFE) and should be attributed as such */
-  return {
-    'source.id': target.id,
-    'source.name': target.name,
-    'source.type': target.type,
-    'parent.id': target.parent?.id || containerAgentEntityGuid,
-    'parent.type': target.parent?.type || V2_TYPES.BA
+  return target.attributes
+}
+
+/**
+ * Returns the attributes used for duplicating data in version 2 of the harvest endpoint.
+ * If not valid for duplication, returns an empty object.
+ * @note BEST PRACTICE - Caller should call shouldDuplicate() before utilizing this method to determine if duplication attributes should be added to the event.
+ * @param {import("../../interfaces/registered-entity").RegisterAPIMetadataTarget} target
+ * @param {*} aggregateInstance the aggregate instance calling the method
+ * @returns {Object}
+ */
+export function getVersion2DuplicationAttributes (target, aggregateInstance) {
+  if (!shouldDuplicate(target, aggregateInstance)) return {}
+  return { 'child.id': target.id, 'child.type': target.type, ...getVersion2Attributes(undefined, aggregateInstance) }
+}
+
+/**
+ * Determines if an event should be duplicated for a given target and aggregate instance.  This is used to determine if duplication attributes should be added to an event and if the event should be sent to the soft nav feature for evaluation.
+ * @note This method is intended to be used in conjunction with getVersion2DuplicationAttributes and should be called before it to determine if duplication attributes should be added to an event.
+ * @param {import("../../interfaces/registered-entity").RegisterAPIMetadataTarget} target
+ * @param {*} aggregateInstance The aggregate instance calling the method.  This is needed to check if duplication is enabled and if the harvest endpoint version supports it.
+ * @returns {boolean} returns true if the event should be duplicated for the target, false otherwise
+ */
+export function shouldDuplicate (target, aggregateInstance) {
+  return !!target && !!supportsV2(aggregateInstance) && aggregateInstance.agentRef.init.api.duplicate_registered_data
+}
+
+/**
+ * Finds the registered targets from the stack trace for a given agent reference.
+ * @param {*} agentRef The agent reference to use for finding targets.
+ * @returns {Array} An array of targets found from the stack trace. If no targets are found or allowed, returns an array with undefined.
+ */
+export function findTargetsFromStackTrace (agentRef) {
+  if (!agentRef?.init.api.allow_registered_children) return [undefined]
+
+  const targets = []
+  try {
+    var urls = extractUrlsFromStack(getDeepStackTrace())
+    let iterator = urls.length - 1
+    while (urls[iterator]) {
+      targets.push(...getRegisteredTargetsFromFilename(urls[iterator--], agentRef))
+    }
+  } catch (err) {
+    // Silent catch to prevent errors from propagating
   }
+  if (!targets.length) targets.push(undefined) // if we can't find any targets from the stack trace, return an array with undefined to signify the container agent is the target
+  return targets
+}
+
+/**
+ * Determines if the aggregate instance supports version 2 of the harvest endpoint. Nearly all the V2 logic "depends" on
+ * the harvest endpoint version, so this is the main gatekeeper method for whether or not V2 logic should be executed across the
+ * various functions in this module.
+ * @param {*} aggregateInstance The aggregate instance to check.
+ * @returns {boolean} Returns true if the aggregate instance supports version 2, false otherwise.
+ */
+function supportsV2 (aggregateInstance) {
+  return aggregateInstance?.harvestEndpointVersion === 2
 }

package/src/common/wrap/wrap-fetch.js

@@ -9,6 +9,7 @@
  */
 import { ee as baseEE, contextId } from '../event-emitter/contextual-ee'
 import { globalScope } from '../constants/runtime'
+import { findTargetsFromStackTrace } from '../util/v2'
 
 var prefix = 'fetch-'
 var bodyPrefix = prefix + 'body-'
@@ -27,7 +28,7 @@ const wrapped = {}
  *     event emitter will be based.
  * @returns {Object} Scoped event emitter with a debug ID of `fetch`.
  */
-export function wrapFetch (sharedEE) {
+export function wrapFetch (sharedEE, agentRef) {
   const ee = scopedEE(sharedEE)
   if (!(Req && Res && globalScope.fetch)) {
     return ee
@@ -44,13 +45,16 @@ export function wrapFetch (sharedEE) {
   })
   wrapPromiseMethod(globalScope, 'fetch', prefix)
 
-  ee.on(prefix + 'end', function (err, res) {
+  ee.on(prefix + 'end', function (err, res, targets) {
     var ctx = this
+    // undefined target reports to container
+    ctx.targets = targets || [undefined]
     if (res) {
       var size = res.headers.get('content-length')
       if (size !== null) {
         ctx.rxSize = size
       }
+
       ee.emit(prefix + 'done', [null, res], ctx)
     } else {
       ee.emit(prefix + 'done', [err], ctx)
@@ -67,11 +71,14 @@ export function wrapFetch (sharedEE) {
    */
   function wrapPromiseMethod (target, name, prefix) {
     var fn = target[name]
+
     if (typeof fn === 'function') {
       target[name] = function () {
         var args = [...arguments]
 
-        var ctx = {}
+        const ctx = {}
+        const targets = findTargetsFromStackTrace(agentRef)
+
         // we are wrapping args in an array so we can preserve the reference
         ee.emit(prefix + 'before-start', [args], ctx)
         var dtPayload
@@ -83,10 +90,10 @@ export function wrapFetch (sharedEE) {
 
         // Note we need to cast the returned (orig) Promise from native APIs into the current global Promise, which may or may not be our WrappedPromise.
         return origPromiseFromFetch.then(function (val) {
-          ee.emit(prefix + 'end', [null, val], origPromiseFromFetch)
+          ee.emit(prefix + 'end', [null, val, targets], origPromiseFromFetch)
           return val
         }, function (err) {
-          ee.emit(prefix + 'end', [err], origPromiseFromFetch)
+          ee.emit(prefix + 'end', [err, undefined, targets], origPromiseFromFetch)
           throw err
         })
       }

package/src/common/wrap/wrap-function.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
  */
 
@@ -9,6 +9,7 @@
 
 import { ee } from '../event-emitter/contextual-ee'
 import { bundleId } from '../ids/bundle-id'
+import { findTargetsFromStackTrace } from '../util/v2'
 
 export const flag = `nr@original:${bundleId}`
 const LONG_TASK_THRESHOLD = 50
@@ -34,7 +35,7 @@ export default createWrapperWithEmitter
  * @param {boolean} always - If `true`, emit events even if already emitting an event.
  * @returns {function} The wrapped function.
  */
-export function createWrapperWithEmitter (emitter, always) {
+export function createWrapperWithEmitter (emitter, always, agentRef) {
   emitter || (emitter = ee)
 
   wrapFn.inPlace = inPlace
@@ -55,9 +56,10 @@ export function createWrapperWithEmitter (emitter, always) {
    * @param {function|object} getContext - The function or object that will serve as the 'this' context for handlers of events emitted by this wrapper.
    * @param {string} methodName - The name of the method being wrapped.
    * @param {boolean} bubble - If true, emitted events should also bubble up to the old emitter upon which the `emitter` in the current scope was based (if it defines one).
+   * @param {boolean} [evaluateStack] - If true, the wrapper will attempt to evaluate the stack of the executed wrapped function to find targets of the execution (ex. the MFE source of a console.log).
    * @returns {function} The wrapped function.
    */
-  function wrapFn (fn, prefix, getContext, methodName, bubble) {
+  function wrapFn (fn, prefix, getContext, methodName, bubble, evaluateStack) {
     // Unless fn is both wrappable and unwrapped, return it unchanged.
     if (notWrappable(fn)) return fn
 
@@ -78,11 +80,16 @@ export function createWrapperWithEmitter (emitter, always) {
       var ctx
       var result
       let thrownError
+      let targets
 
       try {
         originalThis = this
         args = [...arguments]
 
+        // certain wrappers can inform the function wrapper to evaluate the stack of the executed wrapped function to find targets of the execution
+        // (e.g. wrap-logger can inform this method to find try to find the MFE source of a console.log)
+        targets = evaluateStack ? findTargetsFromStackTrace(agentRef) : [undefined] // undefined target always maps to the container agent
+
         if (typeof getContext === 'function') {
           ctx = getContext(args, originalThis)
         } else {
@@ -93,7 +100,7 @@ export function createWrapperWithEmitter (emitter, always) {
       }
 
       // Warning: start events may mutate args!
-      safeEmit(prefix + 'start', [args, originalThis, methodName], ctx, bubble)
+      safeEmit(prefix + 'start', [args, originalThis, methodName, targets], ctx, bubble)
 
       const fnStartTime = performance.now()
       let fnEndTime
@@ -103,7 +110,7 @@ export function createWrapperWithEmitter (emitter, always) {
         return result
       } catch (err) {
         fnEndTime = performance.now()
-        safeEmit(prefix + 'err', [args, originalThis, err], ctx, bubble)
+        safeEmit(prefix + 'err', [args, originalThis, err, targets], ctx, bubble)
         // rethrow error so we don't effect execution by observing.
         thrownError = err
         throw thrownError
@@ -120,10 +127,10 @@ export function createWrapperWithEmitter (emitter, always) {
         }
         // standalone long task message
         if (task.isLongTask) {
-          safeEmit('long-task', [task, originalThis], ctx, bubble)
+          safeEmit('long-task', [task, originalThis, targets], ctx, bubble)
         }
         // -end message also includes the task execution info
-        safeEmit(prefix + 'end', [args, originalThis, result], ctx, bubble)
+        safeEmit(prefix + 'end', [args, originalThis, result, targets], ctx, bubble)
       }
     }
   }
@@ -139,7 +146,7 @@ export function createWrapperWithEmitter (emitter, always) {
    * @param {boolean} [bubble=false] If `true`, emitted events should also bubble up to the old emitter upon which
    * the `emitter` in the current scope was based (if it defines one).
    */
-  function inPlace (obj, methods, prefix, getContext, bubble) {
+  function inPlace (obj, methods, prefix, getContext, bubble, evaluateStack) {
     if (!prefix) prefix = ''
 
     // If prefix starts with '-' set this boolean to add the method name to the prefix before passing each one to wrap.
@@ -152,7 +159,7 @@ export function createWrapperWithEmitter (emitter, always) {
       // Unless fn is both wrappable and unwrapped, bail so we don't add extra properties with undefined values.
       if (notWrappable(fn)) continue
 
-      obj[method] = wrapFn(fn, (prependMethodPrefix ? method + prefix : prefix), getContext, method, bubble)
+      obj[method] = wrapFn(fn, (prependMethodPrefix ? method + prefix : prefix), getContext, method, bubble, evaluateStack)
     }
   }
 

package/src/common/wrap/wrap-logger.js

@@ -24,10 +24,10 @@ const contextMap = new Map()
  * @returns {Object} Scoped event emitter with a debug ID of `logger`.
  */
 // eslint-disable-next-line
-export function wrapLogger(sharedEE, parent, loggerFn, context, autoCaptured = true) {
+export function wrapLogger(sharedEE, parent, loggerFn, context, autoCaptured = true, agentRef) {
   if (!(typeof parent === 'object' && !!parent && typeof loggerFn === 'string' && !!loggerFn && typeof parent[loggerFn] === 'function')) return warn(29)
   const ee = scopedEE(sharedEE)
-  const wrapFn = wfn(ee)
+  const wrapFn = wfn(ee, undefined, agentRef)
 
   /**
    * This section contains the context that will be shared across all invoked calls of the wrapped function,
@@ -41,8 +41,10 @@ export function wrapLogger(sharedEE, parent, loggerFn, context, autoCaptured = t
   const contextLookupKey = parent[loggerFn]?.[flag] || parent[loggerFn]
   contextMap.set(contextLookupKey, ctx)
 
-  /** observe calls to <loggerFn> and emit events prefixed with `wrap-logger-` */
-  wrapFn.inPlace(parent, [loggerFn], 'wrap-logger-', () => contextMap.get(contextLookupKey))
+  /** observe calls to <loggerFn> and emit events prefixed with `wrap-logger-`
+   * inform the inplace wrapper to evaluate the stack for targets of the log execution,
+   * so that logs can be attributed to a matching MFE source if being used. */
+  wrapFn.inPlace(parent, [loggerFn], 'wrap-logger-', () => contextMap.get(contextLookupKey), undefined, true)
 
   return ee
 }

package/src/common/wrap/wrap-xhr.js

@@ -14,6 +14,7 @@ import { eventListenerOpts } from '../event-listener/event-listener-opts'
 import { createWrapperWithEmitter as wfn } from './wrap-function'
 import { globalScope } from '../constants/runtime'
 import { warn } from '../util/console'
+import { findTargetsFromStackTrace } from '../util/v2'
 
 const wrapped = {}
 const XHR_PROPS = ['open', 'send'] // these are the specific funcs being wrapped on all XMLHttpRequests(.prototype)
@@ -25,7 +26,7 @@ const XHR_PROPS = ['open', 'send'] // these are the specific funcs being wrapped
  * @returns {Object} Scoped event emitter with a debug ID of `xhr`.
  */
 // eslint-disable-next-line
-export function wrapXhr (sharedEE) {
+export function wrapXhr (sharedEE, agentRef) {
   var baseEE = sharedEE || contextualEE
   const ee = scopedEE(baseEE)
 
@@ -54,6 +55,7 @@ export function wrapXhr (sharedEE) {
   function newXHR (opts) {
     const xhr = new OrigXHR(opts)
     const context = ee.context(xhr)
+    context.targets = findTargetsFromStackTrace(agentRef)
 
     try {
       ee.emit('new-xhr', [xhr], context)

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

@@ -12,6 +12,7 @@ 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/util/v2'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -30,8 +31,8 @@ export class Aggregate extends AggregateBase {
 
     registerHandler('returnAjax', event => this.events.add(event), this.featureName, this.ee)
 
-    registerHandler('xhr', function () { // the EE-drain system not only switches "this" but also passes a new EventContext with info. Should consider platform refactor to another system which passes a mutable context around separately and predictably to avoid problems like this.
-      classThis.storeXhr(...arguments, this) // this switches the context back to the class instance while passing the NR context as an argument -- see "ctx" in storeXhr
+    registerHandler('xhr', function (params, metrics, startTime, endTime, type, target) { // the EE-drain system not only switches "this" but also passes a new EventContext with info. Should consider platform refactor to another system which passes a mutable context around separately and predictably to avoid problems like this.
+      classThis.storeXhr(params, metrics, startTime, endTime, type, target, this) // this switches the context back to the class instance while passing the NR context as an argument -- see "ctx" in storeXhr
     }, this.featureName, this.ee)
 
     this.ee.on('long-task', (task, originator) => {
@@ -44,7 +45,7 @@ export class Aggregate extends AggregateBase {
     this.waitForFlags(([])).then(() => this.drain())
   }
 
-  storeXhr (params, metrics, startTime, endTime, type, ctx) {
+  storeXhr (params, metrics, startTime, endTime, type, target, ctx) {
     metrics.time = startTime
 
     // send to session traces
@@ -108,11 +109,21 @@ export class Aggregate extends AggregateBase {
     })
     if (event.gql) this.reportSupportabilityMetric('Ajax/Events/GraphQL/Bytes-Added', stringify(event.gql).length)
 
+    /** make a copy of the event for the MFE target if it exists */
+    if (target) {
+      this.events.add({ ...event, targetAttributes: getVersion2Attributes(target, this) })
+      if (shouldDuplicate(target, this)) this.reportContainerEvent({ ...event, targetAttributes: getVersion2DuplicationAttributes(target, this) }, ctx)
+    } else {
+      this.reportContainerEvent(event, ctx)
+    }
+  }
+
+  reportContainerEvent (evt, ctx) {
     const softNavInUse = Boolean(this.agentRef.features?.[FEATURE_NAMES.softNav])
     if (softNavInUse) { // when SN is running, pass the event w/ info to it for evaluation -- either part of an interaction or is given back
-      handle('ajax', [event, ctx], undefined, FEATURE_NAMES.softNav, this.ee)
+      handle('ajax', [evt, ctx], undefined, FEATURE_NAMES.softNav, this.ee)
     } else {
-      this.events.add(event)
+      this.events.add(evt)
     }
   }
 
@@ -154,7 +165,12 @@ export class Aggregate extends AggregateBase {
 
       // add custom attributes
       // gql decorators are added as custom attributes to alleviate need for new BEL schema
-      const attrParts = addCustomAttributes({ ...(jsAttributes || {}), ...(event.gql || {}) }, addString)
+      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
+      }, addString)
+
       fields.unshift(numeric(attrParts.length))
 
       insert += fields.join(',')

package/src/features/ajax/instrument/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
  */
 import { gosNREUMOriginals } from '../../../common/window/nreum'
@@ -59,8 +59,8 @@ export class Instrument extends InstrumentBase {
       // do nothing
     }
 
-    wrapFetch(this.ee)
-    wrapXhr(this.ee)
+    wrapFetch(this.ee, agentRef)
+    wrapXhr(this.ee, agentRef)
     subscribeToEvents(agentRef, this.ee, this.handler, this.dt)
 
     this.importAggregator(agentRef, () => import(/* webpackChunkName: "ajax-aggregate" */ '../aggregate/index.js'))
@@ -314,14 +314,11 @@ function subscribeToEvents (agentRef, ee, handler, dt) {
     this.startTime = now()
     this.dt = dtPayload
 
-    if (fetchArguments.length >= 1) this.target = fetchArguments[0]
-    if (fetchArguments.length >= 2) this.opts = fetchArguments[1]
+    let [target, opts = {}] = fetchArguments
 
-    var opts = this.opts || {}
-    var target = this.target
     addUrl(this, extractUrl(target))
 
-    var method = ('' + ((target && target instanceof origRequest && target.method) ||
+    const method = ('' + ((target && target instanceof origRequest && target.method) ||
       opts.method || 'GET')).toUpperCase()
     this.params.method = method
     this.body = opts.body
@@ -350,7 +347,8 @@ function subscribeToEvents (agentRef, ee, handler, dt) {
       duration: now() - this.startTime
     }
 
-    handler('xhr', [this.params, metrics, this.startTime, this.endTime, 'fetch'], this, FEATURE_NAMES.ajax)
+    const payload = [this.params, metrics, this.startTime, this.endTime, 'fetch']
+    this.targets.forEach(target => reportToAgg(payload, this, target))
   }
 
   // Create report for XHR request that has finished
@@ -377,7 +375,12 @@ function subscribeToEvents (agentRef, ee, handler, dt) {
     // Always send cbTime, even if no noticeable time was taken.
     metrics.cbTime = this.cbTime
 
-    handler('xhr', [params, metrics, this.startTime, this.endTime, 'xhr'], this, FEATURE_NAMES.ajax)
+    const payload = [params, metrics, this.startTime, this.endTime, 'xhr']
+    this.targets.forEach(target => reportToAgg(payload, this, target))
+  }
+
+  function reportToAgg (payload, context, target) {
+    handler('xhr', [...payload, target], context, FEATURE_NAMES.ajax)
   }
 
   function captureXhrData (ctx, xhr) {

package/src/features/generic_events/instrument/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
  */
 
@@ -48,8 +48,8 @@ export class Instrument extends InstrumentBase {
     let historyEE, websocketsEE
     if (websocketsEnabled) websocketsEE = wrapWebSocket(this.ee)
     if (isBrowserScope) {
-      wrapFetch(this.ee)
-      wrapXhr(this.ee)
+      wrapFetch(this.ee, agentRef)
+      wrapXhr(this.ee, agentRef)
       historyEE = wrapHistory(this.ee)
 
       if (agentRef.init.user_actions.enabled) {

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

@@ -13,7 +13,7 @@ import { applyFnToProps } from '../../../common/util/traverse'
 import { SESSION_EVENT_TYPES, SESSION_EVENTS } from '../../../common/session/constants'
 import { ABORT_REASONS } from '../../session_replay/constants'
 import { canEnableSessionTracking } from '../../utils/feature-gates'
-import { getVersion2Attributes } from '../../../common/util/v2'
+import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate } from '../../../common/util/v2'
 
 const LOGGING_EVENT = 'Logging/Event/'
 
@@ -73,12 +73,6 @@ export class Aggregate extends AggregateBase {
 
     if (!attributes || typeof attributes !== 'object') attributes = {}
 
-    attributes = {
-      ...attributes,
-      /** Specific attributes only supplied if harvesting to endpoint version 2 */
-      ...(getVersion2Attributes(target, this))
-    }
-
     if (typeof level === 'string') level = level.toUpperCase()
     if (!isValidLogLevel(level)) return warn(30, level)
     if (modeForThisLog < (LOGGING_MODE[level] || Infinity)) {
@@ -104,14 +98,19 @@ export class Aggregate extends AggregateBase {
     }
     if (typeof message !== 'string' || !message) return warn(32)
 
-    const log = new Log(
-      Math.floor(this.agentRef.runtime.timeKeeper.correctRelativeTimestamp(timestamp)),
-      message,
-      attributes,
-      level
-    )
+    const addEvent = (attributes) => {
+      const log = new Log(
+        Math.floor(this.agentRef.runtime.timeKeeper.correctRelativeTimestamp(timestamp)),
+        message,
+        attributes,
+        level
+      )
+
+      if (this.events.add(log)) this.reportSupportabilityMetric(LOGGING_EVENT + (autoCaptured ? 'Auto' : 'API') + '/Added')
+    }
 
-    if (this.events.add(log)) this.reportSupportabilityMetric(LOGGING_EVENT + (autoCaptured ? 'Auto' : 'API') + '/Added')
+    addEvent({ ...attributes, ...getVersion2Attributes(target, this) })
+    if (shouldDuplicate(target, this)) addEvent({ ...attributes, ...getVersion2DuplicationAttributes(target, this) })
   }
 
   serializer (eventBuffer) {

package/src/features/logging/instrument/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
  */
 import { InstrumentBase } from '../../utils/instrument-base'
@@ -27,13 +27,15 @@ export class Instrument extends InstrumentBase {
 
     globals.forEach((method) => {
       isNative(globalScope.console[method])
-      wrapLogger(instanceEE, globalScope.console, method, { level: method === 'log' ? 'info' : method })
+      wrapLogger(instanceEE, globalScope.console, method, { level: method === 'log' ? 'info' : method }, undefined, agentRef)
     })
 
     /** emitted by wrap-logger function */
-    this.ee.on('wrap-logger-end', function handleLog ([message]) {
+    this.ee.on('wrap-logger-end', function handleLog ([message], _, __, targets = []) {
       const { level, customAttributes, autoCaptured } = this
-      bufferLog(instanceEE, message, customAttributes, level, autoCaptured)
+      targets.forEach(target => {
+        bufferLog(instanceEE, message, customAttributes, level, autoCaptured, target)
+      })
     })
     this.importAggregator(agentRef, () => import(/* webpackChunkName: "logging-aggregate" */ '../aggregate'))
   }

package/src/features/logging/shared/utils.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 { handle } from '../../../common/event-emitter/handle'
@@ -14,11 +14,11 @@ import { LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS } from '../constants'
    * @param {{[key: string]: *}} customAttributes - The log's custom attributes if any
    * @param {enum} level - the log level enum
    * @param {boolean} [autoCaptured=true] - True if log was captured from auto wrapping. False if it was captured from the API manual usage.
-   * @param {object=} target - the optional target provided by an api call
+   * @param {object=} targets - the optional targets found
    */
-export function bufferLog (ee, message, customAttributes = {}, level = LOG_LEVELS.INFO, autoCaptured = true, target, timestamp = now()) {
+export function bufferLog (ee, message, customAttributes = {}, level = LOG_LEVELS.INFO, autoCaptured = true, targets, timestamp = now()) {
   handle(SUPPORTABILITY_METRIC_CHANNEL, [`API/logging/${level.toLowerCase()}/called`], undefined, FEATURE_NAMES.metrics, ee)
-  handle(LOGGING_EVENT_EMITTER_CHANNEL, [timestamp, message, customAttributes, level, autoCaptured, target], undefined, FEATURE_NAMES.logging, ee)
+  handle(LOGGING_EVENT_EMITTER_CHANNEL, [timestamp, message, customAttributes, level, autoCaptured, targets], undefined, FEATURE_NAMES.logging, ee)
 }
 
 /**