@newrelic/browser-agent 1.311.0 → 1.312.0

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

@@ -14,7 +14,7 @@ var _wrapLogger2 = require("../../../loaders/api/wrapLogger");
 var _register = require("../../../loaders/api/register");
 var _monkeyPatched = require("../../../common/util/monkey-patched");
 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-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 class Instrument extends _instrumentBase.InstrumentBase {
@@ -32,17 +32,19 @@ class Instrument extends _instrumentBase.InstrumentBase {
       (0, _monkeyPatched.isNative)(_runtime.globalScope.console[method]);
       (0, _wrapLogger.wrapLogger)(instanceEE, _runtime.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;
-      (0, _utils.bufferLog)(instanceEE, message, customAttributes, level, autoCaptured);
+      targets.forEach(target => {
+        (0, _utils.bufferLog)(instanceEE, message, customAttributes, level, autoCaptured, target);
+      });
     });
     this.importAggregator(agentRef, () => Promise.resolve().then(() => _interopRequireWildcard(require(/* webpackChunkName: "logging-aggregate" */'../aggregate'))));
   }

package/dist/cjs/features/logging/shared/utils.js

@@ -11,7 +11,7 @@ var _features = require("../../../loaders/features/features");
 var _constants = require("../../metrics/constants");
 var _constants2 = require("../constants");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -21,11 +21,11 @@ var _constants2 = require("../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
    */
-function bufferLog(ee, message, customAttributes = {}, level = _constants2.LOG_LEVELS.INFO, autoCaptured = true, target, timestamp = (0, _now.now)()) {
+function bufferLog(ee, message, customAttributes = {}, level = _constants2.LOG_LEVELS.INFO, autoCaptured = true, targets, timestamp = (0, _now.now)()) {
   (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ["API/logging/".concat(level.toLowerCase(), "/called")], undefined, _features.FEATURE_NAMES.metrics, ee);
-  (0, _handle.handle)(_constants2.LOGGING_EVENT_EMITTER_CHANNEL, [timestamp, message, customAttributes, level, autoCaptured, target], undefined, _features.FEATURE_NAMES.logging, ee);
+  (0, _handle.handle)(_constants2.LOGGING_EVENT_EMITTER_CHANNEL, [timestamp, message, customAttributes, level, autoCaptured, targets], undefined, _features.FEATURE_NAMES.logging, ee);
 }
 
 /**

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

@@ -8,7 +8,7 @@ var _belSerializer = require("../../../common/serialize/bel-serializer");
 var _constants = require("../constants");
 var _belNode = require("./bel-node");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -27,6 +27,7 @@ class AjaxNode extends _belNode.BelNode {
     this.traceId = ajaxEvent.traceId;
     this.spanTimestamp = ajaxEvent.spanTimestamp;
     this.gql = ajaxEvent.gql;
+    this.targetAttributes = ajaxEvent.targetAttributes;
     this.start = ajaxEvent.startTime;
     this.end = ajaxEvent.endTime;
     if (ajaxContext?.latestLongtaskEnd) {
@@ -50,8 +51,10 @@ class AjaxNode extends _belNode.BelNode {
     (0, _belSerializer.numeric)(this.callbackDuration),
     // not relative
     addString(this.method), (0, _belSerializer.numeric)(this.status), addString(this.domain), addString(this.path), (0, _belSerializer.numeric)(this.txSize), (0, _belSerializer.numeric)(this.rxSize), this.requestedWith, addString(this.nodeId), (0, _belSerializer.nullable)(this.spanId, addString, true) + (0, _belSerializer.nullable)(this.traceId, addString, true) + (0, _belSerializer.nullable)(this.spanTimestamp, _belSerializer.numeric)];
-    let allAttachedNodes = [];
-    if (typeof this.gql === 'object') allAttachedNodes = (0, _belSerializer.addCustomAttributes)(this.gql, addString);
+    let allAttachedNodes = (0, _belSerializer.addCustomAttributes)({
+      ...(this.gql || {}),
+      ...(this.targetAttributes || {})
+    }, addString);
     this.children.forEach(node => allAttachedNodes.push(node.serialize())); // no children is expected under ajax nodes at this time
 
     fields[1] = (0, _belSerializer.numeric)(allAttachedNodes.length);

package/dist/cjs/loaders/api/register.js

@@ -20,6 +20,7 @@ var _measure = require("./measure");
 var _recordCustomEvent = require("./recordCustomEvent");
 var _pageVisibility = require("../../common/window/page-visibility");
 var _scriptTracker = require("../../common/util/script-tracker");
+var _uniqueId = require("../../common/ids/unique-id");
 /**
  * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -53,13 +54,32 @@ function setupRegisterAPI(agent) {
 function register(agentRef, target, parent) {
   (0, _console.warn)(54, 'newrelic.register');
   target ||= {};
+  target.instance = (0, _uniqueId.generateRandomHexString)(8);
   target.type = _v.V2_TYPES.MFE;
   target.licenseKey ||= agentRef.info.licenseKey; // will inherit the license key from the container agent if not provided for brevity. A future state may dictate that we need different license keys to do different things.
   target.blocked = false;
-  target.parent = parent || {};
   if (typeof target.tags !== 'object' || target.tags === null || Array.isArray(target.tags)) target.tags = {};
+  target.parent = parent || {
+    get id() {
+      return agentRef.runtime.appMetadata.agents[0].entityGuid;
+    },
+    // getter because this is asyncronously set
+    type: _v.V2_TYPES.BA
+  };
   const timings = (0, _scriptTracker.findScriptTimings)();
   const attrs = {};
+  Object.defineProperty(target, 'attributes', {
+    get() {
+      return {
+        ...attrs,
+        'source.id': target.id,
+        'source.name': target.name,
+        'source.type': target.type,
+        'parent.type': target.parent?.type || _v.V2_TYPES.BA,
+        'parent.id': target.parent?.id
+      };
+    }
+  });
 
   // Process tags object and add to attrs, excluding protected keys
   Object.entries(target.tags).forEach(([key, value]) => {
@@ -140,7 +160,9 @@ function register(agentRef, target, parent) {
     setUserId: value => setLocalValue('enduser.id', value),
     /** metadata */
     metadata: {
-      customAttributes: attrs,
+      get customAttributes() {
+        return attrs;
+      },
       target,
       timings
     }
@@ -213,27 +235,6 @@ function register(agentRef, target, parent) {
     const timestamp = (0, _now.now)();
     (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ["API/register/".concat(methodToCall.name, "/called")], undefined, _features.FEATURE_NAMES.metrics, agentRef.ee);
     try {
-      const shouldDuplicate = agentRef.init.api.duplicate_registered_data && methodToCall !== register;
-      if (shouldDuplicate) {
-        let duplicatedArgs = args;
-        if (args[1] instanceof Object) {
-          const childAttrs = {
-            'child.id': target.id,
-            'child.type': target.type
-          };
-          if ('customAttributes' in args[1]) duplicatedArgs = [args[0], {
-            ...args[1],
-            customAttributes: {
-              ...args[1].customAttributes,
-              ...childAttrs
-            }
-          }, ...args.slice(2)];else duplicatedArgs = [args[0], {
-            ...args[1],
-            ...childAttrs
-          }, ...args.slice(2)];
-        }
-        methodToCall(...duplicatedArgs, undefined, timestamp);
-      }
       return methodToCall(...args, target, timestamp); // always report to target
     } catch (err) {
       (0, _console.warn)(50, err);

package/dist/cjs/loaders/api/wrapLogger.js

@@ -9,7 +9,7 @@ var _constants = require("../../features/logging/constants");
 var _constants2 = require("./constants");
 var _sharedHandlers = require("./sharedHandlers");
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -21,6 +21,6 @@ function setupWrapLoggerAPI(agent) {
     (0, _wrapLogger.wrapLogger)(agent.ee, parent, functionName, {
       customAttributes,
       level
-    }, false);
+    }, false, agent);
   }, agent);
 }

