@newrelic/browser-agent 1.312.1-rc.4 → 1.312.1-rc.6

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.312.1-rc.4";
+const VERSION = exports.VERSION = "1.312.1-rc.6";
 
 /**
  * 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.312.1-rc.4";
+const VERSION = exports.VERSION = "1.312.1-rc.6";
 
 /**
  * Exposes the build type of the agent

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

@@ -270,6 +270,25 @@ class Aggregate extends _aggregateBase.AggregateBase {
           this.addEvent(event);
         }, this.featureName, this.ee);
       }
+      if (!agentRef.init.feature_flags.includes('no_spv')) {
+        (0, _registerHandler.registerHandler)('spv', evt => {
+          this.addEvent({
+            eventType: 'SecurityPolicyViolation',
+            timestamp: this.#toEpoch(evt.timeStamp),
+            blockedUri: evt.blockedURI,
+            documentUri: evt.documentURI,
+            effectiveDirective: evt.effectiveDirective,
+            originalPolicy: evt.originalPolicy,
+            sourceFile: evt.sourceFile,
+            statusCode: evt.statusCode,
+            lineNumber: evt.lineNumber,
+            columnNumber: evt.columnNumber,
+            disposition: evt.disposition,
+            sample: evt.sample,
+            referrer: evt.referrer
+          });
+        }, this.featureName, this.ee);
+      }
       this.drain();
     });
   }

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

@@ -31,9 +31,10 @@ class Instrument extends _instrumentBase.InstrumentBase {
   constructor(agentRef) {
     super(agentRef, _constants.FEATURE_NAME);
     const websocketsEnabled = agentRef.init.feature_flags.includes('websockets');
+    const securityPolicyViolationEnabled = !agentRef.init.feature_flags.includes('no_spv');
 
     /** 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];
+    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, securityPolicyViolationEnabled];
 
     /** feature specific APIs */
     (0, _addPageAction.setupAddPageActionAPI)(agentRef);
@@ -41,8 +42,24 @@ class Instrument extends _instrumentBase.InstrumentBase {
     (0, _finished.setupFinishedAPI)(agentRef);
     (0, _register.setupRegisterAPI)(agentRef);
     (0, _measure.setupMeasureAPI)(agentRef);
-    let historyEE, websocketsEE;
-    if (websocketsEnabled) websocketsEE = (0, _wrapWebsocket.wrapWebSocket)(this.ee);
+    this.removeOnAbort = new AbortController();
+    this.abortHandler = () => {
+      this.removeOnAbort.abort();
+      this.abortHandler = undefined; // weakly allow this abort op to run only once
+    };
+    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);
+      });
+    }
+    if (securityPolicyViolationEnabled) {
+      _runtime.globalScope.addEventListener('securitypolicyviolation', evt => {
+        (0, _handle.handle)('spv', [evt], undefined, _features.FEATURE_NAMES.genericEvents, this.ee);
+      }, (0, _eventListenerOpts.eventListenerOpts)(false, this.removeOnAbort.signal));
+    }
     if (_runtime.isBrowserScope) {
       (0, _wrapFetch.wrapFetch)(this.ee, agentRef);
       (0, _wrapXhr.wrapXhr)(this.ee, agentRef);
@@ -61,7 +78,7 @@ class Instrument extends _instrumentBase.InstrumentBase {
         );
         _runtime.globalScope.addEventListener('error', () => {
           (0, _handle.handle)('uaErr', [], undefined, _features.FEATURE_NAMES.genericEvents, this.ee);
-        }, (0, _eventListenerOpts.eventListenerOpts)(false, this.removeOnAbort?.signal));
+        }, (0, _eventListenerOpts.eventListenerOpts)(false, this.removeOnAbort.signal));
         this.ee.on('open-xhr-start', (args, xhr) => {
           if (!isInternalTraffic(args[1])) {
             xhr.addEventListener('readystatechange', () => {
@@ -69,7 +86,7 @@ class Instrument extends _instrumentBase.InstrumentBase {
                 // HEADERS_RECEIVED
                 (0, _handle.handle)('uaXhr', [], undefined, _features.FEATURE_NAMES.genericEvents, this.ee);
               }
-            });
+            }, (0, _eventListenerOpts.eventListenerOpts)(undefined, this.removeOnAbort.signal));
           }
         });
         this.ee.on('fetch-start', fetchArguments => {
@@ -83,8 +100,8 @@ class Instrument extends _instrumentBase.InstrumentBase {
         }
         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));
