@newrelic/browser-agent 1.301.0 → 1.302.0-alpha.1

package/src/common/util/mfe.js

@@ -0,0 +1,35 @@
+/**
+ * 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}
+ */
+export 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
+ */
+export 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/src/common/wrap/wrap-promise.js

@@ -140,13 +140,23 @@ export function wrapPromise (sharedEE) {
 
     promiseEE.on('propagate', function (val, overwrite, trigger) {
       if (!this.getCtx || overwrite) {
-        this.getCtx = function () {
-          // eslint-disable-next-line
-          if (val instanceof Promise) {
-            var store = promiseEE.context(val)
+        const selfStore = this
+        const parentStore =
+          val instanceof Promise ? promiseEE.context(val) : null
+        let cachedCtx
+
+        this.getCtx = function getCtx () {
+          if (cachedCtx) return cachedCtx
+
+          if (parentStore && parentStore !== selfStore) {
+            cachedCtx =
+              typeof parentStore.getCtx === 'function'
+                ? parentStore.getCtx()
+                : parentStore
+          } else {
+            cachedCtx = selfStore
           }
-
-          return store && store.getCtx ? store.getCtx() : this
+          return cachedCtx
         }
       }
     })

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

@@ -137,10 +137,16 @@ export class Aggregate extends AggregateBase {
     const addString = getAddStringContext(this.agentRef.runtime.obfuscator)
     let payload = 'bel.7;'
 
+    let firstTimestamp = 0
+
     for (let i = 0; i < eventBuffer.length; i++) {
       const event = eventBuffer[i]
+      // ajax nodes are relative to the first node (or page origin if no previous node), so we need to calculate the relative start time
+      const relativeStartTime = event.startTime - firstTimestamp
+      if (i === 0) firstTimestamp = event.startTime
+
       const fields = [
-        numeric(event.startTime),
+        numeric(relativeStartTime),
         numeric(event.endTime - event.startTime),
         numeric(0), // callbackEnd
         numeric(0), // no callbackDuration for non-SPA events

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

@@ -14,6 +14,7 @@ import { applyFnToProps } from '../../../common/util/traverse'
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator'
 import { isIFrameWindow } from '../../../common/dom/iframe'
 import { isPureObject } from '../../../common/util/type-check'
+import { getVersion2Attributes } from '../../../common/util/mfe'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -42,8 +43,7 @@ export class Aggregate extends AggregateBase {
       }, this.featureName, this.ee)
 
       if (agentRef.init.page_action.enabled) {
-        registerHandler('api-addPageAction', (timestamp, name, attributes, targetEntityGuid) => {
-          if (!this.agentRef.runtime.entityManager.get(targetEntityGuid)) return warn(56, this.featureName)
+        registerHandler('api-addPageAction', (timestamp, name, attributes, target) => {
           this.addEvent({
             ...attributes,
             eventType: 'PageAction',
@@ -55,7 +55,7 @@ export class Aggregate extends AggregateBase {
               browserWidth: window.document.documentElement?.clientWidth,
               browserHeight: window.document.documentElement?.clientHeight
             })
-          }, targetEntityGuid)
+          }, target)
         }, this.featureName, this.ee)
       }
 
@@ -242,7 +242,6 @@ export class Aggregate extends AggregateBase {
         this.addEvent(event)
       }, this.featureName, this.ee)
 
-      agentRef.runtime.harvester.triggerHarvestFor(this)
       this.drain()
     })
   }