package/dist/esm/common/constants/agent-constants.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 { FEATURE_NAMES } from '../../loaders/features/features';
@@ -9,8 +9,7 @@ export const DEFAULT_KEY = 'NR_CONTAINER_AGENT';
 export const SESSION_ERROR = 'SESSION_ERROR';
 export const SUPPORTS_REGISTERED_ENTITIES = {
   [FEATURE_NAMES.logging]: true,
-  // flip other features here when they are supported by DEM consumers
-  [FEATURE_NAMES.genericEvents]: false,
-  [FEATURE_NAMES.jserrors]: false,
-  [FEATURE_NAMES.ajax]: false
+  [FEATURE_NAMES.genericEvents]: true,
+  [FEATURE_NAMES.jserrors]: true,
+  [FEATURE_NAMES.ajax]: true
 };

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.311.0";
+export const VERSION = "1.312.0";
 
 /**
  * Exposes the build type of the agent
@@ -25,4 +25,4 @@ export const BUILD_ENV = "CDN";
 export const DIST_METHOD = 'CDN';
 export const RRWEB_PACKAGE_NAME = '@newrelic/rrweb';
 // Babel will inline this with the rrweb (fork) version on CDN builds.
-export const RRWEB_VERSION = "1.0.1";
+export const RRWEB_VERSION = "1.1.0";

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.311.0";
+export const VERSION = "1.312.0";
 
 /**
  * Exposes the build type of the agent
@@ -26,4 +26,4 @@ export const BUILD_ENV = 'NPM';
 export const DIST_METHOD = 'NPM';
 export const RRWEB_PACKAGE_NAME = '@newrelic/rrweb';
 // Babel will inline this with the rrweb (fork) version on NPM dist esm/cjs builds.
-export const RRWEB_VERSION = "1.0.1";
+export const RRWEB_VERSION = "1.1.0";

package/dist/esm/common/util/script-tracker.js

@@ -59,7 +59,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();
   const lines = stack.split('\n');
@@ -83,7 +83,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/dist/esm/common/util/stringify.js

@@ -7,32 +7,17 @@ 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/dist/esm/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,65 @@ export function getVersion2Attributes(target, aggregateInstance) {
     };
   }
   /** otherwise, the data belongs to the target (MFE) and should be attributed as such */
