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

package/dist/cjs/common/config/init-types.js

@@ -40,7 +40,7 @@ exports.default = void 0;
  * @property {Object} [metrics]
  * @property {boolean} [metrics.enabled] - Turn on/off the metrics feature (on by default).
  * @property {boolean} [metrics.autoStart] - If true, the agent will automatically start the metrics feature. Otherwise, it will be in a deferred state until the `start` API method is called.
- * @property {Array<Object>} [obfuscate] - Array of regexp and corresponding replacement patterns for obfuscating data.
+ * @property {{regex: RegExp | string, replacement: string}[]} [obfuscate] - Array of regexp and corresponding replacement patterns for obfuscating data.
  * @property {Object} [page_action]
  * @property {boolean} [page_action.enabled] - Must be true to allow PageAction events to be captured.
  * @property {Object} [page_view_event]

package/dist/cjs/common/config/init.js

@@ -27,6 +27,7 @@ const InitModelFn = () => {
   const hiddenState = {
     feature_flags: [],
     experimental: {
+      allow_registered_children: false,
       resources: false
     },
     mask_selector: '*',
@@ -59,7 +60,12 @@ const InitModelFn = () => {
       autoStart: true
     },
     api: {
-      allow_registered_children: true,
+      get allow_registered_children() {
+        return hiddenState.feature_flags.includes(_constants.FEATURE_FLAGS.REGISTER) || hiddenState.experimental.allow_registered_children;
+      },
+      set allow_registered_children(val) {
+        hiddenState.experimental.allow_registered_children = val;
+      },
       duplicate_registered_data: false
     },
     distributed_tracing: {

package/dist/cjs/common/config/runtime.js

@@ -29,7 +29,6 @@ const RuntimeModel = {
   customTransaction: undefined,
   denyList: undefined,
   disabled: false,
-  entityManager: undefined,
   harvester: undefined,
   isolatedBacklog: false,
   isRecording: false,
@@ -42,6 +41,7 @@ const RuntimeModel = {
   releaseIds: {},
   session: undefined,
   timeKeeper: undefined,
+  registeredEntities: [],
   /** a proxy is set in agent-session to track jsAttributes changes for harvesting mechanics */
   jsAttributesMetadata: {
     bytes: 0

package/dist/cjs/common/constants/agent-constants.js

@@ -3,12 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SESSION_ERROR = exports.MAX_PAYLOAD_SIZE = exports.IDEAL_PAYLOAD_SIZE = exports.DEFAULT_KEY = void 0;
+exports.SUPPORTS_REGISTERED_ENTITIES = exports.SESSION_ERROR = exports.MAX_PAYLOAD_SIZE = exports.IDEAL_PAYLOAD_SIZE = exports.DEFAULT_KEY = void 0;
+var _features = require("../../loaders/features/features");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+
 const IDEAL_PAYLOAD_SIZE = exports.IDEAL_PAYLOAD_SIZE = 16000;
 const MAX_PAYLOAD_SIZE = exports.MAX_PAYLOAD_SIZE = 1000000;
 const DEFAULT_KEY = exports.DEFAULT_KEY = 'NR_CONTAINER_AGENT';
-const SESSION_ERROR = exports.SESSION_ERROR = 'SESSION_ERROR';
+const SESSION_ERROR = exports.SESSION_ERROR = 'SESSION_ERROR';
+const SUPPORTS_REGISTERED_ENTITIES = exports.SUPPORTS_REGISTERED_ENTITIES = {
+  [_features.FEATURE_NAMES.logging]: true,
+  // flip other features here when they are supported by DEM consumers
+  [_features.FEATURE_NAMES.genericEvents]: false,
+  [_features.FEATURE_NAMES.jserrors]: false,
+  [_features.FEATURE_NAMES.ajax]: false
+};

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.301.0-rc.1";
+const VERSION = exports.VERSION = "1.301.0-rc.2";
 
 /**
  * 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.301.0-rc.1";
+const VERSION = exports.VERSION = "1.301.0-rc.2";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/drain/drain.js

@@ -130,7 +130,7 @@ function drainGroup(agentIdentifier, group, activateGroup = true) {
   }
   if (!baseEE.isolatedBacklog) delete handlers[group];
   baseEE.backlog[group] = null;
-  baseEE.emit('drain-' + group, []); // TODO: Code exists purely for a unit test and needs to be refined
+  baseEE.emit('drain-' + group, []); // Informs the feature that it has drained its backlog of events, this kicks off an immediate harvest to capture any load-driven events that were buffered.
 }
 
 /**

package/dist/cjs/common/harvest/harvester.js

@@ -61,35 +61,30 @@ class Harvester {
    * @returns {boolean} True if 1+ network call was made. Note that this does not mean or guarantee that it was successful (or that all were in the case of more than 1).
    */
   triggerHarvestFor(aggregateInst, localOpts = {}) {
-    if (aggregateInst.blocked) return false;
+    const output = {
+      ranSend: false,
+      payload: undefined,
+      endpointVersion: aggregateInst.harvestEndpointVersion || 1
+    };
+    if (aggregateInst.blocked) return output;
     const submitMethod = (0, _submitData.getSubmitMethod)(localOpts);
-    if (!submitMethod) return false;
+    if (!submitMethod) return output;
     const shouldRetryOnFail = !localOpts.isFinalHarvest && submitMethod === _submitData.xhr; // always retry all features harvests except for final
-    let dataToSendArr;
-    let ranSend = false;
-    if (!localOpts.directSend) {
-      // primarily used by rum call to bypass makeHarvestPayload by providing payload directly
-      dataToSendArr = aggregateInst.makeHarvestPayload(shouldRetryOnFail, localOpts); // be sure the 'this' of makeHarvestPayload is the aggregate w/ access to its harvestOpts
-      if (!dataToSendArr) return false; // can be undefined if storage is empty or preharvest checks failed
-    } else dataToSendArr = [localOpts.directSend];
-    dataToSendArr.forEach(({
-      targetApp,
-      payload
-    }) => {
-      if (!payload) return;
-      send(this.agentRef, {
-        endpoint: _features.FEATURE_TO_ENDPOINT[aggregateInst.featureName],
-        targetApp,
-        payload,
-        localOpts,
-        submitMethod,
-        cbFinished,
-        raw: aggregateInst.harvestOpts.raw,
-        featureName: aggregateInst.featureName
-      });
-      ranSend = true;
+    output.payload = !localOpts.directSend ? aggregateInst.makeHarvestPayload(shouldRetryOnFail, localOpts) : localOpts.directSend?.payload; // features like PVE can define the payload directly, bypassing the makeHarvestPayload logic
+
+    if (!output.payload) return output;
+    send(this.agentRef, {
+      endpoint: _features.FEATURE_TO_ENDPOINT[aggregateInst.featureName],
+      payload: output.payload,
+      localOpts,
+      submitMethod,
+      cbFinished,
+      raw: aggregateInst.harvestOpts.raw,
+      featureName: aggregateInst.featureName,
+      endpointVersion: output.endpointVersion
     });
-    return ranSend;
+    output.ranSend = true;
+    return output;
 
     /**
      * This is executed immediately after harvest sends the data via XHR, or if there's nothing to send. Note that this excludes on unloading / sendBeacon.
@@ -122,13 +117,13 @@ const warnings = {};
   */
 function send(agentRef, {
   endpoint,
-  targetApp,
   payload,
   localOpts = {},
   submitMethod,
   cbFinished,
   raw,
-  featureName
+  featureName,
+  endpointVersion = 1
 }) {
   if (!agentRef.info.errorBeacon) return false;
   let {
@@ -138,15 +133,14 @@ function send(agentRef, {
   if (Object.keys(body).length === 0 && !localOpts.sendEmptyBody) {
     // if there's no body to send, just run onfinish stuff and return
     if (cbFinished) cbFinished({
-      sent: false,
-      targetApp
+      sent: false
     });
     return false;
   }
   const protocol = agentRef.init.ssl === false ? 'http' : 'https';
   const perceivedBeacon = agentRef.init.proxy.beacon || agentRef.info.errorBeacon;
-  const url = raw ? "".concat(protocol, "://").concat(perceivedBeacon, "/").concat(endpoint) : "".concat(protocol, "://").concat(perceivedBeacon).concat(endpoint !== _features.RUM ? '/' + endpoint : '', "/1/").concat(targetApp.licenseKey);
-  const baseParams = !raw ? baseQueryString(agentRef, qs, endpoint, targetApp.applicationID) : '';
+  const url = raw ? "".concat(protocol, "://").concat(perceivedBeacon, "/").concat(endpoint) : "".concat(protocol, "://").concat(perceivedBeacon).concat(endpoint !== _features.RUM ? '/' + endpoint : '', "/").concat(endpointVersion, "/").concat(agentRef.info.licenseKey);
+  const baseParams = !raw ? baseQueryString(agentRef, qs, endpoint) : '';
   let payloadParams = (0, _encode.obj)(qs, agentRef.runtime.maxBytes);
   if (baseParams === '' && payloadParams.startsWith('&')) {
     payloadParams = payloadParams.substring(1);
@@ -189,8 +183,7 @@ function send(agentRef, {
           status: this.status,
           retry: shouldRetry(this.status),
           fullUrl,
-          xhr: this,
-          targetApp
+          xhr: this
         };
         if (localOpts.needResponse) cbResult.responseText = this.responseText;
         cbFinished(cbResult);
@@ -206,8 +199,7 @@ function send(agentRef, {
           status,
           retry: shouldRetry(status),
           fullUrl,
-          fetchResponse: response,
-          targetApp
+          fetchResponse: response
         };
         if (localOpts.needResponse) cbResult.responseText = await response.text();
         cbFinished(cbResult);
@@ -248,7 +240,6 @@ function send(agentRef, {
     data: {
       endpoint,
       headers,
-      targetApp,
       payload,
       submitMethod: getSubmitMethodName(),
       raw,
@@ -298,12 +289,12 @@ function cleanPayload(payload = {}) {
 }
 
 // The stuff that gets sent every time.
-function baseQueryString(agentRef, qs, endpoint, applicationID) {
+function baseQueryString(agentRef, qs, endpoint) {
   const ref = agentRef.runtime.obfuscator.obfuscateString((0, _cleanUrl.cleanURL)('' + _runtime.globalScope.location));
   const session = agentRef.runtime.session;
   const hr = !!session?.state.sessionReplaySentFirstChunk && session?.state.sessionReplayMode === 1 && endpoint !== _features.JSERRORS;
   const ht = !!session?.state.traceHarvestStarted && session?.state.sessionTraceMode === 1 && ![_features.LOGS, _features.BLOBS].includes(endpoint);
-  const qps = ['a=' + applicationID, (0, _encode.param)('sa', agentRef.info.sa ? '' + agentRef.info.sa : ''), (0, _encode.param)('v', _env.VERSION), transactionNameParam(), (0, _encode.param)('ct', agentRef.runtime.customTransaction), '&rst=' + (0, _now.now)(), '&ck=0',
+  const qps = ['a=' + agentRef.info.applicationID, (0, _encode.param)('sa', agentRef.info.sa ? '' + agentRef.info.sa : ''), (0, _encode.param)('v', _env.VERSION), transactionNameParam(), (0, _encode.param)('ct', agentRef.runtime.customTransaction), '&rst=' + (0, _now.now)(), '&ck=0',
   // ck param DEPRECATED - still expected by backend
   '&s=' + (session?.state.value || '0'),
   // the 0 id encaps all untrackable and default traffic

package/dist/cjs/common/util/mfe.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getVersion2Attributes = getVersion2Attributes;
+exports.isValidMFETarget = isValidMFETarget;
+/**
+ * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @param {Object} [target] - the target to be validated
+ * @returns {boolean}
+ */
+function isValidMFETarget(target = {}) {
+  return !!(target.id && target.name);
+}
+
+/**
+ * When given a valid target, returns an object with the MFE payload attributes.  Returns an empty object otherwise.
+ * @param {Object} [target] the registered target
+ * @param {AggregateInstance} [aggregateInstance] the aggregate instance calling the method
+ * @returns {{'mfe.id': *, 'mfe.name': String}|{}} returns an empty object if args are not supplied or the aggregate instance is not supporting version 2
+ */
+function getVersion2Attributes(target, aggregateInstance) {
+  if (aggregateInstance?.harvestEndpointVersion !== 2) return {};
+  const containerAgentEntityGuid = aggregateInstance.agentRef.runtime.appMetadata.agents[0].entityGuid;
+  if (!isValidMFETarget(target)) {
+    return {
+      'entity.guid': containerAgentEntityGuid,
+      appId: aggregateInstance.agentRef.info.applicationID
+    };
+  }
+  return {
+    'mfe.id': target.id,
+    // these field names may change as the schema is finalized
+    'mfe.name': target.name,
+    // these field names may change as the schema is finalized
+    eventSource: 'MicroFrontendBrowserAgent',
+    // these field names may change as the schema is finalized
+    'parent.id': containerAgentEntityGuid
+  };
+}

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

@@ -16,6 +16,7 @@ var _traverse = require("../../../common/util/traverse");
 var _userActionsAggregator = require("./user-actions/user-actions-aggregator");
 var _iframe = require("../../../common/dom/iframe");
 var _typeCheck = require("../../../common/util/type-check");
+var _mfe = require("../../../common/util/mfe");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -43,8 +44,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
         });
       }, this.featureName, this.ee);
       if (agentRef.init.page_action.enabled) {
-        (0, _registerHandler.registerHandler)('api-addPageAction', (timestamp, name, attributes, targetEntityGuid) => {
-          if (!this.agentRef.runtime.entityManager.get(targetEntityGuid)) return (0, _console.warn)(56, this.featureName);
+        (0, _registerHandler.registerHandler)('api-addPageAction', (timestamp, name, attributes, target) => {
           this.addEvent({
             ...attributes,
             eventType: 'PageAction',
@@ -56,7 +56,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
               browserWidth: window.document.documentElement?.clientWidth,
               browserHeight: window.document.documentElement?.clientHeight
             })
-          }, targetEntityGuid);
+          }, target);
         }, this.featureName, this.ee);
       }
       let addUserAction = () => {/** no-op */};
@@ -254,7 +254,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
         };
         this.addEvent(event);
       }, this.featureName, this.ee);
-      agentRef.runtime.harvester.triggerHarvestFor(this);
       this.drain();
     });
   }
@@ -270,10 +269,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
    * * sessionTraceId: set by the `ptid=` query param
    * * userAgent*: set by the userAgent header
    * @param {object=} obj the event object for storing in the event buffer
-   * @param {string=} targetEntityGuid the target entity guid for the event to scope buffering and harvesting. Defaults to agent config if undefined
+   * @param {string=} target the target metadata for the event to scope buffering and harvesting. Defaults to container agent config if undefined
    * @returns void
    */
-  addEvent(obj = {}, targetEntityGuid) {
+  addEvent(obj = {}, target) {
     if (!obj || !Object.keys(obj).length) return;
     if (!obj.eventType) {
       (0, _console.warn)(44);
@@ -288,7 +287,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
       timestamp: Math.floor(this.agentRef.runtime.timeKeeper.correctRelativeTimestamp((0, _now.now)())),
       /** all generic events require pageUrl(s) */
       pageUrl: (0, _cleanUrl.cleanURL)('' + _runtime.initialLocation),
-      currentUrl: (0, _cleanUrl.cleanURL)('' + location)
+      currentUrl: (0, _cleanUrl.cleanURL)('' + location),
+      /** Specific attributes only supplied if harvesting to endpoint version 2 */
+      ...(0, _mfe.getVersion2Attributes)(target, this)
     };
     const eventAttributes = {
       /** Agent-level custom attributes */
@@ -298,7 +299,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       /** Event-specific attributes take precedence over agent-level custom attributes and fallbacks */
       ...obj
     };
-    this.events.add(eventAttributes, targetEntityGuid);
+    this.events.add(eventAttributes);
   }
   serializer(eventBuffer) {
     return (0, _traverse.applyFnToProps)({

package/dist/cjs/features/generic_events/constants.js

@@ -18,5 +18,7 @@ const RAGE_CLICK_THRESHOLD_MS = exports.RAGE_CLICK_THRESHOLD_MS = 1000;
 const FRUSTRATION_TIMEOUT_MS = exports.FRUSTRATION_TIMEOUT_MS = 2000;
 const RESERVED_EVENT_TYPES = exports.RESERVED_EVENT_TYPES = ['PageAction', 'UserAction', 'BrowserPerformance'];
 const FEATURE_FLAGS = exports.FEATURE_FLAGS = {
-  RESOURCES: 'experimental.resources'
+  RESOURCES: 'experimental.resources',
+  REGISTER: 'register'
+  // register.jserrors and register.generic_events are also used, but not referenced directly so no need to represent here
 };

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

@@ -18,8 +18,7 @@ var _aggregateBase = require("../../utils/aggregate-base");
 var _now = require("../../../common/timing/now");
 var _traverse = require("../../../common/util/traverse");
 var _internalErrors = require("./internal-errors");
-var _target = require("../../../common/util/target");
-var _console = require("../../../common/util/console");
+var _mfe = require("../../../common/util/mfe");
 var _causeString = require("./cause-string");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
@@ -34,6 +33,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentRef) {
     super(agentRef, _constants.FEATURE_NAME);
+
+    /** set up agg-level behaviors specific to this feature */
+    this.harvestOpts.aggregatorTypes = ['err', 'ierr', 'xhr']; // the types in EventAggregator this feature cares about
     this.stackReported = {};
     this.observedAt = {};
     this.pageviewReported = {};
@@ -46,8 +48,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     (0, _registerHandler.registerHandler)('ierr', (...args) => this.storeError(...args), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('softNavFlush', (interactionId, wasFinished, softNavAttrs, interactionEndTime) => this.onSoftNavNotification(interactionId, wasFinished, softNavAttrs, interactionEndTime), this.featureName, this.ee); // when an ixn is done or cancelled
 
-    this.harvestOpts.aggregatorTypes = ['err', 'ierr', 'xhr']; // the types in EventAggregator this feature cares about
-
     // 0 == off, 1 == on
     this.waitForFlags(['err']).then(([errFlag]) => {
       if (errFlag) {
@@ -107,10 +107,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
    * @param {object=} target the target to buffer and harvest to, if undefined the default configuration target is used
    * @returns
    */
-  storeError(err, time, internal, customAttributes, hasReplay, swallowReason, targetEntityGuid) {
+  storeError(err, time, internal, customAttributes, hasReplay, swallowReason, target) {
     if (!err) return;
-    const target = this.agentRef.runtime.entityManager.get(targetEntityGuid);
-    if (!target) return (0, _console.warn)(56, this.featureName);
     // are we in an interaction
     time = time || (0, _now.now)();
     let filterOutput;
@@ -148,7 +146,7 @@ class Aggregate extends _aggregateBase.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 && (0, _target.isContainerAgentTarget)(target, this.agentRef)) params.hasReplay = hasReplay;
+    if (hasReplay && !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,
@@ -183,14 +181,14 @@ class Aggregate extends _aggregateBase.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 (this.shouldAllowMainAgentToCapture(targetEntityGuid)) (0, _handle.handle)('trace-jserror', jsErrorEvent, undefined, _features.FEATURE_NAMES.sessionTrace, this.ee);
+    if (this.shouldAllowMainAgentToCapture(target)) (0, _handle.handle)('trace-jserror', jsErrorEvent, undefined, _features.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;
     if (err?.__newrelic?.[this.agentIdentifier]) {
       params._interactionId = err.__newrelic[this.agentIdentifier].interactionId;
       params._interactionNodeId = err.__newrelic[this.agentIdentifier].interactionNodeId;
     }
-    if (this.shouldAllowMainAgentToCapture(targetEntityGuid)) {
+    if (this.shouldAllowMainAgentToCapture(target)) {
       const softNavInUse = Boolean(this.agentRef.features?.[_features.FEATURE_NAMES.softNav]);
       // Note: the following are subject to potential race cond wherein if the other feature aren't fully initialized, it'll be treated as there being no associated interaction.
       // They each will also tack on their respective properties to the params object as part of the decision flow.
@@ -211,11 +209,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
 
     // always add directly if scoped to a sub-entity, the other pathways above will be deterministic if the main agent should procede
-    if (targetEntityGuid) this.#storeJserrorForHarvest([...jsErrorEvent, targetEntityGuid], false, params._softNavAttributes);
+    if (target) this.#storeJserrorForHarvest([...jsErrorEvent, target], false, params._softNavAttributes);
   }
   #storeJserrorForHarvest(errorInfoArr, softNavOccurredFinished, softNavCustomAttrs = {}) {
-    let [type, bucketHash, params, newMetrics, localAttrs, targetEntityGuid] = errorInfoArr;
-    const allCustomAttrs = {};
+    let [type, bucketHash, params, newMetrics, localAttrs, target] = errorInfoArr;
+    const allCustomAttrs = {
+      /** MFE specific attributes if in "multiple" mode (ie consumer version 2) */
+      ...(0, _mfe.getVersion2Attributes)(target, this)
+    };
     if (softNavOccurredFinished) {
       Object.entries(softNavCustomAttrs).forEach(([k, v]) => setCustom(k, v)); // when an ixn finishes, it'll include stuff in jsAttributes + attrs specific to the ixn
       bucketHash += params.browserInteractionId;
@@ -230,7 +231,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
 
     const jsAttributesHash = (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(allCustomAttrs));
     const aggregateHash = bucketHash + ':' + jsAttributesHash;
-    this.events.add([type, aggregateHash, params, newMetrics, allCustomAttrs], targetEntityGuid);
+    this.events.add([type, aggregateHash, params, newMetrics, allCustomAttrs]);
     function setCustom(key, val) {
       allCustomAttrs[key] = val && typeof val === 'object' ? (0, _stringify.stringify)(val) : val;
     }
@@ -239,11 +240,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
   /**
   * If the event lacks an entityGuid (the default behavior), the main agent should capture the data. If the data is assigned to a sub-entity target
   * the main agent should not capture events unless it is configured to do so.
-  * @param {string} entityGuid - the context object for the event
+  * @param {string} target - the context object for the event
   * @returns {boolean} - whether the main agent should capture the event to its internal target
   */
-  shouldAllowMainAgentToCapture(entityGuid) {
-    return !entityGuid || this.agentRef.init.api.duplicate_registered_data;
+  shouldAllowMainAgentToCapture(target) {
+    return !target || this.agentRef.init.api.duplicate_registered_data;
   }
 
   // TO-DO: Remove this function when old spa is taken out. #storeJserrorForHarvest handles the work with the softnav feature.

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

@@ -12,10 +12,10 @@ var _constants = require("../constants");
 var _log = require("../shared/log");
 var _utils = require("../shared/utils");
 var _traverse = require("../../../common/util/traverse");
-var _target = require("../../../common/util/target");
 var _constants2 = require("../../../common/session/constants");
 var _constants3 = require("../../session_replay/constants");
 var _featureGates = require("../../utils/feature-gates");
+var _mfe = require("../../../common/util/mfe");
 /**
  * Copyright 2020-2025 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -26,6 +26,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
   constructor(agentRef) {
     super(agentRef, _constants.FEATURE_NAME);
     this.isSessionTrackingEnabled = (0, _featureGates.canEnableSessionTracking)(agentRef.init) && agentRef.runtime.session;
+
+    /** set up agg-level behaviors specific to this feature */
+    this.harvestOpts.raw = true;
     super.customAttributesAreSeparate = true;
 
     // The SessionEntity class can emit a message indicating the session was cleared and reset (expiry, inactivity). This feature must abort and never resume if that occurs.
@@ -36,7 +39,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
       if (this.blocked || type !== _constants2.SESSION_EVENT_TYPES.CROSS_TAB) return;
       if (this.loggingMode !== _constants.LOGGING_MODE.OFF && data.loggingMode === _constants.LOGGING_MODE.OFF) this.abort(_constants3.ABORT_REASONS.CROSS_TAB);else this.loggingMode = data.loggingMode;
     });
-    this.harvestOpts.raw = true;
     this.waitForFlags(['log']).then(([loggingMode]) => {
       const session = this.agentRef.runtime.session ?? {};
       if (this.loggingMode === _constants.LOGGING_MODE.OFF || session.isNew && loggingMode === _constants.LOGGING_MODE.OFF) {
@@ -63,10 +65,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
       loggingMode: this.loggingMode
     });
   }
-  handleLog(timestamp, message, attributes = {}, level = _constants.LOG_LEVELS.INFO, targetEntityGuid) {
-    if (!this.agentRef.runtime.entityManager.get(targetEntityGuid)) return (0, _console.warn)(56, this.featureName);
+  handleLog(timestamp, message, attributes = {}, level = _constants.LOG_LEVELS.INFO, target) {
     if (this.blocked || !this.loggingMode) return;
     if (!attributes || typeof attributes !== 'object') attributes = {};
+    attributes = {
+      ...attributes,
+      /** Specific attributes only supplied if harvesting to endpoint version 2 */
+      ...(0, _mfe.getVersion2Attributes)(target, this)
+    };
     if (typeof level === 'string') level = level.toUpperCase();
     if (!(0, _utils.isValidLogLevel)(level)) return (0, _console.warn)(30, level);
     if (this.loggingMode < (_constants.LOGGING_MODE[level] || Infinity)) {
@@ -90,10 +96,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     if (typeof message !== 'string' || !message) return (0, _console.warn)(32);
     const log = new _log.Log(Math.floor(this.agentRef.runtime.timeKeeper.correctRelativeTimestamp(timestamp)), message, attributes, level);
-    this.events.add(log, targetEntityGuid);
+    this.events.add(log);
   }
-  serializer(eventBuffer, targetEntityGuid) {
-    const target = this.agentRef.runtime.entityManager.get(targetEntityGuid);
+  serializer(eventBuffer) {
     const sessionEntity = this.agentRef.runtime.session;
     return [{
       common: {
@@ -101,19 +106,19 @@ class Aggregate extends _aggregateBase.AggregateBase {
         attributes: {
           ...this.agentRef.info.jsAttributes,
           // user-provided custom attributes
-          'entity.guid': target.entityGuid,
-          // browser entity guid as provided API target OR the default from RUM response if not supplied
+          ...(this.harvestEndpointVersion === 1 && {
+            'entity.guid': this.agentRef.runtime.appMetadata.agents[0].entityGuid,
+            appId: this.agentRef.info.applicationID
+          }),
           ...(sessionEntity && {
             session: sessionEntity.state.value || '0',
             // The session ID that we generate and keep across page loads
-            hasReplay: sessionEntity.state.sessionReplayMode === 1 && (0, _target.isContainerAgentTarget)(target, this.agentRef),
+            hasReplay: sessionEntity.state.sessionReplayMode === 1,
             // True if a session replay recording is running
             hasTrace: sessionEntity.state.sessionTraceMode === 1 // True if a session trace recording is running
           }),
           ptid: this.agentRef.runtime.ptid,
           // page trace id
-          appId: target.applicationID || this.agentRef.info.applicationID,
-          // Application ID from info object,
           standalone: Boolean(this.agentRef.info.sa),
           // copy paste (true) vs APM (false)
           agentVersion: this.agentRef.runtime.version,
@@ -128,10 +133,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
       logs: (0, _traverse.applyFnToProps)(eventBuffer, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string')
     }];
   }
-  queryStringsBuilder(_, targetEntityGuid) {
-    const target = this.agentRef.runtime.entityManager.get(targetEntityGuid);
+  queryStringsBuilder() {
     return {
-      browser_monitoring_key: target.licenseKey
+      browser_monitoring_key: this.agentRef.info.licenseKey
     };
   }
 

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

@@ -20,11 +20,11 @@ var _constants2 = require("../constants");
    * @param {string} message - the log message string
    * @param {{[key: string]: *}} customAttributes - The log's custom attributes if any
    * @param {enum} level - the log level enum
-   * @param {object=} targetEntityGuid - the optional target entity guid provided by an api call
+   * @param {object=} target - the optional target provided by an api call
    */
-function bufferLog(ee, message, customAttributes = {}, level = _constants2.LOG_LEVELS.INFO, targetEntityGuid, timestamp = (0, _now.now)()) {
+function bufferLog(ee, message, customAttributes = {}, level = _constants2.LOG_LEVELS.INFO, target, 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, targetEntityGuid], undefined, _features.FEATURE_NAMES.logging, ee);
+  (0, _handle.handle)(_constants2.LOGGING_EVENT_EMITTER_CHANNEL, [timestamp, message, customAttributes, level, target], undefined, _features.FEATURE_NAMES.logging, ee);
 }
 
 /**