+        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');
         }
@@ -101,20 +118,6 @@ class Instrument extends _instrumentBase.InstrumentBase {
         });
       }
     }
-    if (websocketsEnabled) {
-      // this can apply outside browser scope such as in worker
-      websocketsEE.on('ws', nrData => {
-        (0, _handle.handle)('ws-complete', [nrData], undefined, this.featureName, this.ee);
-      });
-    }
-    try {
-      this.removeOnAbort = new AbortController();
-    } catch (e) {}
-    this.abortHandler = () => {
-      this.removeOnAbort?.abort();
-      this.abortHandler = undefined; // weakly allow this abort op to run only once
-    };
-
     /** If any of the sources are active, import the aggregator. otherwise deregister */
     if (genericEventSourceConfigs.some(x => x)) this.importAggregator(agentRef, () => Promise.resolve().then(() => _interopRequireWildcard(require(/* webpackChunkName: "generic_events-aggregate" */'../aggregate'))));else this.deregisterDrain();
   }

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

@@ -4,23 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Metrics = exports.Instrument = void 0;
-var _runtime = require("../../../common/constants/runtime");
-var _handle = require("../../../common/event-emitter/handle");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); } /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentRef) {
     super(agentRef, _constants.FEATURE_NAME);
-    if (_runtime.isBrowserScope) {
-      document.addEventListener('securitypolicyviolation', e => {
-        (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Generic/CSPViolation/Detected'], undefined, this.featureName, this.ee);
-      });
-    }
     this.importAggregator(agentRef, () => Promise.resolve().then(() => _interopRequireWildcard(require(/* webpackChunkName: "metrics-aggregate" */'../aggregate'))));
   }
 }

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

@@ -11,7 +11,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.312.1-rc.4";
+export const VERSION = "1.312.1-rc.6";
 
 /**
  * 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.312.1-rc.4";
+export const VERSION = "1.312.1-rc.6";
 
 /**
  * Exposes the build type of the agent

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

@@ -263,6 +263,25 @@ export class Aggregate extends AggregateBase {
           this.addEvent(event);
         }, this.featureName, this.ee);
       }
+      if (!agentRef.init.feature_flags.includes('no_spv')) {
+        registerHandler('spv', evt => {
+          this.addEvent({
+            eventType: 'SecurityPolicyViolation',
+            timestamp: this.#toEpoch(evt.timeStamp),
+            blockedUri: evt.blockedURI,
+            documentUri: evt.documentURI,
+            effectiveDirective: evt.effectiveDirective,
+            originalPolicy: evt.originalPolicy,
+            sourceFile: evt.sourceFile,
+            statusCode: evt.statusCode,
+            lineNumber: evt.lineNumber,
+            columnNumber: evt.columnNumber,
+            disposition: evt.disposition,
+            sample: evt.sample,
+            referrer: evt.referrer
+          });
+        }, this.featureName, this.ee);
+      }
       this.drain();
     });
   }

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

@@ -26,9 +26,10 @@ export class Instrument extends InstrumentBase {
   constructor(agentRef) {
     super(agentRef, FEATURE_NAME);
     const websocketsEnabled = agentRef.init.feature_flags.includes('websockets');
+    const securityPolicyViolationEnabled = !agentRef.init.feature_flags.includes('no_spv');
 
     /** 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];
+    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, securityPolicyViolationEnabled];
 
     /** feature specific APIs */
     setupAddPageActionAPI(agentRef);
