@newrelic/browser-agent 1.304.0-rc.3 → 1.304.0-rc.5

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.304.0-rc.3";
+const VERSION = exports.VERSION = "1.304.0-rc.5";
 
 /**
  * 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.304.0-rc.3";
+const VERSION = exports.VERSION = "1.304.0-rc.5";
 
 /**
  * Exposes the build type of the agent

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

@@ -28,7 +28,7 @@ function hasValidValue(val) {
  *
  * @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
+ * @returns {Object} 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 {};
@@ -40,9 +40,9 @@ function getVersion2Attributes(target, aggregateInstance) {
     };
   }
   return {
-    'mfe.id': target.id,
-    'mfe.name': target.name,
-    eventSource: target.eventSource,
+    'source.id': target.id,
+    'source.name': target.name,
+    'source.type': target.type,
     'parent.id': target.parent?.id || containerAgentEntityGuid
   };
 }

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

@@ -61,7 +61,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       }
       let addUserAction = () => {/** no-op */};
       if (_runtime.isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.#userActionAggregator = new _userActionsAggregator.UserActionsAggregator(agentRef.init.feature_flags.includes('user_frustrations'));
+        this.#userActionAggregator = new _userActionsAggregator.UserActionsAggregator();
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.#userActionAggregator.aggregationEvent);
         addUserAction = aggregatedUserAction => {
           try {

package/dist/cjs/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -18,14 +18,12 @@ class UserActionsAggregator {
   /** @type {AggregatedUserAction=} */
   #aggregationEvent = undefined;
   #aggregationKey = '';
-  #ufEnabled = false;
   #deadClickTimer = undefined;
   #domObserver = undefined;
   #errorClickTimer = undefined;
-  constructor(userFrustrationsEnabled) {
-    if (userFrustrationsEnabled && (0, _nreum.gosNREUMOriginals)().o.MO) {
+  constructor() {
+    if ((0, _nreum.gosNREUMOriginals)().o.MO) {
       this.#domObserver = new MutationObserver(this.isLiveClick.bind(this));
-      this.#ufEnabled = true;
     }
   }
   get aggregationEvent() {
@@ -56,15 +54,13 @@ class UserActionsAggregator {
     } else {
       // return the prev existing one (if there is one)
       const finishedEvent = this.#aggregationEvent;
-      if (this.#ufEnabled) {
-        this.#deadClickCleanup();
-        this.#errorClickCleanup();
-      }
+      this.#deadClickCleanup();
+      this.#errorClickCleanup();
 
       // then start new event aggregation
       this.#aggregationKey = aggregationKey;
       this.#aggregationEvent = new _aggregatedUserAction.AggregatedUserAction(evt, selectorInfo);
-      if (this.#ufEnabled && evt.type === 'click' && (selectorInfo.hasButton || selectorInfo.hasLink)) {
+      if (evt.type === 'click' && (selectorInfo.hasButton || selectorInfo.hasLink)) {
         this.#deadClickSetup(this.#aggregationEvent);
         this.#errorClickSetup();
       }

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

@@ -31,7 +31,6 @@ class Instrument extends _instrumentBase.InstrumentBase {
   constructor(agentRef) {
     super(agentRef, _constants.FEATURE_NAME);
     const websocketsEnabled = agentRef.init.feature_flags.includes('websockets');
-    const ufEnabled = agentRef.init.feature_flags.includes('user_frustrations');
 
     /** config values that gate whether the generic events aggregator should be imported at all */
     const genericEventSourceConfigs = [agentRef.init.page_action.enabled, agentRef.init.performance.capture_marks, agentRef.init.performance.capture_measures, agentRef.init.performance.resources.enabled, agentRef.init.user_actions.enabled, websocketsEnabled];
@@ -43,13 +42,11 @@ class Instrument extends _instrumentBase.InstrumentBase {
     (0, _register.setupRegisterAPI)(agentRef);
     (0, _measure.setupMeasureAPI)(agentRef);
     let historyEE, websocketsEE;
-    if (_runtime.isBrowserScope && ufEnabled) {
+    if (websocketsEnabled) websocketsEE = (0, _wrapWebsocket.wrapWebSocket)(this.ee);
+    if (_runtime.isBrowserScope) {
       (0, _wrapFetch.wrapFetch)(this.ee);
       (0, _wrapXhr.wrapXhr)(this.ee);
       historyEE = (0, _wrapHistory.wrapHistory)(this.ee);
-    }
-    if (websocketsEnabled) websocketsEE = (0, _wrapWebsocket.wrapWebSocket)(this.ee);
-    if (_runtime.isBrowserScope) {
       if (agentRef.init.user_actions.enabled) {
         _constants.OBSERVED_EVENTS.forEach(eventType => (0, _eventListenerOpts.windowAddEventListener)(eventType, evt => (0, _handle.handle)('ua', [evt], undefined, this.featureName, this.ee), true));
         _constants.OBSERVED_WINDOW_EVENTS.forEach(eventType => {
@@ -62,36 +59,34 @@ class Instrument extends _instrumentBase.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) {
-          _runtime.globalScope.addEventListener('error', () => {
-            (0, _handle.handle)('uaErr', [], undefined, _features.FEATURE_NAMES.genericEvents, this.ee);
-          }, (0, _eventListenerOpts.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
-                  (0, _handle.handle)('uaXhr', [], undefined, _features.FEATURE_NAMES.genericEvents, this.ee);
-                }
-              });
-            }
-          });
-          this.ee.on('fetch-start', fetchArguments => {
-            if (fetchArguments.length >= 1 && !isInternalTraffic((0, _extractUrl.extractUrl)(fetchArguments[0]))) {
-              (0, _handle.handle)('uaXhr', [], undefined, _features.FEATURE_NAMES.genericEvents, this.ee);
-            }
-          });
-          function isInternalTraffic(url) {
-            const parsedUrl = (0, _parseUrl.parseUrl)(url);
-            return agentRef.beacons.includes(parsedUrl.hostname + ':' + parsedUrl.port);
+        _runtime.globalScope.addEventListener('error', () => {
+          (0, _handle.handle)('uaErr', [], undefined, _features.FEATURE_NAMES.genericEvents, this.ee);
+        }, (0, _eventListenerOpts.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
+                (0, _handle.handle)('uaXhr', [], undefined, _features.FEATURE_NAMES.genericEvents, this.ee);
+              }
+            });
           }
-          historyEE.on('pushState-end', navigationChange);
-          historyEE.on('replaceState-end', navigationChange);
-          window.addEventListener('hashchange', navigationChange, (0, _eventListenerOpts.eventListenerOpts)(true, this.removeOnAbort?.signal));
-          window.addEventListener('popstate', navigationChange, (0, _eventListenerOpts.eventListenerOpts)(true, this.removeOnAbort?.signal));
-          function navigationChange() {
-            historyEE.emit('navChange');
+        });
+        this.ee.on('fetch-start', fetchArguments => {
+          if (fetchArguments.length >= 1 && !isInternalTraffic((0, _extractUrl.extractUrl)(fetchArguments[0]))) {
+            (0, _handle.handle)('uaXhr', [], undefined, _features.FEATURE_NAMES.genericEvents, this.ee);
           }
+        });
+        function isInternalTraffic(url) {
+          const parsedUrl = (0, _parseUrl.parseUrl)(url);
+          return agentRef.beacons.includes(parsedUrl.hostname + ':' + parsedUrl.port);
+        }
+        historyEE.on('pushState-end', navigationChange);
+        historyEE.on('replaceState-end', navigationChange);
+        window.addEventListener('hashchange', navigationChange, (0, _eventListenerOpts.eventListenerOpts)(true, this.removeOnAbort?.signal));
+        window.addEventListener('popstate', navigationChange, (0, _eventListenerOpts.eventListenerOpts)(true, this.removeOnAbort?.signal));
+        function navigationChange() {
+          historyEE.emit('navChange');
         }
       }
       if (agentRef.init.performance.resources.enabled && _runtime.globalScope.PerformanceObserver?.supportedEntryTypes.includes('resource')) {

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

@@ -50,7 +50,7 @@ function register(agentRef, target, parent) {
   const attrs = {};
   (0, _console.warn)(54, 'newrelic.register');
   target ||= {};
-  target.eventSource = 'MicroFrontendBrowserAgent';
+  target.type = '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 || {};

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.304.0-rc.3";
+export const VERSION = "1.304.0-rc.5";
 
 /**
  * Exposes the build type of the agent

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.304.0-rc.3";
+export const VERSION = "1.304.0-rc.5";
 
 /**
  * Exposes the build type of the agent

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

@@ -20,7 +20,7 @@ export function hasValidValue(val) {
  *
  * @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
+ * @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 {};
@@ -32,9 +32,9 @@ export function getVersion2Attributes(target, aggregateInstance) {
     };
   }
   return {
-    'mfe.id': target.id,
-    'mfe.name': target.name,
-    eventSource: target.eventSource,
+    'source.id': target.id,
+    'source.name': target.name,
+    'source.type': target.type,
     'parent.id': target.parent?.id || containerAgentEntityGuid
   };
 }

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

@@ -54,7 +54,7 @@ export class Aggregate extends AggregateBase {
       }
       let addUserAction = () => {/** no-op */};
       if (isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.#userActionAggregator = new UserActionsAggregator(agentRef.init.feature_flags.includes('user_frustrations'));
+        this.#userActionAggregator = new UserActionsAggregator();
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.#userActionAggregator.aggregationEvent);
         addUserAction = aggregatedUserAction => {
           try {

package/dist/esm/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -11,14 +11,12 @@ export class UserActionsAggregator {
   /** @type {AggregatedUserAction=} */
   #aggregationEvent = undefined;
   #aggregationKey = '';
-  #ufEnabled = false;
   #deadClickTimer = undefined;
   #domObserver = undefined;
   #errorClickTimer = undefined;
-  constructor(userFrustrationsEnabled) {
-    if (userFrustrationsEnabled && gosNREUMOriginals().o.MO) {
+  constructor() {
+    if (gosNREUMOriginals().o.MO) {
       this.#domObserver = new MutationObserver(this.isLiveClick.bind(this));
-      this.#ufEnabled = true;
     }
   }
   get aggregationEvent() {
@@ -49,15 +47,13 @@ export class UserActionsAggregator {
     } else {
       // return the prev existing one (if there is one)
       const finishedEvent = this.#aggregationEvent;
-      if (this.#ufEnabled) {
-        this.#deadClickCleanup();
-        this.#errorClickCleanup();
-      }
+      this.#deadClickCleanup();
+      this.#errorClickCleanup();
 
       // then start new event aggregation
       this.#aggregationKey = aggregationKey;
       this.#aggregationEvent = new AggregatedUserAction(evt, selectorInfo);
-      if (this.#ufEnabled && evt.type === 'click' && (selectorInfo.hasButton || selectorInfo.hasLink)) {
+      if (evt.type === 'click' && (selectorInfo.hasButton || selectorInfo.hasLink)) {
         this.#deadClickSetup(this.#aggregationEvent);
         this.#errorClickSetup();
       }

package/dist/esm/features/generic_events/instrument/index.js

@@ -26,7 +26,6 @@ export class Instrument extends InstrumentBase {
   constructor(agentRef) {
     super(agentRef, FEATURE_NAME);
     const websocketsEnabled = agentRef.init.feature_flags.includes('websockets');
-    const ufEnabled = agentRef.init.feature_flags.includes('user_frustrations');
 
     /** config values that gate whether the generic events aggregator should be imported at all */
     const genericEventSourceConfigs = [agentRef.init.page_action.enabled, agentRef.init.performance.capture_marks, agentRef.init.performance.capture_measures, agentRef.init.performance.resources.enabled, agentRef.init.user_actions.enabled, websocketsEnabled];
@@ -38,13 +37,11 @@ export class Instrument extends InstrumentBase {
     setupRegisterAPI(agentRef);
     setupMeasureAPI(agentRef);
     let historyEE, websocketsEE;
-    if (isBrowserScope && ufEnabled) {
+    if (websocketsEnabled) websocketsEE = wrapWebSocket(this.ee);
+    if (isBrowserScope) {
       wrapFetch(this.ee);
       wrapXhr(this.ee);
       historyEE = wrapHistory(this.ee);
-    }
-    if (websocketsEnabled) websocketsEE = wrapWebSocket(this.ee);
-    if (isBrowserScope) {
       if (agentRef.init.user_actions.enabled) {
         OBSERVED_EVENTS.forEach(eventType => windowAddEventListener(eventType, evt => handle('ua', [evt], undefined, this.featureName, this.ee), true));
         OBSERVED_WINDOW_EVENTS.forEach(eventType => {
@@ -57,36 +54,34 @@ 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);
+        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);
+              }
+            });
           }
-          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');
+        });
+        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')) {

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

@@ -44,7 +44,7 @@ function register(agentRef, target, parent) {
   const attrs = {};
   warn(54, 'newrelic.register');
   target ||= {};
-  target.eventSource = 'MicroFrontendBrowserAgent';
+  target.type = '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 || {};

package/dist/types/common/util/mfe.d.ts

@@ -14,10 +14,7 @@ export function hasValidValue(val: any): boolean;
  *
  * @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
+ * @returns {Object} returns an empty object if args are not supplied or the aggregate instance is not supporting version 2
  */
-export function getVersion2Attributes(target?: Object, aggregateInstance?: AggregateInstance): {
-    "mfe.id": any;
-    "mfe.name": string;
-} | {};
+export function getVersion2Attributes(target?: Object, aggregateInstance?: AggregateInstance): Object;
 //# sourceMappingURL=mfe.d.ts.map

package/dist/types/common/util/mfe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mfe.d.ts","sourceRoot":"","sources":["../../../../src/common/util/mfe.js"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;GAGG;AACH,0CAHW,MAAM,GACJ,OAAO,CAInB;AAED,iDAEC;AAED;;;;;;;GAOG;AACH,+CAJW,MAAM,sBACN,iBAAiB,GACf;IAAC,QAAQ,EAAE,GAAC,CAAC;IAAC,UAAU,SAAQ;CAAC,GAAC,EAAE,CAiBhD"}
+{"version":3,"file":"mfe.d.ts","sourceRoot":"","sources":["../../../../src/common/util/mfe.js"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;GAGG;AACH,0CAHW,MAAM,GACJ,OAAO,CAInB;AAED,iDAEC;AAED;;;;;;;GAOG;AACH,+CAJW,MAAM,sBACN,iBAAiB,GACf,MAAM,CAiBlB"}

package/dist/types/features/generic_events/aggregate/user-actions/user-actions-aggregator.d.ts

@@ -1,5 +1,4 @@
 export class UserActionsAggregator {
-    constructor(userFrustrationsEnabled: any);
     get aggregationEvent(): AggregatedUserAction | undefined;
     /**
      * Process the event and determine if a new aggregation set should be made or if it should increment the current aggregation

package/dist/types/features/generic_events/aggregate/user-actions/user-actions-aggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-actions-aggregator.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js"],"names":[],"mappings":"AAUA;IASE,0CAKC;IAED,yDAQC;IAED;;;;OAIG;IACH,aAHW,KAAK,sBACH,oBAAoB,GAAC,SAAS,CA6B1C;IAED,yBAKC;IA0CD,oBAEC;;CACF;qCAlHoC,0BAA0B"}
+{"version":3,"file":"user-actions-aggregator.d.ts","sourceRoot":"","sources":["../../../../../../src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js"],"names":[],"mappings":"AAUA;IAcE,yDAQC;IAED;;;;OAIG;IACH,aAHW,KAAK,sBACH,oBAAoB,GAAC,SAAS,CA2B1C;IAED,yBAKC;IA0CD,oBAEC;;CACF;qCA9GoC,0BAA0B"}

package/dist/types/features/generic_events/instrument/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/instrument/index.js"],"names":[],"mappings":"AAwBA;IACE,2BAAiC;IACjC,2BAyGC;IAXG,2CAA0C;IAG5C,yBAGC;CAMJ;AAED,8CAAuC;+BAxHR,6BAA6B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/instrument/index.js"],"names":[],"mappings":"AAwBA;IACE,2BAAiC;IACjC,2BAuGC;IAXG,2CAA0C;IAG5C,yBAGC;CAMJ;AAED,8CAAuC;+BAtHR,6BAA6B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.304.0-rc.3",
+  "version": "1.304.0-rc.5",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",

package/src/common/util/mfe.js

@@ -21,7 +21,7 @@ export function hasValidValue (val) {
  *
  * @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
+ * @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 {}
@@ -33,9 +33,9 @@ export function getVersion2Attributes (target, aggregateInstance) {
     }
   }
   return {
-    'mfe.id': target.id,
-    'mfe.name': target.name,
-    eventSource: target.eventSource,
+    'source.id': target.id,
+    'source.name': target.name,
+    'source.type': target.type,
     'parent.id': target.parent?.id || containerAgentEntityGuid
   }
 }

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

@@ -61,7 +61,7 @@ export class Aggregate extends AggregateBase {
 
       let addUserAction = () => { /** no-op */ }
       if (isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.#userActionAggregator = new UserActionsAggregator(agentRef.init.feature_flags.includes('user_frustrations'))
+        this.#userActionAggregator = new UserActionsAggregator()
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.#userActionAggregator.aggregationEvent)
 
         addUserAction = (aggregatedUserAction) => {

package/src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -12,15 +12,13 @@ export class UserActionsAggregator {
   /** @type {AggregatedUserAction=} */
   #aggregationEvent = undefined
   #aggregationKey = ''
-  #ufEnabled = false
   #deadClickTimer = undefined
   #domObserver = undefined
   #errorClickTimer = undefined
 
-  constructor (userFrustrationsEnabled) {
-    if (userFrustrationsEnabled && gosNREUMOriginals().o.MO) {
+  constructor () {
+    if (gosNREUMOriginals().o.MO) {
       this.#domObserver = new MutationObserver(this.isLiveClick.bind(this))
-      this.#ufEnabled = true
     }
   }
 
@@ -52,15 +50,13 @@ export class UserActionsAggregator {
     } else {
       // return the prev existing one (if there is one)
       const finishedEvent = this.#aggregationEvent
-      if (this.#ufEnabled) {
-        this.#deadClickCleanup()
-        this.#errorClickCleanup()
-      }
+      this.#deadClickCleanup()
+      this.#errorClickCleanup()
 
       // then start new event aggregation
       this.#aggregationKey = aggregationKey
       this.#aggregationEvent = new AggregatedUserAction(evt, selectorInfo)
-      if (this.#ufEnabled && evt.type === 'click' && (selectorInfo.hasButton || selectorInfo.hasLink)) {
+      if (evt.type === 'click' && (selectorInfo.hasButton || selectorInfo.hasLink)) {
         this.#deadClickSetup(this.#aggregationEvent)
         this.#errorClickSetup()
       }

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

@@ -27,7 +27,6 @@ export class Instrument extends InstrumentBase {
   constructor (agentRef) {
     super(agentRef, FEATURE_NAME)
     const websocketsEnabled = agentRef.init.feature_flags.includes('websockets')
-    const ufEnabled = agentRef.init.feature_flags.includes('user_frustrations')
 
     /** config values that gate whether the generic events aggregator should be imported at all */
     const genericEventSourceConfigs = [
@@ -47,14 +46,12 @@ export class Instrument extends InstrumentBase {
     setupMeasureAPI(agentRef)
 
     let historyEE, websocketsEE
-    if (isBrowserScope && ufEnabled) {
+    if (websocketsEnabled) websocketsEE = wrapWebSocket(this.ee)
+    if (isBrowserScope) {
       wrapFetch(this.ee)
       wrapXhr(this.ee)
       historyEE = wrapHistory(this.ee)
-    }
-    if (websocketsEnabled) websocketsEE = wrapWebSocket(this.ee)
 
-    if (isBrowserScope) {
       if (agentRef.init.user_actions.enabled) {
         OBSERVED_EVENTS.forEach(eventType =>
           windowAddEventListener(eventType, (evt) => handle('ua', [evt], undefined, this.featureName, this.ee), true)
@@ -63,42 +60,40 @@ export class Instrument extends InstrumentBase {
           const debounceHandler = debounce((evt) => { handle('ua', [evt], undefined, this.featureName, this.ee) }, 500, { leading: true })
           windowAddEventListener(eventType, debounceHandler)
         }
-        // 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.
+          // 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)
+        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)
+          }
+        })
 
-          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 isInternalTraffic (url) {
+          const parsedUrl = parseUrl(url)
+          return agentRef.beacons.includes(parsedUrl.hostname + ':' + parsedUrl.port)
+        }
 
-          function navigationChange () {
-            historyEE.emit('navChange')
-          }
+        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')
         }
       }
 
@@ -108,7 +103,10 @@ export class Instrument extends InstrumentBase {
             handle('browserPerformance.resource', [entry], undefined, this.featureName, this.ee)
           })
         })
-        observer.observe({ type: 'resource', buffered: true })
+        observer.observe({
+          type: 'resource',
+          buffered: true
+        })
       }
     }
     if (websocketsEnabled) { // this can apply outside browser scope such as in worker

package/src/loaders/api/register.js

@@ -45,7 +45,7 @@ function register (agentRef, target, parent) {
   warn(54, 'newrelic.register')
 
   target ||= {}
-  target.eventSource = 'MicroFrontendBrowserAgent'
+  target.type = '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 || {}