@@ -258,10 +257,10 @@ export class Aggregate extends 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) {
       warn(44)
@@ -278,7 +277,9 @@ export class Aggregate extends AggregateBase {
       timestamp: Math.floor(this.agentRef.runtime.timeKeeper.correctRelativeTimestamp(now())),
       /** all generic events require pageUrl(s) */
       pageUrl: cleanURL('' + initialLocation),
-      currentUrl: cleanURL('' + location)
+      currentUrl: cleanURL('' + location),
+      /** Specific attributes only supplied if harvesting to endpoint version 2 */
+      ...(getVersion2Attributes(target, this))
     }
 
     const eventAttributes = {
@@ -290,7 +291,7 @@ export class Aggregate extends AggregateBase {
       ...obj
     }
 
-    this.events.add(eventAttributes, targetEntityGuid)
+    this.events.add(eventAttributes)
   }
 
   serializer (eventBuffer) {

package/src/features/generic_events/constants.js

@@ -17,5 +17,7 @@ export const FRUSTRATION_TIMEOUT_MS = 2000
 export const RESERVED_EVENT_TYPES = ['PageAction', 'UserAction', 'BrowserPerformance']
 
 export const 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/src/features/generic_events/instrument/index.js

@@ -41,6 +41,14 @@ export class Instrument extends InstrumentBase {
     setupRegisterAPI(agentRef)
     setupMeasureAPI(agentRef)
 
+    const ufEnabled = agentRef.init.feature_flags.includes('user_frustrations')
+    let historyEE
+    if (isBrowserScope && ufEnabled) {
+      wrapFetch(this.ee)
+      wrapXhr(this.ee)
+      historyEE = wrapHistory(this.ee)
+    }
+
     if (isBrowserScope) {
       if (agentRef.init.user_actions.enabled) {
         OBSERVED_EVENTS.forEach(eventType =>
@@ -52,7 +60,43 @@ export class Instrument extends InstrumentBase {
         }
         // Capture is not used here so that we don't get element focus/blur events, only the window's as they do not bubble. They are also not cancellable, so no worries about being front of line.
         )
+
+        if (ufEnabled) {
+          globalScope.addEventListener('error', () => {
+            handle('uaErr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
+          }, eventListenerOpts(false, this.removeOnAbort?.signal))
+
+          this.ee.on('open-xhr-start', (args, xhr) => {
+            if (!isInternalTraffic(args[1])) {
+              xhr.addEventListener('readystatechange', () => {
+                if (xhr.readyState === 2) { // HEADERS_RECEIVED
+                  handle('uaXhr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
+                }
+              })
+            }
+          })
+          this.ee.on('fetch-start', (fetchArguments) => {
+            if (fetchArguments.length >= 1 && !isInternalTraffic(extractUrl(fetchArguments[0]))) {
+              handle('uaXhr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
+            }
+          })
+
+          function isInternalTraffic (url) {
+            const parsedUrl = parseUrl(url)
+            return agentRef.beacons.includes(parsedUrl.hostname + ':' + parsedUrl.port)
+          }
+
+          historyEE.on('pushState-end', navigationChange)
+          historyEE.on('replaceState-end', navigationChange)
+          window.addEventListener('hashchange', navigationChange, eventListenerOpts(true, this.removeOnAbort?.signal))
+          window.addEventListener('popstate', navigationChange, eventListenerOpts(true, this.removeOnAbort?.signal))
+
+          function navigationChange () {
+            historyEE.emit('navChange')
+          }
+        }
       }
+
       if (agentRef.init.performance.resources.enabled && globalScope.PerformanceObserver?.supportedEntryTypes.includes('resource')) {
         const observer = new PerformanceObserver((list) => {
           list.getEntries().forEach(entry => {
@@ -61,15 +105,6 @@ export class Instrument extends InstrumentBase {
         })
         observer.observe({ type: 'resource', buffered: true })
       }
-
-      const historyEE = wrapHistory(this.ee)
-      historyEE.on('pushState-end', navigationChange)
-      historyEE.on('replaceState-end', navigationChange)
-      window.addEventListener('hashchange', navigationChange, eventListenerOpts(true, this.removeOnAbort?.signal))
-      window.addEventListener('popstate', navigationChange, eventListenerOpts(true, this.removeOnAbort?.signal))
-      function navigationChange () {
-        historyEE.emit('navChange')
-      }
     }
 
     try {
@@ -81,32 +116,6 @@ export class Instrument extends InstrumentBase {
       this.abortHandler = undefined // weakly allow this abort op to run only once
     }
 
-    globalScope.addEventListener('error', () => {
-      handle('uaErr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
-    }, eventListenerOpts(false, this.removeOnAbort?.signal))
-
-    wrapFetch(this.ee)
-    wrapXhr(this.ee)
-    this.ee.on('open-xhr-start', (args, xhr) => {
-      if (!isInternalTraffic(args[1])) {
-        xhr.addEventListener('readystatechange', () => {
-          if (xhr.readyState === 2) { // HEADERS_RECEIVED
-            handle('uaXhr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
-          }
-        })
-      }
-    })
-    this.ee.on('fetch-start', (fetchArguments) => {
-      if (fetchArguments.length >= 1 && !isInternalTraffic(extractUrl(fetchArguments[0]))) {
-        handle('uaXhr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
-      }
-    })
-
-    function isInternalTraffic (url) {
-      const parsedUrl = parseUrl(url)
-      return agentRef.beacons.includes(parsedUrl.hostname + ':' + parsedUrl.port)
-    }
-
     /** If any of the sources are active, import the aggregator. otherwise deregister */
     if (genericEventSourceConfigs.some(x => x)) this.importAggregator(agentRef, () => import(/* webpackChunkName: "generic_events-aggregate" */ '../aggregate'))
     else this.deregisterDrain()

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

@@ -19,8 +19,7 @@ import { AggregateBase } from '../../utils/aggregate-base'
 import { now } from '../../../common/timing/now'
 import { applyFnToProps } from '../../../common/util/traverse'
 import { evaluateInternalError } from './internal-errors'
-import { isContainerAgentTarget } from '../../../common/util/target'
-import { warn } from '../../../common/util/console'
+import { getVersion2Attributes } from '../../../common/util/mfe'
 import { buildCauseString } from './cause-string'
 
 /**
@@ -32,6 +31,8 @@ export class Aggregate extends AggregateBase {
   constructor (agentRef) {
     super(agentRef, 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 +47,6 @@ export class Aggregate extends AggregateBase {
     register('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) {
@@ -113,10 +112,8 @@ export class Aggregate extends 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 warn(56, this.featureName)
     // are we in an interaction
     time = time || now()
     let filterOutput
@@ -155,7 +152,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 && 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,
@@ -191,7 +188,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 (this.shouldAllowMainAgentToCapture(targetEntityGuid)) handle('trace-jserror', jsErrorEvent, undefined, FEATURE_NAMES.sessionTrace, this.ee)
+    if (this.shouldAllowMainAgentToCapture(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
 
@@ -200,7 +197,7 @@ export class Aggregate extends AggregateBase {
       params._interactionNodeId = err.__newrelic[this.agentIdentifier].interactionNodeId
     }
 
-    if (this.shouldAllowMainAgentToCapture(targetEntityGuid)) {
+    if (this.shouldAllowMainAgentToCapture(target)) {
       const softNavInUse = Boolean(this.agentRef.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.
@@ -221,12 +218,15 @@ 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 (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) */
+      ...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
@@ -243,7 +243,7 @@ export class Aggregate extends AggregateBase {
     const jsAttributesHash = stringHashCode(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' ? stringify(val) : val)
@@ -253,11 +253,11 @@ export class Aggregate extends 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/src/features/logging/aggregate/index.js

@@ -10,10 +10,10 @@ import { FEATURE_NAME, LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS, LOGGING_MODE }
 import { Log } from '../shared/log'
 import { isValidLogLevel } from '../shared/utils'
 import { applyFnToProps } from '../../../common/util/traverse'
-import { isContainerAgentTarget } from '../../../common/util/target'
 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/mfe'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -21,6 +21,8 @@ export class Aggregate extends AggregateBase {
     super(agentRef, FEATURE_NAME)
     this.isSessionTrackingEnabled = 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.
@@ -34,7 +36,6 @@ export class Aggregate extends AggregateBase {
       else this.loggingMode = data.loggingMode
     })
 
-    this.harvestOpts.raw = true
     this.waitForFlags(['log']).then(([loggingMode]) => {
       const session = this.agentRef.runtime.session ?? {}
       if (this.loggingMode === LOGGING_MODE.OFF || (session.isNew && loggingMode === LOGGING_MODE.OFF)) {
@@ -63,11 +64,17 @@ export class Aggregate extends AggregateBase {
     })
   }
 
-  handleLog (timestamp, message, attributes = {}, level = LOG_LEVELS.INFO, targetEntityGuid) {
-    if (!this.agentRef.runtime.entityManager.get(targetEntityGuid)) return warn(56, this.featureName)
+  handleLog (timestamp, message, attributes = {}, level = 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 */
+      ...(getVersion2Attributes(target, this))
+    }
+
     if (typeof level === 'string') level = level.toUpperCase()
     if (!isValidLogLevel(level)) return warn(30, level)
     if (this.loggingMode < (LOGGING_MODE[level] || Infinity)) {
@@ -100,25 +107,26 @@ export class Aggregate extends AggregateBase {
       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: {
         /** Attributes in the `common` section are added to `all` logs generated in the payload */
         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 && isContainerAgentTarget(target, this.agentRef), // True if a session replay recording is running
+            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, // browser agent version
           // The following 3 attributes are evaluated and dropped at ingest processing time and do not get stored on NRDB:
@@ -135,9 +143,8 @@ export class Aggregate extends AggregateBase {
     }]
   }
 
-  queryStringsBuilder (_, targetEntityGuid) {
-    const target = this.agentRef.runtime.entityManager.get(targetEntityGuid)
-    return { browser_monitoring_key: target.licenseKey }
+  queryStringsBuilder () {
+    return { browser_monitoring_key: this.agentRef.info.licenseKey }
   }
 
   /** Abort the feature, once aborted it will not resume */

package/src/features/logging/shared/utils.js

@@ -13,11 +13,11 @@ import { LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS } from '../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
    */
-export function bufferLog (ee, message, customAttributes = {}, level = LOG_LEVELS.INFO, targetEntityGuid, timestamp = now()) {
+export function bufferLog (ee, message, customAttributes = {}, level = LOG_LEVELS.INFO, target, 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, targetEntityGuid], undefined, FEATURE_NAMES.logging, ee)
+  handle(LOGGING_EVENT_EMITTER_CHANNEL, [timestamp, message, customAttributes, level, target], undefined, FEATURE_NAMES.logging, ee)
 }
 
 /**

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

@@ -17,8 +17,9 @@ import { timeToFirstByte } from '../../../common/vitals/time-to-first-byte'
 import { now } from '../../../common/timing/now'
 import { TimeKeeper } from '../../../common/timing/time-keeper'
 import { applyFnToProps } from '../../../common/util/traverse'
-import { registerHandler } from '../../../common/event-emitter/register-handler'
-import { isContainerAgentTarget } from '../../../common/util/target'
+import { send } from '../../../common/harvest/harvester'
+import { FEATURE_NAMES, FEATURE_TO_ENDPOINT } from '../../../loaders/features/features'
+import { getSubmitMethod } from '../../../common/util/submit-data'
 
 export class Aggregate extends AggregateBase {
   static featureName = CONSTANTS.FEATURE_NAME
@@ -29,10 +30,6 @@ export class Aggregate extends AggregateBase {
     this.firstByteToWindowLoad = 0 // our "frontend" duration
     this.firstByteToDomContent = 0 // our "dom processing" duration
 
-    registerHandler('send-rum', (customAttibutes, target) => {
-      this.sendRum(customAttibutes, target)
-    }, this.featureName, this.ee)
-
     if (!isValid(agentRef.info)) {
       this.ee.abort()
       return warn(43)
@@ -58,7 +55,7 @@ export class Aggregate extends AggregateBase {
    *
    * @param {Function} cb A function to run once the RUM call has finished - Defaults to activateFeatures
    * @param {*} customAttributes custom attributes to attach to the RUM call - Defaults to info.js
-   * @param {*} target The target to harvest to - Since we will not know the entityGuid before harvesting, this must be an object directly supplied from the info object or API, not an entityGuid string for lookup with the entityManager - Defaults to { licenseKey: this.agentRef.info.licenseKey, applicationID: this.agentRef.info.applicationID }
+   * @param {*} target The target to harvest to
    */
   sendRum (customAttributes = this.agentRef.info.jsAttributes, target = { licenseKey: this.agentRef.info.licenseKey, applicationID: this.agentRef.info.applicationID }) {
     const info = this.agentRef.info
@@ -122,7 +119,7 @@ export class Aggregate extends AggregateBase {
 
     this.agentRef.runtime.harvester.triggerHarvestFor(this, {
       directSend: {
-        targetApp: target,
+        target,
         payload: { qs: queryParameters, body }
       },
       needResponse: true,
@@ -130,22 +127,65 @@ export class Aggregate extends AggregateBase {
     })
   }
 
-  postHarvestCleanup ({ status, responseText, xhr, targetApp }) {
+  postHarvestCleanup ({ status, responseText, xhr }) {
     const rumEndTime = now()
     let app, flags
     try {
       ({ app, ...flags } = JSON.parse(responseText))
-      this.processEntities(app.agents, targetApp)
     } catch (error) {
       // wont set entity stuff here, if main agent will later abort, if registered agent, nothing will happen
       warn(53, error)
     }
 
-    /** Only run agent-wide side-effects if the harvest was for the main agent */
-    if (!isContainerAgentTarget(targetApp, this.agentRef)) return
-
     if (status >= 400 || status === 0) {
       warn(18, status)
+
+      // Get estimated payload size of our backlog
+      const textEncoder = new TextEncoder()
+      const payloadSize = Object.values(newrelic.ee.backlog).reduce((acc, value) => {
+        if (!value) return acc
+
+        const encoded = textEncoder.encode(value)
+        return acc + encoded.byteLength
+      }, 0)
+
+      // Send SMs about failed RUM request
+      const body = {
+        sm: [{
+          params: {
+            name: `Browser/Supportability/BCS/Error/${status}`
+          },
+          stats: {
+            c: 1
+          }
+        },
+        {
+          params: {
+            name: 'Browser/Supportability/BCS/Error/Dropped/Bytes'
+          },
+          stats: {
+            c: 1,
+            t: payloadSize
+          }
+        },
+        {
+          params: {
+            name: 'Browser/Supportability/BCS/Error/Duration/Ms'
+          },
+          stats: {
+            c: 1,
+            t: rumEndTime - this.rumStartTime
+          }
+        }]
+      }
+
+      send(this.agentRef, {
+        endpoint: FEATURE_TO_ENDPOINT[FEATURE_NAMES.metrics],
+        payload: { body },
+        submitMethod: getSubmitMethod(),
+        featureName: FEATURE_NAMES.metrics
+      })
+
       // Adding retry logic for the rum call will be a separate change; this.blocked will need to be changed since that prevents another triggerHarvestFor()
       this.ee.abort()
       return
@@ -176,19 +216,4 @@ export class Aggregate extends AggregateBase {
     this.agentRef.runtime.harvester.startTimer()
     activateFeatures(flags, this.agentRef)
   }
-
-  processEntities (entities, targetApp) {
-    if (!entities || !targetApp) return
-    entities.forEach(agent => {
-      const entityManager = this.agentRef.runtime.entityManager
-      const entityGuid = agent.entityGuid
-      const entity = entityManager.get(entityGuid)
-      if (entity) return // already processed
-
-      if (isContainerAgentTarget(targetApp, this.agentRef)) {
-        entityManager.setDefaultEntity({ ...targetApp, entityGuid })
-      }
-      entityManager.set(agent.entityGuid, { ...targetApp, entityGuid })
-    })
-  }
 }