@@ -36,8 +37,24 @@ export class Instrument extends InstrumentBase {
     setupFinishedAPI(agentRef);
     setupRegisterAPI(agentRef);
     setupMeasureAPI(agentRef);
-    let historyEE, websocketsEE;
-    if (websocketsEnabled) websocketsEE = wrapWebSocket(this.ee);
+    this.removeOnAbort = new AbortController();
+    this.abortHandler = () => {
+      this.removeOnAbort.abort();
+      this.abortHandler = undefined; // weakly allow this abort op to run only once
+    };
+    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);
+      });
+    }
+    if (securityPolicyViolationEnabled) {
+      globalScope.addEventListener('securitypolicyviolation', evt => {
+        handle('spv', [evt], undefined, FEATURE_NAMES.genericEvents, this.ee);
+      }, eventListenerOpts(false, this.removeOnAbort.signal));
+    }
     if (isBrowserScope) {
       wrapFetch(this.ee, agentRef);
       wrapXhr(this.ee, agentRef);
@@ -56,7 +73,7 @@ export class Instrument extends InstrumentBase {
         );
         globalScope.addEventListener('error', () => {
           handle('uaErr', [], undefined, FEATURE_NAMES.genericEvents, this.ee);
-        }, eventListenerOpts(false, this.removeOnAbort?.signal));
+        }, eventListenerOpts(false, this.removeOnAbort.signal));
         this.ee.on('open-xhr-start', (args, xhr) => {
           if (!isInternalTraffic(args[1])) {
             xhr.addEventListener('readystatechange', () => {
@@ -64,7 +81,7 @@ export class Instrument extends InstrumentBase {
                 // HEADERS_RECEIVED
                 handle('uaXhr', [], undefined, FEATURE_NAMES.genericEvents, this.ee);
               }
-            });
+            }, eventListenerOpts(undefined, this.removeOnAbort.signal));
           }
         });
         this.ee.on('fetch-start', fetchArguments => {
@@ -78,8 +95,8 @@ export class Instrument extends InstrumentBase {
         }
         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));
+        window.addEventListener('hashchange', navigationChange, eventListenerOpts(true, this.removeOnAbort.signal));
+        window.addEventListener('popstate', navigationChange, eventListenerOpts(true, this.removeOnAbort.signal));
         function navigationChange() {
           historyEE.emit('navChange');
         }
@@ -96,20 +113,6 @@ export class Instrument extends InstrumentBase {
         });
       }
     }
-    if (websocketsEnabled) {
-      // this can apply outside browser scope such as in worker
-      websocketsEE.on('ws', nrData => {
-        handle('ws-complete', [nrData], undefined, this.featureName, this.ee);
-      });
-    }
-    try {
-      this.removeOnAbort = new AbortController();
-    } catch (e) {}
-    this.abortHandler = () => {
-      this.removeOnAbort?.abort();
-      this.abortHandler = undefined; // weakly allow this abort op to run only once
-    };
-
     /** 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/dist/esm/features/metrics/instrument/index.js

@@ -1,21 +1,14 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isBrowserScope } from '../../../common/constants/runtime';
-import { handle } from '../../../common/event-emitter/handle';
 import { InstrumentBase } from '../../utils/instrument-base';
-import { FEATURE_NAME, SUPPORTABILITY_METRIC_CHANNEL } from '../constants';
+import { FEATURE_NAME } from '../constants';
 export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME;
   constructor(agentRef) {
     super(agentRef, FEATURE_NAME);
-    if (isBrowserScope) {
-      document.addEventListener('securitypolicyviolation', e => {
-        handle(SUPPORTABILITY_METRIC_CHANNEL, ['Generic/CSPViolation/Detected'], undefined, this.featureName, this.ee);
-      });
-    }
     this.importAggregator(agentRef, () => import(/* webpackChunkName: "metrics-aggregate" */'../aggregate'));
   }
 }

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":"AAkBA;IACE,2BAAiC;IAGjC,2BAkPC;IAhPC,gCAAkG;IAmPpG;;;;;;;;;;;;OAYG;IACH,eAJW,MAAM,YAAC,WACP,MAAM,YAAC,QAmCjB;IAED,qCAEC;IAED;;;MAEC;;CAsBF;8BA9U6B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAAiC;IAGjC,2BAqQC;IAnQC,gCAAkG;IAsQpG;;;;;;;;;;;;OAYG;IACH,eAJW,MAAM,YAAC,WACP,MAAM,YAAC,QAmCjB;IAED,qCAEC;IAED;;;MAEC;;CAsBF;8BAjW6B,4BAA4B"}

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

