@newrelic/browser-agent 1.320.1-rc.1 → 1.320.1-rc.2

package/src/common/wrap/wrap-events.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
  */
 
@@ -24,16 +24,17 @@ const flag = `nr@wrapped:${contextId}`
  * `document` (if in a browser scope). Adds custom events in context of a new emitter scoped only to these methods.
  * @param {Object} sharedEE - The shared event emitter on which a new scoped
  *     event emitter will be based.
+ * @param {*} [agentRef] - The agent reference, used to attribute wrapped calls to the correct v2 target.
  * @returns {Object} Scoped event emitter with a debug ID of `events`.
  */
-export function wrapEvents (sharedEE) {
+export function wrapEvents (sharedEE, agentRef) {
   var ee = scopedEE(sharedEE)
 
   // Notice if our wrapping never ran yet, the falsy NaN will not early return; but if it has,
   // then we increment the count to track # of feats using this at runtime.
   if (wrapped[ee.debugId]++) return ee
   wrapped[ee.debugId] = 1 // otherwise, first feature to wrap events
-  var wrapFn = wfn(ee, true)
+  var wrapFn = wfn(ee, true, agentRef)
 
   // Guard against instrumenting environments w/o necessary features
   if ('getPrototypeOf' in Object) {

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

@@ -47,8 +47,8 @@ export function wrapFetch (sharedEE, agentRef) {
 
   ee.on(prefix + 'end', function (err, res, targets) {
     var ctx = this
-    // undefined target reports to container
-    ctx.targets = targets || [undefined]
+    // default target reports to container
+    ctx.targets = targets || [agentRef.runtime.v2Target]
     if (res) {
       var size = res.headers.get('content-length')
       if (size !== null) {

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

@@ -88,7 +88,7 @@ export function createWrapperWithEmitter (emitter, always, agentRef) {
 
         // 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
+        targets = evaluateStack ? findTargetsFromStackTrace(agentRef) : [agentRef?.runtime?.v2Target] // default target always maps to the container agent
 
         if (typeof getContext === 'function') {
           ctx = getContext(args, originalThis)

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

@@ -18,9 +18,10 @@ const HISTORY_FNS = ['pushState', 'replaceState']
  * Wraps the `pushState` and `replaceState` methods of `window.history` and returns a corresponding event emitter
  * scoped to the history object.
  * @param {Object} sharedEE - The shared event emitter on which a new scoped event emitter will be based.
+ * @param {*} [agentRef] - The agent reference, used to attribute wrapped calls to the correct v2 target.
  * @returns {Object} Scoped event emitter with a debug ID of `history`.
  */
-export function wrapHistory (sharedEE) {
+export function wrapHistory (sharedEE, agentRef) {
   const ee = scopedEE(sharedEE)
 
   // Notice if our wrapping never ran yet, the falsy NaN will not early return; but if it has,
@@ -29,7 +30,7 @@ export function wrapHistory (sharedEE) {
   if (!isBrowserScope || wrapped[ee.debugId]++) return ee
   wrapped[ee.debugId] = 1 // otherwise, first feature to wrap history
 
-  var wrapFn = wfn(ee)
+  var wrapFn = wfn(ee, undefined, agentRef)
   /*
    * For objects that will be instantiated more than once, we wrap the object's prototype methods. The history object
    * is instantiated only once, so we can wrap its methods directly--and we must wrap the history methods directly as

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

@@ -37,8 +37,8 @@ export function wrapXhr (sharedEE, agentRef) {
   if (wrapped[ee.debugId]++) return ee
   wrapped[ee.debugId] = 1 // otherwise, first feature to wrap XHR
 
-  wrapEvents(baseEE) // wrap-events patches XMLHttpRequest.prototype.addEventListener for us
-  var wrapFn = wfn(ee)
+  wrapEvents(baseEE, agentRef) // wrap-events patches XMLHttpRequest.prototype.addEventListener for us
+  var wrapFn = wfn(ee, undefined, agentRef)
 
   var OrigXHR = globalScope.XMLHttpRequest
   var MutationObserver = globalScope.MutationObserver

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

@@ -14,7 +14,7 @@ import { gosNREUMOriginals } from '../../../common/window/nreum'
 import { hasGQLErrors, parseGQL } from './gql'
 import { canCapturePayload, isLikelyHumanReadable, parseQueryString, createStringAdders } from '../../../common/payloads/payloads'
 import { Obfuscator } from '../../../common/util/obfuscate'
-import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate } from '../../../common/v2/utils'
+import { getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate, isMfeTarget } from '../../../common/v2/utils'
 import { EVENT_TYPES } from '../../../common/constants/events'
 import { generateUuid } from '../../../common/ids/unique-id'
 
@@ -137,7 +137,7 @@ 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) {
+    if (isMfeTarget(target)) {
       this.events.add({ ...event, targetAttributes: getVersion2Attributes(target, this) })
       if (shouldDuplicate(target, this)) this.reportContainerEvent({ ...event, targetAttributes: getVersion2DuplicationAttributes(target, this) }, ctx)
     } else {

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

@@ -252,7 +252,7 @@ export class Aggregate extends AggregateBase {
       }, this.featureName, this.ee)
 
       if (agentRef.init.feature_flags.includes('websockets') || agentRef.init.web_sockets?.enabled) {
-        registerHandler('ws-complete', (nrData, targets = [undefined]) => {
+        registerHandler('ws-complete', (nrData, targets = [agentRef.runtime.v2Target]) => {
           targets.forEach(target => {
             const event = {
               ...nrData,

package/src/features/generic_events/instrument/index.js

@@ -68,7 +68,7 @@ export class Instrument extends InstrumentBase {
     if (isBrowserScope) {
       wrapFetch(this.ee, agentRef)
       wrapXhr(this.ee, agentRef)
-      historyEE = wrapHistory(this.ee)
+      historyEE = wrapHistory(this.ee, agentRef)
 
       if (agentRef.init.user_actions.enabled) {
         OBSERVED_EVENTS.forEach(eventType =>

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

@@ -19,7 +19,7 @@ import { AggregateBase } from '../../utils/aggregate-base'
 import { now } from '../../../common/timing/now'
 import { Obfuscator } from '../../../common/util/obfuscate'
 import { evaluateInternalError } from './internal-errors'
-import { getRegisteredTargetsFromFilename, getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate } from '../../../common/v2/utils'
+import { getRegisteredTargetsFromFilename, getVersion2Attributes, getVersion2DuplicationAttributes, shouldDuplicate, isMfeTarget } from '../../../common/v2/utils'
 import { buildCauseString } from './cause-string'
 import { ShortCircuit } from '../../../common/util/short-circuit'
 import { EVENT_TYPES } from '../../../common/constants/events'
@@ -209,7 +209,7 @@ export class Aggregate extends AggregateBase {
           if (targets.length) break
         }
       }
-      if (!targets.length) targets.push(undefined)
+      if (!targets.length) targets.push(this.agentRef.runtime.v2Target)
     }
     return targets
   }
@@ -253,7 +253,7 @@ export class Aggregate extends AggregateBase {
     if (filterOutput?.group) params.errorGroup = filterOutput.group
 
     // Should only decorate "hasReplay" for the container agent, so check if the target matches the config
-    if (hasReplay && !target) params.hasReplay = hasReplay
+    if (hasReplay && !isMfeTarget(target)) params.hasReplay = hasReplay
     /**
      * The bucketHash is different from the params.stackHash because the params.stackHash is based on the canonicalized
      * stack trace and is used downstream in NR1 to attempt to group the same errors across different browsers. However,
@@ -289,7 +289,7 @@ export class Aggregate extends AggregateBase {
 
     // Trace sends the error in its payload, and both trace & replay simply listens for any error to occur.
     const jsErrorEvent = [type, bucketHash, params, newMetrics, customAttributes]
-    if (!target) handle('trace-jserror', jsErrorEvent, undefined, FEATURE_NAMES.sessionTrace, this.ee)
+    if (!isMfeTarget(target)) handle('trace-jserror', jsErrorEvent, undefined, FEATURE_NAMES.sessionTrace, this.ee)
     // still send EE events for other features such as above, but stop this one from aggregating internal data
     if (this.blocked) return
 
@@ -297,7 +297,7 @@ export class Aggregate extends AggregateBase {
       customAttributes.socketId = err.__newrelic.socketId
     }
 
-    if (!target) {
+    if (!isMfeTarget(target)) {
       const softNavInUse = Boolean(this.agentRef.features?.[FEATURE_NAMES.softNav])
       if (softNavInUse) { // pass the error to soft nav for evaluation - it will return it via 'returnJserror' when interaction is resolved
         handle('jserror', [jsErrorEvent], undefined, FEATURE_NAMES.softNav, this.ee)
@@ -307,7 +307,7 @@ export class Aggregate extends AggregateBase {
     }
 
     // always add directly if scoped to a sub-entity, the other pathways above will be deterministic if the main agent should procede
-    if (target) this.#storeJserrorForHarvest(jsErrorEvent, {}, target)
+    if (isMfeTarget(target)) this.#storeJserrorForHarvest(jsErrorEvent, {}, target)
   }
 
   /**

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

@@ -31,7 +31,7 @@ export class Instrument extends InstrumentBase {
     })
 
     /** emitted by wrap-logger function */
-    this.ee.on('wrap-logger-end', function handleLog ([message], _, __, targets = []) {
+    this.ee.on('wrap-logger-end', function handleLog ([message], _, __, targets = [agentRef.runtime.v2Target]) {
       const { level, customAttributes, autoCaptured } = this
       targets.forEach(target => {
         bufferLog(instanceEE, message, customAttributes, level, autoCaptured, target)

package/src/features/session_trace/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 { handle } from '../../../common/event-emitter/handle'
@@ -33,8 +33,8 @@ export class Instrument extends InstrumentBase {
     }
 
     const thisInstrumentEE = this.ee
-    wrapHistory(thisInstrumentEE)
-    this.eventsEE = wrapEvents(thisInstrumentEE)
+    wrapHistory(thisInstrumentEE, agentRef)
+    this.eventsEE = wrapEvents(thisInstrumentEE, agentRef)
 
     this.eventsEE.on(FN_START, function (args, target) {
       this.bstStart = now()

package/src/features/soft_navigations/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'
@@ -30,7 +30,7 @@ export class Instrument extends InstrumentBase {
 
     if (!isBrowserScope || !gosNREUMOriginals().o.MO) return // soft navigations is not supported outside web env or browsers without the mutation observer API
 
-    const historyEE = wrapHistory(this.ee)
+    const historyEE = wrapHistory(this.ee, agentRef)
     try {
       this.removeOnAbort = new AbortController()
     } catch (e) {}

package/src/loaders/api/register.js

@@ -4,7 +4,7 @@
  */
 import { handle } from '../../common/event-emitter/handle'
 import { warn } from '../../common/util/console'
-import { V2_TYPES } from '../../common/v2/utils'
+import { V2_TYPES } from '../../common/v2/constants'
 import { FEATURE_NAMES } from '../features/features'
 import { now } from '../../common/timing/now'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../features/metrics/constants'

package/src/loaders/configure/configure.js

@@ -7,6 +7,7 @@ import { gosCDN } from '../../common/window/nreum'
 import { mergeInfo } from '../../common/config/info'
 import { mergeInit } from '../../common/config/init'
 import { mergeRuntime } from '../../common/config/runtime'
+import { V2_TYPES } from '../../common/v2/constants'
 import { isWorkerScope, globalScope } from '../../common/constants/runtime'
 import { redefinePublicPath } from './public-path'
 import { ee } from '../../common/event-emitter/contextual-ee'
@@ -43,6 +44,17 @@ export function configure (agent, opts = {}, loaderType, forceDrain) {
   const updatedInit = agent.init
 
   agent.runtime ??= mergeRuntime(runtime)
+  agent.runtime.v2Target ??= {
+    type: V2_TYPES.BA,
+    instance: agent.agentIdentifier,
+    get id () { return agent.runtime.appMetadata?.agents?.[0]?.entityGuid },
+    get attributes () {
+      return {
+        'entity.guid': this.id,
+        appId: agent.info.applicationID
+      }
+    }
+  }
 
   // Apply proxy settings whenever configure is called (supports late {init} setting)
   if (updatedInit.proxy.assets) {