@newrelic/browser-agent 1.268.0 → 1.269.0

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.269.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.268.0...v1.269.0) (2024-10-16)
+
+
+### Features
+
+* Add instrumentation metadata to logging ([#1208](https://github.com/newrelic/newrelic-browser-agent/issues/1208)) ([6926474](https://github.com/newrelic/newrelic-browser-agent/commit/6926474fe2530475e10daab2bb6bad745bb547e1))
+* Include logging feature in micro agent loader ([#1210](https://github.com/newrelic/newrelic-browser-agent/issues/1210)) ([1b24484](https://github.com/newrelic/newrelic-browser-agent/commit/1b2448498cf285f36530f2107cb0403401958b1f))
+
+
+### Bug Fixes
+
+* Handle Session Replay Security Policy Errors ([#1215](https://github.com/newrelic/newrelic-browser-agent/issues/1215)) ([f14b0fe](https://github.com/newrelic/newrelic-browser-agent/commit/f14b0fec81d7d21b418b6be6c5d415bdd813eca9))
+* Only ever allow session traces to capture page load timings once ([#1212](https://github.com/newrelic/newrelic-browser-agent/issues/1212)) ([d189686](https://github.com/newrelic/newrelic-browser-agent/commit/d1896869858eca3320144113e168f17f524f3119))
+
 ## [1.268.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.267.0...v1.268.0) (2024-10-08)
 
 

package/README.md

@@ -238,7 +238,8 @@ A lot of new frameworks support the concept of server-side rendering the pages o
 
 ## Disclaimers
 
-The session replay library shipping as part of the browser agent is not turned on by default. For information on the use of this feature, see [Session Replay](#session-replay)
+* The session replay feature is not turned on by default. For information on the use of this feature, see [Session Replay](#session-replay)
+* As part of the improvement efforts around our SPA capabilities, the `createTracer` API has been [deprecated](https://docs.newrelic.com/eol/2024/04/eol-04-24-24-createtracer/). Please engage in removing usage of that library. If tracking task duration, we recommend utilizing the generic browser performance mark and measure APIs, which will gain native detection support from the agent in a future update.
 
 ## Support
 

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

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.268.0";
+const VERSION = exports.VERSION = "1.269.0";
 
 /**
  * Exposes the build type of the agent

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

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.268.0";
+const VERSION = exports.VERSION = "1.269.0";
 
 /**
  * Exposes the build type of the agent

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

@@ -23,6 +23,8 @@ var _nreum = require("../../../common/window/nreum");
 var _drain = require("../../../common/drain/drain");
 var _now = require("../../../common/timing/now");
 var _traverse = require("../../../common/util/traverse");
+var _internalErrors = require("./internal-errors");
+var _constants2 = require("../../metrics/constants");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -130,6 +132,16 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     return canonicalStackString;
   }
+
+  /**
+   *
+   * @param {Error|UncaughtError} err The error instance to be processed
+   * @param {number} time the relative ms (to origin) timestamp of occurence
+   * @param {boolean=} internal if the error was "caught" and deemed "internal" before reporting to the jserrors feature
+   * @param {object=} customAttributes  any custom attributes to be included in the error payload
+   * @param {boolean=} hasReplay a flag indicating if the error occurred during a replay session
+   * @returns
+   */
   storeError(err, time, internal, customAttributes, hasReplay) {
     if (!err) return;
     // are we in an interaction
@@ -146,6 +158,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
       // Again as with previous usage, all falsey values would include the error.
     }
     var stackInfo = (0, _computeStackTrace.computeStackTrace)(err);
+    const {
+      shouldSwallow,
+      reason
+    } = (0, _internalErrors.evaluateInternalError)(stackInfo, internal);
+    if (shouldSwallow) {
+      (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['Internal/Error/' + reason], undefined, _features.FEATURE_NAMES.metrics, this.ee);
+      return;
+    }
     var canonicalStackString = this.buildCanonicalStackString(stackInfo);
     const params = {
       stackHash: (0, _stringHashCode.stringHashCode)(canonicalStackString),
@@ -184,7 +204,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
     params.firstOccurrenceTimestamp = this.observedAt[bucketHash];
     params.timestamp = Math.floor(agentRuntime.timeKeeper.correctRelativeTimestamp(time));
-    var type = internal ? 'ierr' : 'err';
+    var type = 'err';
     var newMetrics = {
       time
     };

package/dist/cjs/features/jserrors/aggregate/internal-errors.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.evaluateInternalError = evaluateInternalError;
+const REASON_RRWEB = 'Rrweb';
+const REASON_SECURITY_POLICY = 'Security-Policy';
+/**
+ * This function is responsible for determining if an error should be swallowed or not.
+ * @param {Object} stackInfo - The error stack information.
+ * @returns {boolean} - Whether the error should be swallowed or not.
+ */
+function evaluateInternalError(stackInfo, internal) {
+  const output = {
+    shouldSwallow: internal || false,
+    reason: 'Other'
+  };
+  const leadingFrame = stackInfo.frames?.[0];
+  /** If we cant otherwise determine from the frames and message, the default of internal + reason will be the fallback */
+  if (!leadingFrame || typeof stackInfo?.message !== 'string') return output;
+
+  // check if the error happened in expected modules or if messages match known patterns
+  const isNrRecorder = leadingFrame?.url?.match(/nr-(.*)-recorder.min.js/);
+  const isRrweb = leadingFrame?.url?.match(/rrweb/);
+  const isMaybeNrRecorder = leadingFrame?.url?.match(/recorder/);
+  const isSecurityPolicyAPIError = stackInfo.message.toLowerCase().match(/an attempt was made to break through the security policy of the user agent/);
+
+  // check if modules and patterns above fit known swallow cases
+  if (!!isNrRecorder || !!isRrweb) {
+    /** We know -for sure- that the error came from our recorder module or rrweb directly if these are true, so swallow it */
+    output.shouldSwallow = true;
+    output.reason = REASON_RRWEB;
+    if (isSecurityPolicyAPIError) output.reason += '-' + REASON_SECURITY_POLICY;
+  } else if (!!isMaybeNrRecorder && isSecurityPolicyAPIError) {
+    /** We -suspect- that the error came from NR, so if it matches the exact case we know about, swallow it */
+    output.shouldSwallow = true;
+    output.reason = REASON_RRWEB + '-' + REASON_SECURITY_POLICY;
+  }
+  // other swallow conditions could also be added here
+  return output;
+}

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

@@ -84,6 +84,12 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
   prepareHarvest(options = {}) {
     if (this.blocked || !this.bufferedLogs.hasData) return;
+    /** These attributes are evaluated and dropped at ingest processing time and do not get stored on NRDB */
+    const unbilledAttributes = {
+      'instrumentation.provider': 'browser',
+      'instrumentation.version': this.#agentRuntime.version,
+      'instrumentation.name': this.#agentRuntime.loaderType
+    };
     /** see https://source.datanerd.us/agents/rum-specs/blob/main/browser/Log for logging spec */
     const payload = {
       qs: {
@@ -107,7 +113,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
             // Application ID from info object,
             standalone: Boolean(this.#agentInfo.sa),
             // copy paste (true) vs APM (false)
-            agentVersion: this.#agentRuntime.version // browser agent version
+            agentVersion: this.#agentRuntime.version,
+            // browser agent version,
+            ...unbilledAttributes
           }
         },
         /** logs section contains individual unique log entries */

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

@@ -66,6 +66,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
         // if another page's session entity has expired, or another page has transitioned to off and this one hasn't... we can just abort straight away here
         if (this.sessionId !== sessionState.value || eventType === 'cross-tab' && this.scheduler?.started && sessionState.sessionTraceMode === _constants2.MODE.OFF) this.abort(2);
       });
+      if (typeof PerformanceNavigationTiming !== 'undefined') {
+        this.traceStorage.storeTiming(_runtime2.globalScope.performance?.getEntriesByType?.('navigation')[0]);
+      } else {
+        this.traceStorage.storeTiming(_runtime2.globalScope.performance?.timing, true);
+      }
     }
 
     /** ST/SR sampling flow in BCS - https://drive.google.com/file/d/19hwt2oft-8Hh4RrjpLqEXfpP_9wYBLcq/view?usp=sharing */
@@ -91,11 +96,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     (0, _registerHandler.registerHandler)('bstApi', (...args) => this.traceStorage.storeSTN(...args), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('trace-jserror', (...args) => this.traceStorage.storeErrorAgg(...args), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('pvtAdded', (...args) => this.traceStorage.processPVT(...args), this.featureName, this.ee);
-    if (typeof PerformanceNavigationTiming !== 'undefined') {
-      this.traceStorage.storeTiming(_runtime2.globalScope.performance?.getEntriesByType?.('navigation')[0]);
-    } else {
-      this.traceStorage.storeTiming(_runtime2.globalScope.performance?.timing, true);
-    }
 
     /** Only start actually harvesting if running in full mode at init time */
     if (this.mode === _constants2.MODE.FULL) this.startHarvesting();else {

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

@@ -36,6 +36,10 @@ const {
   CB_START,
   FN_END
 } = CONSTANTS;
+
+/**
+ * @deprecated This feature has been deprecated, in favor of `soft_navigations`, which is in limited preview. Consider using/importing `SoftNavigations` instead. To gain access to the limited preview, please see https://docs.newrelic.com/docs/browser/single-page-app-monitoring/get-started/browser-spa-v2/ for more information. This feature will be removed in a future release.
+ */
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator, auto = true) {

package/dist/cjs/loaders/agent-base.js

@@ -176,6 +176,7 @@ class AgentBase {
    * {@link https://docs.newrelic.com/docs/browser/new-relic-browser/browser-apis/interaction/}
    * @returns {InteractionInstance} An API object that is bound to a specific BrowserInteraction event. Each time this method is called for the same BrowserInteraction, a new object is created, but it still references the same interaction.
    *  - Note: Does not apply to MicroAgent
+   *  - Deprecation Notice: interaction.createTracer is deprecated.  See https://docs.newrelic.com/eol/2024/04/eol-04-24-24-createtracer/ for more information.
   */
   interaction() {
     return this.#callMethod('interaction');

package/dist/cjs/loaders/micro-agent.js

@@ -20,7 +20,7 @@ var _agentBase = require("./agent-base");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; } // loader files
 // core files
-const nonAutoFeatures = [_features.FEATURE_NAMES.jserrors, _features.FEATURE_NAMES.genericEvents, _features.FEATURE_NAMES.metrics];
+const nonAutoFeatures = [_features.FEATURE_NAMES.jserrors, _features.FEATURE_NAMES.genericEvents, _features.FEATURE_NAMES.metrics, _features.FEATURE_NAMES.logging];
 
 /**
  * A minimal agent class designed to only respond to manual user input. As such, this class does not

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

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.268.0";
+export const VERSION = "1.269.0";
 
 /**
  * Exposes the build type of the agent

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

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.268.0";
+export const VERSION = "1.269.0";
 
 /**
  * Exposes the build type of the agent

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

@@ -22,6 +22,8 @@ import { getNREUMInitializedAgent } from '../../../common/window/nreum';
 import { deregisterDrain } from '../../../common/drain/drain';
 import { now } from '../../../common/timing/now';
 import { applyFnToProps } from '../../../common/util/traverse';
+import { evaluateInternalError } from './internal-errors';
+import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants';
 
 /**
  * @typedef {import('./compute-stack-trace.js').StackInfo} StackInfo
@@ -125,6 +127,16 @@ export class Aggregate extends AggregateBase {
     }
     return canonicalStackString;
   }
+
+  /**
+   *
+   * @param {Error|UncaughtError} err The error instance to be processed
+   * @param {number} time the relative ms (to origin) timestamp of occurence
+   * @param {boolean=} internal if the error was "caught" and deemed "internal" before reporting to the jserrors feature
+   * @param {object=} customAttributes  any custom attributes to be included in the error payload
+   * @param {boolean=} hasReplay a flag indicating if the error occurred during a replay session
+   * @returns
+   */
   storeError(err, time, internal, customAttributes, hasReplay) {
     if (!err) return;
     // are we in an interaction
@@ -141,6 +153,14 @@ export class Aggregate extends AggregateBase {
       // Again as with previous usage, all falsey values would include the error.
     }
     var stackInfo = computeStackTrace(err);
+    const {
+      shouldSwallow,
+      reason
+    } = evaluateInternalError(stackInfo, internal);
+    if (shouldSwallow) {
+      handle(SUPPORTABILITY_METRIC_CHANNEL, ['Internal/Error/' + reason], undefined, FEATURE_NAMES.metrics, this.ee);
+      return;
+    }
     var canonicalStackString = this.buildCanonicalStackString(stackInfo);
     const params = {
       stackHash: stringHashCode(canonicalStackString),
@@ -179,7 +199,7 @@ export class Aggregate extends AggregateBase {
     }
     params.firstOccurrenceTimestamp = this.observedAt[bucketHash];
     params.timestamp = Math.floor(agentRuntime.timeKeeper.correctRelativeTimestamp(time));
-    var type = internal ? 'ierr' : 'err';
+    var type = 'err';
     var newMetrics = {
       time
     };

package/dist/esm/features/jserrors/aggregate/internal-errors.js

@@ -0,0 +1,36 @@
+const REASON_RRWEB = 'Rrweb';
+const REASON_SECURITY_POLICY = 'Security-Policy';
+/**
+ * This function is responsible for determining if an error should be swallowed or not.
+ * @param {Object} stackInfo - The error stack information.
+ * @returns {boolean} - Whether the error should be swallowed or not.
+ */
+export function evaluateInternalError(stackInfo, internal) {
+  const output = {
+    shouldSwallow: internal || false,
+    reason: 'Other'
+  };
+  const leadingFrame = stackInfo.frames?.[0];
+  /** If we cant otherwise determine from the frames and message, the default of internal + reason will be the fallback */
+  if (!leadingFrame || typeof stackInfo?.message !== 'string') return output;
+
+  // check if the error happened in expected modules or if messages match known patterns
+  const isNrRecorder = leadingFrame?.url?.match(/nr-(.*)-recorder.min.js/);
+  const isRrweb = leadingFrame?.url?.match(/rrweb/);
+  const isMaybeNrRecorder = leadingFrame?.url?.match(/recorder/);
+  const isSecurityPolicyAPIError = stackInfo.message.toLowerCase().match(/an attempt was made to break through the security policy of the user agent/);
+
+  // check if modules and patterns above fit known swallow cases
+  if (!!isNrRecorder || !!isRrweb) {
+    /** We know -for sure- that the error came from our recorder module or rrweb directly if these are true, so swallow it */
+    output.shouldSwallow = true;
+    output.reason = REASON_RRWEB;
+    if (isSecurityPolicyAPIError) output.reason += '-' + REASON_SECURITY_POLICY;
+  } else if (!!isMaybeNrRecorder && isSecurityPolicyAPIError) {
+    /** We -suspect- that the error came from NR, so if it matches the exact case we know about, swallow it */
+    output.shouldSwallow = true;
+    output.reason = REASON_RRWEB + '-' + REASON_SECURITY_POLICY;
+  }
+  // other swallow conditions could also be added here
+  return output;
+}

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

@@ -78,6 +78,12 @@ export class Aggregate extends AggregateBase {
   }
   prepareHarvest(options = {}) {
     if (this.blocked || !this.bufferedLogs.hasData) return;
+    /** These attributes are evaluated and dropped at ingest processing time and do not get stored on NRDB */
+    const unbilledAttributes = {
+      'instrumentation.provider': 'browser',
+      'instrumentation.version': this.#agentRuntime.version,
+      'instrumentation.name': this.#agentRuntime.loaderType
+    };
     /** see https://source.datanerd.us/agents/rum-specs/blob/main/browser/Log for logging spec */
     const payload = {
       qs: {
@@ -101,7 +107,9 @@ export class Aggregate extends AggregateBase {
             // Application ID from info object,
             standalone: Boolean(this.#agentInfo.sa),
             // copy paste (true) vs APM (false)
-            agentVersion: this.#agentRuntime.version // browser agent version
+            agentVersion: this.#agentRuntime.version,
+            // browser agent version,
+            ...unbilledAttributes
           }
         },
         /** logs section contains individual unique log entries */

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

@@ -60,6 +60,11 @@ export class Aggregate extends AggregateBase {
         // if another page's session entity has expired, or another page has transitioned to off and this one hasn't... we can just abort straight away here
         if (this.sessionId !== sessionState.value || eventType === 'cross-tab' && this.scheduler?.started && sessionState.sessionTraceMode === MODE.OFF) this.abort(2);
       });
+      if (typeof PerformanceNavigationTiming !== 'undefined') {
+        this.traceStorage.storeTiming(globalScope.performance?.getEntriesByType?.('navigation')[0]);
+      } else {
+        this.traceStorage.storeTiming(globalScope.performance?.timing, true);
+      }
     }
 
     /** ST/SR sampling flow in BCS - https://drive.google.com/file/d/19hwt2oft-8Hh4RrjpLqEXfpP_9wYBLcq/view?usp=sharing */
@@ -85,11 +90,6 @@ export class Aggregate extends AggregateBase {
     registerHandler('bstApi', (...args) => this.traceStorage.storeSTN(...args), this.featureName, this.ee);
     registerHandler('trace-jserror', (...args) => this.traceStorage.storeErrorAgg(...args), this.featureName, this.ee);
     registerHandler('pvtAdded', (...args) => this.traceStorage.processPVT(...args), this.featureName, this.ee);
-    if (typeof PerformanceNavigationTiming !== 'undefined') {
-      this.traceStorage.storeTiming(globalScope.performance?.getEntriesByType?.('navigation')[0]);
-    } else {
-      this.traceStorage.storeTiming(globalScope.performance?.timing, true);
-    }
 
     /** Only start actually harvesting if running in full mode at init time */
     if (this.mode === MODE.FULL) this.startHarvesting();else {

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

@@ -27,6 +27,10 @@ const {
   CB_START,
   FN_END
 } = CONSTANTS;
+
+/**
+ * @deprecated This feature has been deprecated, in favor of `soft_navigations`, which is in limited preview. Consider using/importing `SoftNavigations` instead. To gain access to the limited preview, please see https://docs.newrelic.com/docs/browser/single-page-app-monitoring/get-started/browser-spa-v2/ for more information. This feature will be removed in a future release.
+ */
 export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator, auto = true) {

package/dist/esm/loaders/agent-base.js

@@ -171,6 +171,7 @@ export class AgentBase {
    * {@link https://docs.newrelic.com/docs/browser/new-relic-browser/browser-apis/interaction/}
    * @returns {InteractionInstance} An API object that is bound to a specific BrowserInteraction event. Each time this method is called for the same BrowserInteraction, a new object is created, but it still references the same interaction.
    *  - Note: Does not apply to MicroAgent
+   *  - Deprecation Notice: interaction.createTracer is deprecated.  See https://docs.newrelic.com/eol/2024/04/eol-04-24-24-createtracer/ for more information.
   */
   interaction() {
     return this.#callMethod('interaction');

package/dist/esm/loaders/micro-agent.js

@@ -13,7 +13,7 @@ import { FEATURE_NAMES } from './features/features';
 import { warn } from '../common/util/console';
 import { onWindowLoad } from '../common/window/load';
 import { AgentBase } from './agent-base';
-const nonAutoFeatures = [FEATURE_NAMES.jserrors, FEATURE_NAMES.genericEvents, FEATURE_NAMES.metrics];
+const nonAutoFeatures = [FEATURE_NAMES.jserrors, FEATURE_NAMES.genericEvents, FEATURE_NAMES.metrics, FEATURE_NAMES.logging];
 
 /**
  * A minimal agent class designed to only respond to manual user input. As such, this class does not

package/dist/types/features/jserrors/aggregate/index.d.ts

@@ -25,7 +25,16 @@ export class Aggregate extends AggregateBase {
      * @returns {string} A canonical stack string built from the URLs and function names in the given `stackInfo` object.
      */
     buildCanonicalStackString(stackInfo: StackInfo): string;
-    storeError(err: any, time: any, internal: any, customAttributes: any, hasReplay: any): void;
+    /**
+     *
+     * @param {Error|UncaughtError} err The error instance to be processed
+     * @param {number} time the relative ms (to origin) timestamp of occurence
+     * @param {boolean=} internal if the error was "caught" and deemed "internal" before reporting to the jserrors feature
+     * @param {object=} customAttributes  any custom attributes to be included in the error payload
+     * @param {boolean=} hasReplay a flag indicating if the error occurred during a replay session
+     * @returns
+     */
+    storeError(err: Error | UncaughtError, time: number, internal?: boolean | undefined, customAttributes?: object | undefined, hasReplay?: boolean | undefined): void;
     onInteractionDone(interaction: any, wasSaved: any): void;
     onSoftNavNotification(interactionId: any, wasFinished: any, softNavAttrs: any): void;
     #private;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/jserrors/aggregate/index.js"],"names":[],"mappings":"AA2BA;;GAEG;AAEH;IACE,2BAAiC;IACjC,mDAgCC;IA7BC,kBAAuB;IACvB,eAAoB;IACpB,qBAA0B;IAC1B,2BAAgC;IAChC,uCAA4B;IAC5B,qBAAwB;IA0B1B;;;MA2BC;IAED,qCAWC;IAED,8BAEC;IAED,oEAMC;IAED;;;;;;OAMG;IACH,qCAHW,SAAS,GACP,MAAM,CAgBlB;IAED,4FA4FC;IA4BD,yDA6BC;IAED,qFAOC;;CAwBF;wBA1SY,OAAO,0BAA0B,EAAE,SAAS;8BAP3B,4BAA4B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/jserrors/aggregate/index.js"],"names":[],"mappings":"AA6BA;;GAEG;AAEH;IACE,2BAAiC;IACjC,mDAgCC;IA7BC,kBAAuB;IACvB,eAAoB;IACpB,qBAA0B;IAC1B,2BAAgC;IAChC,uCAA4B;IAC5B,qBAAwB;IA0B1B;;;MA2BC;IAED,qCAWC;IAED,8BAEC;IAED,oEAMC;IAED;;;;;;OAMG;IACH,qCAHW,SAAS,GACP,MAAM,CAgBlB;IAED;;;;;;;;OAQG;IACH,gBAPW,KAAK,GAAC,aAAa,QACnB,MAAM,aACN,OAAO,YAAC,qBACR,MAAM,YAAC,cACP,OAAO,YAAC,QAsGlB;IA4BD,yDA6BC;IAED,qFAOC;;CAwBF;wBA1TY,OAAO,0BAA0B,EAAE,SAAS;8BAT3B,4BAA4B"}

package/dist/types/features/jserrors/aggregate/internal-errors.d.ts

@@ -0,0 +1,7 @@
+/**
+ * This function is responsible for determining if an error should be swallowed or not.
+ * @param {Object} stackInfo - The error stack information.
+ * @returns {boolean} - Whether the error should be swallowed or not.
+ */
+export function evaluateInternalError(stackInfo: Object, internal: any): boolean;
+//# sourceMappingURL=internal-errors.d.ts.map

package/dist/types/features/jserrors/aggregate/internal-errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-errors.d.ts","sourceRoot":"","sources":["../../../../../src/features/jserrors/aggregate/internal-errors.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,iDAHW,MAAM,kBACJ,OAAO,CA2BnB"}

package/dist/types/features/logging/aggregate/index.d.ts

@@ -14,6 +14,9 @@ export class Aggregate extends AggregateBase {
             common: {
                 /** Attributes in the `common` section are added to `all` logs generated in the payload */
                 attributes: {
+                    'instrumentation.provider': string;
+                    'instrumentation.version': any;
+                    'instrumentation.name': any;
                     'entity.guid': any;
                     session: any;
                     hasReplay: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/logging/aggregate/index.js"],"names":[],"mappings":"AAiBA;IACE,2BAAiC;IAGjC,mDAwBC;IArBC,+BAA+B;IAC/B,0BAAqC;IAKrC,wBAAmG;IAGjG,4BAKQ;IASZ,+EA6CC;IAED;;;;;;gBASQ,0FAA0F;;;;;;;;;;;;YAY5F,0DAA0D;;;kBAY/D;IAED,qCAGC;;CACF;8BA5H6B,4BAA4B;4BAM9B,0BAA0B;iCAVrB,2CAA2C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/logging/aggregate/index.js"],"names":[],"mappings":"AAiBA;IACE,2BAAiC;IAGjC,mDAwBC;IArBC,+BAA+B;IAC/B,0BAAqC;IAKrC,wBAAmG;IAGjG,4BAKQ;IASZ,+EA6CC;IAED;;;;;;gBAeQ,0FAA0F;;;;;;;;;;;;;;;YAa5F,0DAA0D;;;kBAY/D;IAED,qCAGC;;CACF;8BAnI6B,4BAA4B;4BAM9B,0BAA0B;iCAVrB,2CAA2C"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_trace/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAAiC;IAEjC,mDAmBC;IAjBC,kBAA+C;IAC/C,eAAyC;IAEzC,0FAA0F;IAC1F,wBAAqB;IACrB,wBAA0G;IAC1G,0GAA0G;IAC1G,cAAyB;IACzB,mIAAmI;IACnI,uBAA0B;IAC1B,0CAA0C;IAC1C,oBAAuB;IACvB,wIAAwI;IACxI,2BAA0C;IAM5C,gLAAgL;IAChL,mEAoEC;IA/DG,iCAAuB;IACvB,yJAAyJ;IACzJ,UAAkC;IAClC,eAAuD;IAmBD,UAA4D;IASpH,wCAKQ;IA6BV,kJAAkJ;IAClJ,wBAIC;IAED,iJAAiJ;IACjJ;;;;;;;;;;MA6DC;IAED;;OAEG;IACH,qCAKC;IAED,8DAA8D;IAC9D,qBAUC;IAED,2DAA2D;IAC3D,yBAKC;CACF;8BAhN6B,4BAA4B;6BAC7B,iBAAiB;iCANb,2CAA2C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_trace/aggregate/index.js"],"names":[],"mappings":"AAkBA;IACE,2BAAiC;IAEjC,mDAmBC;IAjBC,kBAA+C;IAC/C,eAAyC;IAEzC,0FAA0F;IAC1F,wBAAqB;IACrB,wBAA0G;IAC1G,0GAA0G;IAC1G,cAAyB;IACzB,mIAAmI;IACnI,uBAA0B;IAC1B,0CAA0C;IAC1C,oBAAuB;IACvB,wIAAwI;IACxI,2BAA0C;IAM5C,gLAAgL;IAChL,mEAoEC;IA/DG,iCAAuB;IACvB,yJAAyJ;IACzJ,UAAkC;IAClC,eAAuD;IAyBD,UAA4D;IASpH,wCAKQ;IAuBV,kJAAkJ;IAClJ,wBAIC;IAED,iJAAiJ;IACjJ;;;;;;;;;;MA6DC;IAED;;OAEG;IACH,qCAKC;IAED,8DAA8D;IAC9D,qBAUC;IAED,2DAA2D;IAC3D,yBAKC;CACF;8BAhN6B,4BAA4B;6BAC7B,iBAAiB;iCANb,2CAA2C"}

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

@@ -1,3 +1,6 @@
+/**
+ * @deprecated This feature has been deprecated, in favor of `soft_navigations`, which is in limited preview. Consider using/importing `SoftNavigations` instead. To gain access to the limited preview, please see https://docs.newrelic.com/docs/browser/single-page-app-monitoring/get-started/browser-spa-v2/ for more information. This feature will be removed in a future release.
+ */
 export class Instrument extends InstrumentBase {
     static featureName: string;
     constructor(agentIdentifier: any, aggregator: any, auto?: boolean);

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/spa/instrument/index.js"],"names":[],"mappings":"AAsBA;IACE,2BAAiC;IACjC,mEAsFC;IAjFG,2CAA0C;;CAwF/C;AAED,oCAA6B;+BAlHE,6BAA6B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/spa/instrument/index.js"],"names":[],"mappings":"AAsBA;;GAEG;AACH;IACE,2BAAiC;IACjC,mEAsFC;IAjFG,2CAA0C;;CAwF/C;AAED,oCAA6B;+BArHE,6BAA6B"}

package/dist/types/loaders/agent-base.d.ts

@@ -118,6 +118,7 @@ export class AgentBase {
      * {@link https://docs.newrelic.com/docs/browser/new-relic-browser/browser-apis/interaction/}
      * @returns {InteractionInstance} An API object that is bound to a specific BrowserInteraction event. Each time this method is called for the same BrowserInteraction, a new object is created, but it still references the same interaction.
      *  - Note: Does not apply to MicroAgent
+     *  - Deprecation Notice: interaction.createTracer is deprecated.  See https://docs.newrelic.com/eol/2024/04/eol-04-24-24-createtracer/ for more information.
     */
     interaction(): InteractionInstance;
     /**

package/dist/types/loaders/agent-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-base.d.ts","sourceRoot":"","sources":["../../../src/loaders/agent-base.js"],"names":[],"mappings":"AAMA;;GAEG;AAEH;IAGE,sCAEC;IAJD,wBAAe;IAgBf;;;;;OAKG;IACH,oBAHW,MAAM,wCAKhB;IAED;;;;;OAKG;IACH,sBAHW,MAAM,kCAKhB;IAED;;;;;;OAMG;IACH,yBAJW,MAAM,SACN,MAAM,GAAC,MAAM,GAAC,OAAO,GAAC,IAAI,sCAKpC;IAED;;;;;OAKG;IACH,mBAHW,KAAK,GAAC,MAAM,8CAKtB;IAED;;;;OAIG;IACH,iBAFW,MAAM,GAAC,IAAI,OAIrB;IAED;;;;;;;OAOG;IACH,6BAJW,MAAM,GAAC,IAAI,OAMrB;IAED;;;;OAIG;IACH,0BAFW,CAAC,KAAK,EAAE,KAAK,GAAC,MAAM,KAAK,OAAO,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,OAI9D;IAED;;;;OAIG;IACH,8CAEC;IAED;;;;;OAKG;IACH,iBAHW,MAAM,MACN,MAAM,OAIhB;IAED;;;;OAIG;IACH,yDAEC;IAED;;;;OAIG;IACH,oBAEC;IAED;;;;;OAKG;IACH,mBAEC;IAED;;;;;;;;;;OAUG;IACH,6BARW;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,OAUrF;IAED;;;;;OAKG;IACH,0BAHW,MAAM,OAKhB;IAED;;;;;MAKE;IACF,eAHa,mBAAmB,CAK/B;IAED;;;;;MAKE;IACF,aAHW,MAAM;2BACc,MAAM;gBAAU,OAAO,GAAC,OAAO,GAAC,OAAO,GAAC,MAAM,GAAC,MAAM;wBAInF;IAED;;;;;;MAME;IACF,mBAJW,MAAM,gBACN,MAAM;2BACc,MAAM;gBAAU,OAAO,GAAC,OAAO,GAAC,OAAO,GAAC,MAAM,GAAC,MAAM;wBAInF;;CACF;kCAjMY,OAAO,yBAAyB,EAAE,mBAAmB"}
+{"version":3,"file":"agent-base.d.ts","sourceRoot":"","sources":["../../../src/loaders/agent-base.js"],"names":[],"mappings":"AAMA;;GAEG;AAEH;IAGE,sCAEC;IAJD,wBAAe;IAgBf;;;;;OAKG;IACH,oBAHW,MAAM,wCAKhB;IAED;;;;;OAKG;IACH,sBAHW,MAAM,kCAKhB;IAED;;;;;;OAMG;IACH,yBAJW,MAAM,SACN,MAAM,GAAC,MAAM,GAAC,OAAO,GAAC,IAAI,sCAKpC;IAED;;;;;OAKG;IACH,mBAHW,KAAK,GAAC,MAAM,8CAKtB;IAED;;;;OAIG;IACH,iBAFW,MAAM,GAAC,IAAI,OAIrB;IAED;;;;;;;OAOG;IACH,6BAJW,MAAM,GAAC,IAAI,OAMrB;IAED;;;;OAIG;IACH,0BAFW,CAAC,KAAK,EAAE,KAAK,GAAC,MAAM,KAAK,OAAO,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,OAI9D;IAED;;;;OAIG;IACH,8CAEC;IAED;;;;;OAKG;IACH,iBAHW,MAAM,MACN,MAAM,OAIhB;IAED;;;;OAIG;IACH,yDAEC;IAED;;;;OAIG;IACH,oBAEC;IAED;;;;;OAKG;IACH,mBAEC;IAED;;;;;;;;;;OAUG;IACH,6BARW;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC,OAUrF;IAED;;;;;OAKG;IACH,0BAHW,MAAM,OAKhB;IAED;;;;;;MAME;IACF,eAJa,mBAAmB,CAM/B;IAED;;;;;MAKE;IACF,aAHW,MAAM;2BACc,MAAM;gBAAU,OAAO,GAAC,OAAO,GAAC,OAAO,GAAC,MAAM,GAAC,MAAM;wBAInF;IAED;;;;;;MAME;IACF,mBAJW,MAAM,gBACN,MAAM;2BACc,MAAM;gBAAU,OAAO,GAAC,OAAO,GAAC,OAAO,GAAC,MAAM,GAAC,MAAM;wBAInF;;CACF;kCAlMY,OAAO,yBAAyB,EAAE,mBAAmB"}

package/dist/types/loaders/micro-agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"micro-agent.d.ts","sourceRoot":"","sources":["../../../src/loaders/micro-agent.js"],"names":[],"mappings":"AAsBA;;;;GAIG;AACH;IACE;;;OAGG;IACH,qBAHW,MAAM,oBACN,MAAM,YAAC,EAmBjB;IAdC,6BAAiF;IACjF,aAAkB;IAMlB;;;;OAIG;IACH,yCAA2C;IAI7C;;;;;MAOC;IAED,mCAyCC;CACF;0BAxFyB,cAAc;2BATb,gCAAgC"}
+{"version":3,"file":"micro-agent.d.ts","sourceRoot":"","sources":["../../../src/loaders/micro-agent.js"],"names":[],"mappings":"AAuBA;;;;GAIG;AACH;IACE;;;OAGG;IACH,qBAHW,MAAM,oBACN,MAAM,YAAC,EAmBjB;IAdC,6BAAiF;IACjF,aAAkB;IAMlB;;;;OAIG;IACH,yCAA2C;IAI7C;;;;;MAOC;IAED,mCAyCC;CACF;0BAzFyB,cAAc;2BATb,gCAAgC"}

package/package.json

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

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

@@ -24,6 +24,8 @@ import { getNREUMInitializedAgent } from '../../../common/window/nreum'
 import { deregisterDrain } from '../../../common/drain/drain'
 import { now } from '../../../common/timing/now'
 import { applyFnToProps } from '../../../common/util/traverse'
+import { evaluateInternalError } from './internal-errors'
+import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 
 /**
  * @typedef {import('./compute-stack-trace.js').StackInfo} StackInfo
@@ -142,6 +144,15 @@ export class Aggregate extends AggregateBase {
     return canonicalStackString
   }
 
+  /**
+   *
+   * @param {Error|UncaughtError} err The error instance to be processed
+   * @param {number} time the relative ms (to origin) timestamp of occurence
+   * @param {boolean=} internal if the error was "caught" and deemed "internal" before reporting to the jserrors feature
+   * @param {object=} customAttributes  any custom attributes to be included in the error payload
+   * @param {boolean=} hasReplay a flag indicating if the error occurred during a replay session
+   * @returns
+   */
   storeError (err, time, internal, customAttributes, hasReplay) {
     if (!err) return
     // are we in an interaction
@@ -160,6 +171,13 @@ export class Aggregate extends AggregateBase {
     }
 
     var stackInfo = computeStackTrace(err)
+
+    const { shouldSwallow, reason } = evaluateInternalError(stackInfo, internal)
+    if (shouldSwallow) {
+      handle(SUPPORTABILITY_METRIC_CHANNEL, ['Internal/Error/' + reason], undefined, FEATURE_NAMES.metrics, this.ee)
+      return
+    }
+
     var canonicalStackString = this.buildCanonicalStackString(stackInfo)
 
     const params = {
@@ -203,7 +221,7 @@ export class Aggregate extends AggregateBase {
     params.firstOccurrenceTimestamp = this.observedAt[bucketHash]
     params.timestamp = Math.floor(agentRuntime.timeKeeper.correctRelativeTimestamp(time))
 
-    var type = internal ? 'ierr' : 'err'
+    var type = 'err'
     var newMetrics = { time }
 
     // Trace sends the error in its payload, and both trace & replay simply listens for any error to occur.

package/src/features/jserrors/aggregate/internal-errors.js

@@ -0,0 +1,33 @@
+const REASON_RRWEB = 'Rrweb'
+const REASON_SECURITY_POLICY = 'Security-Policy'
+/**
+ * This function is responsible for determining if an error should be swallowed or not.
+ * @param {Object} stackInfo - The error stack information.
+ * @returns {boolean} - Whether the error should be swallowed or not.
+ */
+export function evaluateInternalError (stackInfo, internal) {
+  const output = { shouldSwallow: internal || false, reason: 'Other' }
+  const leadingFrame = stackInfo.frames?.[0]
+  /** If we cant otherwise determine from the frames and message, the default of internal + reason will be the fallback */
+  if (!leadingFrame || typeof stackInfo?.message !== 'string') return output
+
+  // check if the error happened in expected modules or if messages match known patterns
+  const isNrRecorder = leadingFrame?.url?.match(/nr-(.*)-recorder.min.js/)
+  const isRrweb = leadingFrame?.url?.match(/rrweb/)
+  const isMaybeNrRecorder = leadingFrame?.url?.match(/recorder/)
+  const isSecurityPolicyAPIError = stackInfo.message.toLowerCase().match(/an attempt was made to break through the security policy of the user agent/)
+
+  // check if modules and patterns above fit known swallow cases
+  if (!!isNrRecorder || !!isRrweb) {
+    /** We know -for sure- that the error came from our recorder module or rrweb directly if these are true, so swallow it */
+    output.shouldSwallow = true
+    output.reason = REASON_RRWEB
+    if (isSecurityPolicyAPIError) output.reason += '-' + REASON_SECURITY_POLICY
+  } else if (!!isMaybeNrRecorder && isSecurityPolicyAPIError) {
+    /** We -suspect- that the error came from NR, so if it matches the exact case we know about, swallow it */
+    output.shouldSwallow = true
+    output.reason = REASON_RRWEB + '-' + REASON_SECURITY_POLICY
+  }
+  // other swallow conditions could also be added here
+  return output
+}

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

@@ -94,6 +94,12 @@ export class Aggregate extends AggregateBase {
 
   prepareHarvest (options = {}) {
     if (this.blocked || !this.bufferedLogs.hasData) return
+    /** These attributes are evaluated and dropped at ingest processing time and do not get stored on NRDB */
+    const unbilledAttributes = {
+      'instrumentation.provider': 'browser',
+      'instrumentation.version': this.#agentRuntime.version,
+      'instrumentation.name': this.#agentRuntime.loaderType
+    }
     /** see https://source.datanerd.us/agents/rum-specs/blob/main/browser/Log for logging spec */
     const payload = {
       qs: {
@@ -110,7 +116,8 @@ export class Aggregate extends AggregateBase {
             ptid: this.#agentRuntime.ptid, // page trace id
             appId: this.#agentInfo.applicationID, // Application ID from info object,
             standalone: Boolean(this.#agentInfo.sa), // copy paste (true) vs APM (false)
-            agentVersion: this.#agentRuntime.version // browser agent version
+            agentVersion: this.#agentRuntime.version, // browser agent version,
+            ...unbilledAttributes
           }
         },
         /** logs section contains individual unique log entries */

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

@@ -64,6 +64,12 @@ export class Aggregate extends AggregateBase {
         // if another page's session entity has expired, or another page has transitioned to off and this one hasn't... we can just abort straight away here
         if (this.sessionId !== sessionState.value || (eventType === 'cross-tab' && this.scheduler?.started && sessionState.sessionTraceMode === MODE.OFF)) this.abort(2)
       })
+
+      if (typeof PerformanceNavigationTiming !== 'undefined') {
+        this.traceStorage.storeTiming(globalScope.performance?.getEntriesByType?.('navigation')[0])
+      } else {
+        this.traceStorage.storeTiming(globalScope.performance?.timing, true)
+      }
     }
 
     /** ST/SR sampling flow in BCS - https://drive.google.com/file/d/19hwt2oft-8Hh4RrjpLqEXfpP_9wYBLcq/view?usp=sharing */
@@ -93,12 +99,6 @@ export class Aggregate extends AggregateBase {
     registerHandler('trace-jserror', (...args) => this.traceStorage.storeErrorAgg(...args), this.featureName, this.ee)
     registerHandler('pvtAdded', (...args) => this.traceStorage.processPVT(...args), this.featureName, this.ee)
 
-    if (typeof PerformanceNavigationTiming !== 'undefined') {
-      this.traceStorage.storeTiming(globalScope.performance?.getEntriesByType?.('navigation')[0])
-    } else {
-      this.traceStorage.storeTiming(globalScope.performance?.timing, true)
-    }
-
     /** Only start actually harvesting if running in full mode at init time */
     if (this.mode === MODE.FULL) this.startHarvesting()
     else {

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

@@ -20,6 +20,9 @@ const {
   FEATURE_NAME, START, END, BODY, CB_END, JS_TIME, FETCH, FN_START, CB_START, FN_END
 } = CONSTANTS
 
+/**
+ * @deprecated This feature has been deprecated, in favor of `soft_navigations`, which is in limited preview. Consider using/importing `SoftNavigations` instead. To gain access to the limited preview, please see https://docs.newrelic.com/docs/browser/single-page-app-monitoring/get-started/browser-spa-v2/ for more information. This feature will be removed in a future release.
+ */
 export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME
   constructor (agentIdentifier, aggregator, auto = true) {

package/src/loaders/agent-base.js

@@ -173,6 +173,7 @@ export class AgentBase {
    * {@link https://docs.newrelic.com/docs/browser/new-relic-browser/browser-apis/interaction/}
    * @returns {InteractionInstance} An API object that is bound to a specific BrowserInteraction event. Each time this method is called for the same BrowserInteraction, a new object is created, but it still references the same interaction.
    *  - Note: Does not apply to MicroAgent
+   *  - Deprecation Notice: interaction.createTracer is deprecated.  See https://docs.newrelic.com/eol/2024/04/eol-04-24-24-createtracer/ for more information.
   */
   interaction () {
     return this.#callMethod('interaction')

package/src/loaders/micro-agent.js

@@ -17,7 +17,8 @@ import { AgentBase } from './agent-base'
 const nonAutoFeatures = [
   FEATURE_NAMES.jserrors,
   FEATURE_NAMES.genericEvents,
-  FEATURE_NAMES.metrics
+  FEATURE_NAMES.metrics,
+  FEATURE_NAMES.logging
 ]
 
 /**