@@ -1,7 +1,7 @@
 export class Instrument extends InstrumentBase {
     static featureName: string;
     constructor(agentRef: any);
-    removeOnAbort: AbortController | undefined;
+    removeOnAbort: AbortController;
     abortHandler: () => void;
 }
 export const GenericEvents: typeof Instrument;

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,2BAuGC;IAXG,2CAA0C;IAG5C,yBAGC;CAMJ;AAED,8CAAuC;+BAtHR,6BAA6B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/generic_events/instrument/index.js"],"names":[],"mappings":"AAwBA;IACE,2BAAiC;IACjC,2BA0GC;IAnFC,+BAA0C;IAC1C,yBAGC;CAgFJ;AAED,8CAAuC;+BAzHR,6BAA6B"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/metrics/instrument/index.js"],"names":[],"mappings":"AAaA;IACE,2BAAiC;IACjC,2BAUC;CACF;AAED,wCAAiC;+BArBF,6BAA6B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/metrics/instrument/index.js"],"names":[],"mappings":"AAQA;IACE,2BAAiC;IACjC,2BAIC;CACF;AAED,wCAAiC;+BAZF,6BAA6B"}

package/package.json

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

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

@@ -259,6 +259,25 @@ export class Aggregate extends AggregateBase {
           this.addEvent(event)
         }, this.featureName, this.ee)
       }
+      if (!agentRef.init.feature_flags.includes('no_spv')) {
+        registerHandler('spv', (evt) => {
+          this.addEvent({
+            eventType: 'SecurityPolicyViolation',
+            timestamp: this.#toEpoch(evt.timeStamp),
+            blockedUri: evt.blockedURI,
+            documentUri: evt.documentURI,
+            effectiveDirective: evt.effectiveDirective,
+            originalPolicy: evt.originalPolicy,
+            sourceFile: evt.sourceFile,
+            statusCode: evt.statusCode,
+            lineNumber: evt.lineNumber,
+            columnNumber: evt.columnNumber,
+            disposition: evt.disposition,
+            sample: evt.sample,
+            referrer: evt.referrer
+          })
+        }, this.featureName, this.ee)
+      }
 
       this.drain()
     })

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

