@newrelic/browser-agent 1.318.0-rc.8 → 1.318.0-rc.9

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.318.0-rc.8";
+const VERSION = exports.VERSION = "1.318.0-rc.9";
 
 /**
  * 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.318.0-rc.8";
+const VERSION = exports.VERSION = "1.318.0-rc.9";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/v2/utils.js

@@ -107,7 +107,7 @@ function shouldDuplicate(target, aggregateInstance) {
  * @returns {Array} An array of targets found from the stack trace. If no targets are found or allowed, returns an array with undefined.
  */
 function findTargetsFromStackTrace(agentRef) {
-  if (!agentRef?.init.api.register.enabled) return [undefined];
+  if (!agentRef?.init.api.register.enabled || !agentRef?.runtime?.registeredEntities?.length) return [undefined];
   const targets = [];
   try {
     var urls = (0, _scriptTracker.extractUrlsFromStack)((0, _scriptTracker.getDeepStackTrace)());

package/dist/cjs/common/wrap/wrap-websocket.js

@@ -8,6 +8,7 @@ var _runtime = require("../constants/runtime");
 var _uniqueId = require("../ids/unique-id");
 var _now = require("../timing/now");
 var _cleanUrl = require("../url/clean-url");
+var _utils = require("../v2/utils");
 var _nreum = require("../window/nreum");
 var _pageVisibility = require("../window/page-visibility");
 var _events = require("../constants/events");
@@ -19,7 +20,7 @@ var _events = require("../constants/events");
 const wrapped = {};
 const openWebSockets = new Set(); // track all instances to close out metrics on page unload
 
-function wrapWebSocket(sharedEE) {
+function wrapWebSocket(sharedEE, agentRef) {
   const originals = (0, _nreum.gosNREUMOriginals)().o;
   if (!originals.WS) return sharedEE;
   const wsEE = sharedEE.get('websockets');
@@ -37,7 +38,7 @@ function wrapWebSocket(sharedEE) {
       if (ws.nrData.openedAt) {
         ws.nrData.connectedDuration = unloadTime - ws.nrData.openedAt;
       }
-      wsEE.emit('ws', [ws.nrData], ws);
+      wsEE.emit('ws', [ws.nrData, ws.targets], ws);
     });
   });
   class WrappedWebSocket extends WebSocket {
@@ -65,6 +66,7 @@ function wrapWebSocket(sharedEE) {
       super(...args);
       /** @type {WebSocketData} */
       this.nrData = new WebSocketData(args[0], args[1]);
+      this.targets = (0, _utils.findTargetsFromStackTrace)(agentRef);
       this.addEventListener('open', () => {
         this.nrData.openedAt = (0, _now.now)();
         ['protocol', 'extensions', 'binaryType'].forEach(prop => {
@@ -93,7 +95,7 @@ function wrapWebSocket(sharedEE) {
         this.nrData.closeWasClean = event.wasClean;
         this.nrData.connectedDuration = this.nrData.closedAt - this.nrData.openedAt;
         openWebSockets.delete(this); // remove from tracking set since it's now closed
-        wsEE.emit('ws', [this.nrData], this);
+        wsEE.emit('ws', [this.nrData, this.targets], this);
       });
     }
     addEventListener(type, listener, ...rest) {

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

@@ -262,19 +262,21 @@ class Aggregate extends _aggregateBase.AggregateBase {
         this.addEvent(event, target);
       }, this.featureName, this.ee);
       if (agentRef.init.feature_flags.includes('websockets') || agentRef.init.web_sockets?.enabled) {
-        (0, _registerHandler.registerHandler)('ws-complete', nrData => {
-          const event = {
-            ...nrData,
-            eventType: _events.EVENT_TYPES.WS,
-            timestamp: this.#toEpoch(nrData.timestamp),
-            openedAt: this.#toEpoch(nrData.openedAt),
-            closedAt: this.#toEpoch(nrData.closedAt)
-          };
+        (0, _registerHandler.registerHandler)('ws-complete', (nrData, targets = [undefined]) => {
+          targets.forEach(target => {
+            const event = {
+              ...nrData,
+              eventType: _events.EVENT_TYPES.WS,
+              timestamp: this.#toEpoch(nrData.timestamp),
+              openedAt: this.#toEpoch(nrData.openedAt),
+              closedAt: this.#toEpoch(nrData.closedAt)
+            };
 
-          // Report supportability metrics for WebSocket completion
-          this.reportSupportabilityMetric('WebSocket/Completed/Seen');
-          this.reportSupportabilityMetric('WebSocket/Completed/Bytes', (0, _stringify.stringify)(event).length);
-          this.addEvent(event);
+            // Report supportability metrics for WebSocket completion
+            this.reportSupportabilityMetric('WebSocket/Completed/Seen');
+            this.reportSupportabilityMetric('WebSocket/Completed/Bytes', (0, _stringify.stringify)(event).length);
+            this.addEvent(event, target);
+          });
         }, this.featureName, this.ee);
       }
       if (!agentRef.init.feature_flags.includes('no_spv')) {

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

@@ -50,9 +50,9 @@ class Instrument extends _instrumentBase.InstrumentBase {
     let historyEE;
     if (websocketsEnabled) {
       // this can apply outside browser scope such as in worker
-      const websocketsEE = (0, _wrapWebsocket.wrapWebSocket)(this.ee);
-      websocketsEE.on('ws', nrData => {
-        (0, _handle.handle)('ws-complete', [nrData], undefined, this.featureName, this.ee);
+      const websocketsEE = (0, _wrapWebsocket.wrapWebSocket)(this.ee, agentRef);
+      websocketsEE.on('ws', (nrData, targets) => {
+        (0, _handle.handle)('ws-complete', [nrData, targets], undefined, this.featureName, this.ee);
       });
     }
     if (securityPolicyViolationEnabled) {

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.318.0-rc.8";
+export const VERSION = "1.318.0-rc.9";
 
 /**
  * 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.318.0-rc.8";
+export const VERSION = "1.318.0-rc.9";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/v2/utils.js

@@ -96,7 +96,7 @@ export function shouldDuplicate(target, aggregateInstance) {
  * @returns {Array} An array of targets found from the stack trace. If no targets are found or allowed, returns an array with undefined.
  */
 export function findTargetsFromStackTrace(agentRef) {
-  if (!agentRef?.init.api.register.enabled) return [undefined];
+  if (!agentRef?.init.api.register.enabled || !agentRef?.runtime?.registeredEntities?.length) return [undefined];
   const targets = [];
   try {
     var urls = extractUrlsFromStack(getDeepStackTrace());

package/dist/esm/common/wrap/wrap-websocket.js

@@ -6,13 +6,14 @@ import { globalScope } from '../constants/runtime';
 import { generateRandomHexString } from '../ids/unique-id';
 import { now } from '../timing/now';
 import { cleanURL } from '../url/clean-url';
+import { findTargetsFromStackTrace } from '../v2/utils';
 import { gosNREUMOriginals } from '../window/nreum';
 import { subscribeToPageUnload } from '../window/page-visibility';
 import { EVENT_TYPES } from '../constants/events';
 const wrapped = {};
 const openWebSockets = new Set(); // track all instances to close out metrics on page unload
 
-export function wrapWebSocket(sharedEE) {
+export function wrapWebSocket(sharedEE, agentRef) {
   const originals = gosNREUMOriginals().o;
   if (!originals.WS) return sharedEE;
   const wsEE = sharedEE.get('websockets');
@@ -30,7 +31,7 @@ export function wrapWebSocket(sharedEE) {
       if (ws.nrData.openedAt) {
         ws.nrData.connectedDuration = unloadTime - ws.nrData.openedAt;
       }
-      wsEE.emit('ws', [ws.nrData], ws);
+      wsEE.emit('ws', [ws.nrData, ws.targets], ws);
     });
   });
   class WrappedWebSocket extends WebSocket {
@@ -58,6 +59,7 @@ export function wrapWebSocket(sharedEE) {
       super(...args);
       /** @type {WebSocketData} */
       this.nrData = new WebSocketData(args[0], args[1]);
+      this.targets = findTargetsFromStackTrace(agentRef);
       this.addEventListener('open', () => {
         this.nrData.openedAt = now();
         ['protocol', 'extensions', 'binaryType'].forEach(prop => {
@@ -86,7 +88,7 @@ export function wrapWebSocket(sharedEE) {
         this.nrData.closeWasClean = event.wasClean;
         this.nrData.connectedDuration = this.nrData.closedAt - this.nrData.openedAt;
         openWebSockets.delete(this); // remove from tracking set since it's now closed
-        wsEE.emit('ws', [this.nrData], this);
+        wsEE.emit('ws', [this.nrData, this.targets], this);
       });
     }
     addEventListener(type, listener, ...rest) {

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

@@ -255,19 +255,21 @@ export class Aggregate extends AggregateBase {
         this.addEvent(event, target);
       }, this.featureName, this.ee);
       if (agentRef.init.feature_flags.includes('websockets') || agentRef.init.web_sockets?.enabled) {
-        registerHandler('ws-complete', nrData => {
-          const event = {
-            ...nrData,
-            eventType: EVENT_TYPES.WS,
-            timestamp: this.#toEpoch(nrData.timestamp),
-            openedAt: this.#toEpoch(nrData.openedAt),
-            closedAt: this.#toEpoch(nrData.closedAt)
-          };
+        registerHandler('ws-complete', (nrData, targets = [undefined]) => {
+          targets.forEach(target => {
+            const event = {
+              ...nrData,
+              eventType: EVENT_TYPES.WS,
+              timestamp: this.#toEpoch(nrData.timestamp),
+              openedAt: this.#toEpoch(nrData.openedAt),
+              closedAt: this.#toEpoch(nrData.closedAt)
+            };
 
-          // Report supportability metrics for WebSocket completion
-          this.reportSupportabilityMetric('WebSocket/Completed/Seen');
-          this.reportSupportabilityMetric('WebSocket/Completed/Bytes', stringify(event).length);
-          this.addEvent(event);
+            // Report supportability metrics for WebSocket completion
+            this.reportSupportabilityMetric('WebSocket/Completed/Seen');
+            this.reportSupportabilityMetric('WebSocket/Completed/Bytes', stringify(event).length);
+            this.addEvent(event, target);
+          });
         }, this.featureName, this.ee);
       }
       if (!agentRef.init.feature_flags.includes('no_spv')) {

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

@@ -45,9 +45,9 @@ export class Instrument extends InstrumentBase {
     let historyEE;
     if (websocketsEnabled) {
       // this can apply outside browser scope such as in worker
-      const websocketsEE = wrapWebSocket(this.ee);
-      websocketsEE.on('ws', nrData => {
-        handle('ws-complete', [nrData], undefined, this.featureName, this.ee);
+      const websocketsEE = wrapWebSocket(this.ee, agentRef);
+      websocketsEE.on('ws', (nrData, targets) => {
+        handle('ws-complete', [nrData, targets], undefined, this.featureName, this.ee);
       });
     }
     if (securityPolicyViolationEnabled) {

package/dist/types/common/wrap/wrap-websocket.d.ts

@@ -1,2 +1,2 @@
-export function wrapWebSocket(sharedEE: any): any;
+export function wrapWebSocket(sharedEE: any, agentRef: any): any;
 //# sourceMappingURL=wrap-websocket.d.ts.map

package/dist/types/common/wrap/wrap-websocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-websocket.d.ts","sourceRoot":"","sources":["../../../../src/common/wrap/wrap-websocket.js"],"names":[],"mappings":"AAeA,kDA2IC"}
+{"version":3,"file":"wrap-websocket.d.ts","sourceRoot":"","sources":["../../../../src/common/wrap/wrap-websocket.js"],"names":[],"mappings":"AAgBA,iEA4IC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/aggregate/index.js"],"names":[],"mappings":"AAmBA;IACE,2BAAiC;IAGjC,2BA6QC;IA3QC,gCAAkG;IAIlG,uBAA0C;IA0Q5C;;;;;;;;;;;;OAYG;IACH,eAJW,MAAM,YAAC,WACP,MAAM,YAAC,QAkCjB;IAED,6CAEC;IAED;;;MAEC;;CAsBF;8BAzW6B,4BAA4B;2BAI/B,gCAAgC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/aggregate/index.js"],"names":[],"mappings":"AAmBA;IACE,2BAAiC;IAGjC,2BA+QC;IA7QC,gCAAkG;IAIlG,uBAA0C;IA4Q5C;;;;;;;;;;;;OAYG;IACH,eAJW,MAAM,YAAC,WACP,MAAM,YAAC,QAkCjB;IAED,6CAEC;IAED;;;MAEC;;CAsBF;8BA3W6B,4BAA4B;2BAI/B,gCAAgC"}

package/package.json

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

package/src/common/v2/utils.js

@@ -92,7 +92,7 @@ export function shouldDuplicate (target, aggregateInstance) {
  * @returns {Array} An array of targets found from the stack trace. If no targets are found or allowed, returns an array with undefined.
  */
 export function findTargetsFromStackTrace (agentRef) {
-  if (!agentRef?.init.api.register.enabled) return [undefined]
+  if (!agentRef?.init.api.register.enabled || !agentRef?.runtime?.registeredEntities?.length) return [undefined]
 
   const targets = []
   try {

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

@@ -6,6 +6,7 @@ import { globalScope } from '../constants/runtime'
 import { generateRandomHexString } from '../ids/unique-id'
 import { now } from '../timing/now'
 import { cleanURL } from '../url/clean-url'
+import { findTargetsFromStackTrace } from '../v2/utils'
 import { gosNREUMOriginals } from '../window/nreum'
 import { subscribeToPageUnload } from '../window/page-visibility'
 import { EVENT_TYPES } from '../constants/events'
@@ -13,7 +14,7 @@ import { EVENT_TYPES } from '../constants/events'
 const wrapped = {}
 const openWebSockets = new Set() // track all instances to close out metrics on page unload
 
-export function wrapWebSocket (sharedEE) {
+export function wrapWebSocket (sharedEE, agentRef) {
   const originals = gosNREUMOriginals().o
   if (!originals.WS) return sharedEE
 
@@ -33,7 +34,7 @@ export function wrapWebSocket (sharedEE) {
         ws.nrData.connectedDuration = unloadTime - ws.nrData.openedAt
       }
 
-      wsEE.emit('ws', [ws.nrData], ws)
+      wsEE.emit('ws', [ws.nrData, ws.targets], ws)
     })
   })
 
@@ -61,6 +62,7 @@ export function wrapWebSocket (sharedEE) {
       super(...args)
       /** @type {WebSocketData} */
       this.nrData = new WebSocketData(args[0], args[1])
+      this.targets = findTargetsFromStackTrace(agentRef)
 
       this.addEventListener('open', () => {
         this.nrData.openedAt = now()
@@ -90,7 +92,7 @@ export function wrapWebSocket (sharedEE) {
         this.nrData.connectedDuration = this.nrData.closedAt - this.nrData.openedAt
 
         openWebSockets.delete(this) // remove from tracking set since it's now closed
-        wsEE.emit('ws', [this.nrData], this)
+        wsEE.emit('ws', [this.nrData, this.targets], this)
       })
     }
 

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

@@ -252,20 +252,22 @@ export class Aggregate extends AggregateBase {
       }, this.featureName, this.ee)
 
       if (agentRef.init.feature_flags.includes('websockets') || agentRef.init.web_sockets?.enabled) {
-        registerHandler('ws-complete', (nrData) => {
-          const event = {
-            ...nrData,
-            eventType: EVENT_TYPES.WS,
-            timestamp: this.#toEpoch(nrData.timestamp),
-            openedAt: this.#toEpoch(nrData.openedAt),
-            closedAt: this.#toEpoch(nrData.closedAt)
-          }
+        registerHandler('ws-complete', (nrData, targets = [undefined]) => {
+          targets.forEach(target => {
+            const event = {
+              ...nrData,
+              eventType: EVENT_TYPES.WS,
+              timestamp: this.#toEpoch(nrData.timestamp),
+              openedAt: this.#toEpoch(nrData.openedAt),
+              closedAt: this.#toEpoch(nrData.closedAt)
+            }
 
-          // Report supportability metrics for WebSocket completion
-          this.reportSupportabilityMetric('WebSocket/Completed/Seen')
-          this.reportSupportabilityMetric('WebSocket/Completed/Bytes', stringify(event).length)
+            // Report supportability metrics for WebSocket completion
+            this.reportSupportabilityMetric('WebSocket/Completed/Seen')
+            this.reportSupportabilityMetric('WebSocket/Completed/Bytes', stringify(event).length)
 
-          this.addEvent(event)
+            this.addEvent(event, target)
+          })
         }, this.featureName, this.ee)
       }
       if (!agentRef.init.feature_flags.includes('no_spv')) {

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

@@ -55,9 +55,9 @@ export class Instrument extends InstrumentBase {
 
     let historyEE
     if (websocketsEnabled) { // this can apply outside browser scope such as in worker
-      const websocketsEE = wrapWebSocket(this.ee)
-      websocketsEE.on('ws', (nrData) => {
-        handle('ws-complete', [nrData], undefined, this.featureName, this.ee)
+      const websocketsEE = wrapWebSocket(this.ee, agentRef)
+      websocketsEE.on('ws', (nrData, targets) => {
+        handle('ws-complete', [nrData, targets], undefined, this.featureName, this.ee)
       })
     }
     if (securityPolicyViolationEnabled) {