+  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 {
-    '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
+    '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/dist/esm/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-';
 var bodyMethods = ['arrayBuffer', 'blob', 'json', 'text', 'formData'];
@@ -25,7 +26,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;
@@ -41,8 +42,10 @@ export function wrapFetch(sharedEE) {
     wrapPromiseMethod(Res[proto], method, bodyPrefix);
   });
   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) {
@@ -67,7 +70,9 @@ export function wrapFetch(sharedEE) {
     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;
@@ -77,10 +82,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/dist/esm/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:".concat(bundleId);
 const LONG_TASK_THRESHOLD = 50;
 
@@ -33,7 +34,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;
 
@@ -52,9 +53,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;
     if (!prefix) prefix = '';
@@ -73,9 +75,15 @@ 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 {
@@ -86,7 +94,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;
       try {
@@ -95,7 +103,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;
@@ -112,10 +120,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);
       }
     }
   }
@@ -131,7 +139,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.
@@ -142,7 +150,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/dist/esm/common/wrap/wrap-logger.js

@@ -23,10 +23,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,
@@ -39,8 +39,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/dist/esm/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)
 
@@ -24,7 +25,7 @@ const XHR_PROPS = ['open', 'send']; // these are the specific funcs being wrappe
  * @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);
   if (typeof globalScope.XMLHttpRequest === 'undefined') return ee;
@@ -47,6 +48,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);
       xhr.addEventListener(READY_STATE_CHANGE, wrapXHR(context), eventListenerOpts(false));