@@ -27,6 +27,7 @@ export class Instrument extends InstrumentBase {
   constructor (agentRef) {
     super(agentRef, FEATURE_NAME)
     const websocketsEnabled = agentRef.init.feature_flags.includes('websockets')
+    const securityPolicyViolationEnabled = !agentRef.init.feature_flags.includes('no_spv')
 
     /** config values that gate whether the generic events aggregator should be imported at all */
     const genericEventSourceConfigs = [
@@ -35,7 +36,8 @@ export class Instrument extends InstrumentBase {
       agentRef.init.performance.capture_measures,
       agentRef.init.performance.resources.enabled,
       agentRef.init.user_actions.enabled,
-      websocketsEnabled
+      websocketsEnabled,
+      securityPolicyViolationEnabled
     ]
 
     /** feature specific APIs */
@@ -45,8 +47,24 @@ export class Instrument extends InstrumentBase {
     setupRegisterAPI(agentRef)
     setupMeasureAPI(agentRef)
 
-    let historyEE, websocketsEE
-    if (websocketsEnabled) websocketsEE = wrapWebSocket(this.ee)
+    this.removeOnAbort = new AbortController()
+    this.abortHandler = () => {
+      this.removeOnAbort.abort()
+      this.abortHandler = undefined // weakly allow this abort op to run only once
+    }
+
+    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)
+      })
+    }
+    if (securityPolicyViolationEnabled) {
+      globalScope.addEventListener('securitypolicyviolation', (evt) => {
+        handle('spv', [evt], undefined, FEATURE_NAMES.genericEvents, this.ee)
+      }, eventListenerOpts(false, this.removeOnAbort.signal))
+    }
     if (isBrowserScope) {
       wrapFetch(this.ee, agentRef)
       wrapXhr(this.ee, agentRef)
@@ -65,7 +83,7 @@ export class Instrument extends InstrumentBase {
 
         globalScope.addEventListener('error', () => {
           handle('uaErr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
-        }, eventListenerOpts(false, this.removeOnAbort?.signal))
+        }, eventListenerOpts(false, this.removeOnAbort.signal))
 
         this.ee.on('open-xhr-start', (args, xhr) => {
           if (!isInternalTraffic(args[1])) {
@@ -73,7 +91,7 @@ export class Instrument extends InstrumentBase {
               if (xhr.readyState === 2) { // HEADERS_RECEIVED
                 handle('uaXhr', [], undefined, FEATURE_NAMES.genericEvents, this.ee)
               }
-            })
+            }, eventListenerOpts(undefined, this.removeOnAbort.signal))
           }
         })
         this.ee.on('fetch-start', (fetchArguments) => {
@@ -89,8 +107,8 @@ export class Instrument extends InstrumentBase {
 
         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))
+        window.addEventListener('hashchange', navigationChange, eventListenerOpts(true, this.removeOnAbort.signal))
+        window.addEventListener('popstate', navigationChange, eventListenerOpts(true, this.removeOnAbort.signal))
 
         function navigationChange () {
           historyEE.emit('navChange')
@@ -109,21 +127,6 @@ export class Instrument extends InstrumentBase {
         })
       }
     }
-    if (websocketsEnabled) { // this can apply outside browser scope such as in worker
-      websocketsEE.on('ws', (nrData) => {
-        handle('ws-complete', [nrData], undefined, this.featureName, this.ee)
-      })
-    }
-
-    try {
-      this.removeOnAbort = new AbortController()
-    } catch (e) {}
-
-    this.abortHandler = () => {
-      this.removeOnAbort?.abort()
-      this.abortHandler = undefined // weakly allow this abort op to run only once
-    }
-
     /** 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/metrics/instrument/index.js

@@ -1,27 +1,16 @@
 /**
- * Copyright 2020-2025 New Relic, Inc. All rights reserved.
+ * Copyright 2020-2026 New Relic, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isBrowserScope } from '../../../common/constants/runtime'
-import { handle } from '../../../common/event-emitter/handle'
 import { InstrumentBase } from '../../utils/instrument-base'
-import {
-  FEATURE_NAME,
-  SUPPORTABILITY_METRIC_CHANNEL
-} from '../constants'
+import { FEATURE_NAME } from '../constants'
 
 export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME
   constructor (agentRef) {
     super(agentRef, FEATURE_NAME)
 
-    if (isBrowserScope) {
-      document.addEventListener('securitypolicyviolation', (e) => {
-        handle(SUPPORTABILITY_METRIC_CHANNEL, ['Generic/CSPViolation/Detected'], undefined, this.featureName, this.ee)
-      })
-    }
-
     this.importAggregator(agentRef, () => import(/* webpackChunkName: "metrics-aggregate" */ '../aggregate'))
   }
 }