@newrelic/browser-agent 1.263.0 → 1.265.0

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

@@ -12,15 +12,17 @@ var _registerHandler = require("../../../common/event-emitter/register-handler")
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _stringify = require("../../../common/util/stringify");
 var _handle = require("../../../common/event-emitter/handle");
-var _mapOwn = require("../../../common/util/map-own");
-var _config = require("../../../common/config/config");
-var _runtime = require("../../../common/constants/runtime");
+var _info = require("../../../common/config/info");
+var _init = require("../../../common/config/init");
+var _runtime = require("../../../common/config/runtime");
+var _runtime2 = require("../../../common/constants/runtime");
 var _constants = require("../constants");
 var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _nreum = require("../../../common/window/nreum");
 var _drain = require("../../../common/drain/drain");
 var _now = require("../../../common/timing/now");
+var _traverse = require("../../../common/util/traverse");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -33,9 +35,7 @@ var _now = require("../../../common/timing/now");
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
-    var _this;
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
-    _this = this;
     this.stackReported = {};
     this.observedAt = {};
     this.pageviewReported = {};
@@ -45,28 +45,19 @@ class Aggregate extends _aggregateBase.AggregateBase {
 
     // this will need to change to match whatever ee we use in the instrument
     this.ee.on('interactionDone', (interaction, wasSaved) => this.onInteractionDone(interaction, wasSaved));
-    (0, _registerHandler.registerHandler)('err', function () {
-      return _this.storeError(...arguments);
-    }, this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('ierr', function () {
-      return _this.storeError(...arguments);
-    }, this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('err', (...args) => this.storeError(...args), this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('ierr', (...args) => this.storeError(...args), this.featureName, this.ee);
     (0, _registerHandler.registerHandler)('softNavFlush', (interactionId, wasFinished, softNavAttrs) => this.onSoftNavNotification(interactionId, wasFinished, softNavAttrs), this.featureName, this.ee); // when an ixn is done or cancelled
 
-    const harvestTimeSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'jserrors.harvestTimeSeconds') || 10;
+    const harvestTimeSeconds = (0, _init.getConfigurationValue)(this.agentIdentifier, 'jserrors.harvestTimeSeconds') || 10;
 
     // 0 == off, 1 == on
-    this.waitForFlags(['err']).then(_ref => {
-      let [errFlag] = _ref;
+    this.waitForFlags(['err']).then(([errFlag]) => {
       if (errFlag) {
         const scheduler = new _harvestScheduler.HarvestScheduler('jserrors', {
-          onFinished: function () {
-            return _this.onHarvestFinished(...arguments);
-          }
+          onFinished: (...args) => this.onHarvestFinished(...args)
         }, this);
-        scheduler.harvest.on('jserrors', function () {
-          return _this.onHarvestStarted(...arguments);
-        });
+        scheduler.harvest.on('jserrors', (...args) => this.onHarvestStarted(...args));
         scheduler.startTimer(harvestTimeSeconds);
         this.drain();
       } else {
@@ -77,7 +68,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
   onHarvestStarted(options) {
     // this gets rid of dependency in AJAX module
-    var body = this.aggregator.take(['err', 'ierr', 'xhr']);
+    var body = (0, _traverse.applyFnToProps)(this.aggregator.take(['err', 'ierr', 'xhr']), this.obfuscator.obfuscateString.bind(this.obfuscator), 'string');
     if (options.retry) {
       this.currentBody = body;
     }
@@ -85,7 +76,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       body,
       qs: {}
     };
-    var releaseIds = (0, _stringify.stringify)((0, _config.getRuntime)(this.agentIdentifier).releaseIds);
+    var releaseIds = (0, _stringify.stringify)((0, _runtime.getRuntime)(this.agentIdentifier).releaseIds);
     if (releaseIds !== '{}') {
       payload.qs.ri = releaseIds;
     }
@@ -100,7 +91,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
   }
   onHarvestFinished(result) {
     if (result.retry && this.currentBody) {
-      (0, _mapOwn.mapOwn)(this.currentBody, (key, value) => {
+      Object.entries(this.currentBody || {}).forEach(([key, value]) => {
         for (var i = 0; i < value.length; i++) {
           var bucket = value[i];
           var name = this.getBucketName(key, bucket.params, bucket.custom);
@@ -143,7 +134,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (!err) return;
     // are we in an interaction
     time = time || (0, _now.now)();
-    const agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
+    const agentRuntime = (0, _runtime.getRuntime)(this.agentIdentifier);
     let filterOutput;
     if (!internal && agentRuntime.onerror) {
       filterOutput = agentRuntime.onerror(err);
@@ -159,7 +150,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     const params = {
       stackHash: (0, _stringHashCode.stringHashCode)(canonicalStackString),
       exceptionClass: stackInfo.name,
-      request_uri: _runtime.globalScope?.location.pathname
+      request_uri: _runtime2.globalScope?.location.pathname
     };
     if (stackInfo.message) params.message = '' + stackInfo.message;
     // Notice if filterOutput isn't false|undefined OR our specified object, this func would've returned already (so it's unnecessary to req-check group).
@@ -176,7 +167,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     if (!this.stackReported[bucketHash]) {
       this.stackReported[bucketHash] = true;
       params.stack_trace = (0, _formatStackTrace.truncateSize)(stackInfo.stackString);
-      this.observedAt[bucketHash] = agentRuntime.timeKeeper.convertRelativeTimestamp(time);
+      this.observedAt[bucketHash] = Math.floor(agentRuntime.timeKeeper.correctAbsoluteTimestamp(agentRuntime.timeKeeper.convertRelativeTimestamp(time)));
     } else {
       params.browser_stack_hash = (0, _stringHashCode.stringHashCode)(stackInfo.stackString);
     }
@@ -192,7 +183,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.pageviewReported[bucketHash] = true;
     }
     params.firstOccurrenceTimestamp = this.observedAt[bucketHash];
-    params.timestamp = agentRuntime.timeKeeper.convertRelativeTimestamp(time);
+    params.timestamp = Math.floor(agentRuntime.timeKeeper.correctAbsoluteTimestamp(agentRuntime.timeKeeper.convertRelativeTimestamp(time)));
     var type = internal ? 'ierr' : 'err';
     var newMetrics = {
       time
@@ -225,30 +216,20 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.#storeJserrorForHarvest(jsErrorEvent, params.browserInteractionId !== undefined, params._softNavAttributes);
     }
   }
-  #storeJserrorForHarvest(errorInfoArr, softNavOccurredFinished) {
-    let softNavCustomAttrs = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  #storeJserrorForHarvest(errorInfoArr, softNavOccurredFinished, softNavCustomAttrs = {}) {
     let [type, bucketHash, params, newMetrics, localAttrs] = errorInfoArr;
     const allCustomAttrs = {};
     if (softNavOccurredFinished) {
-      Object.entries(softNavCustomAttrs).forEach(_ref2 => {
-        let [k, v] = _ref2;
-        return setCustom(k, v);
-      }); // when an ixn finishes, it'll include stuff in jsAttributes + attrs specific to the ixn
+      Object.entries(softNavCustomAttrs).forEach(([k, v]) => setCustom(k, v)); // when an ixn finishes, it'll include stuff in jsAttributes + attrs specific to the ixn
       bucketHash += params.browserInteractionId;
       delete params._softNavAttributes; // cleanup temp properties from synchronous evaluation; this is harmless when async from soft nav (properties DNE)
       delete params._softNavFinished;
     } else {
       // interaction was cancelled -> error should not be associated OR there was no interaction
-      Object.entries((0, _config.getInfo)(this.agentIdentifier).jsAttributes).forEach(_ref3 => {
-        let [k, v] = _ref3;
-        return setCustom(k, v);
-      });
+      Object.entries((0, _info.getInfo)(this.agentIdentifier).jsAttributes).forEach(([k, v]) => setCustom(k, v));
       delete params.browserInteractionId;
     }
-    if (localAttrs) Object.entries(localAttrs).forEach(_ref4 => {
-      let [k, v] = _ref4;
-      return setCustom(k, v);
-    }); // local custom attrs are applied in either case with the highest precedence
+    if (localAttrs) Object.entries(localAttrs).forEach(([k, v]) => setCustom(k, v)); // local custom attrs are applied in either case with the highest precedence
 
     const jsAttributesHash = (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(allCustomAttrs));
     const aggregateHash = bucketHash + ':' + jsAttributesHash;
@@ -264,8 +245,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.bufferedErrorsUnderSpa[interaction.id].forEach(item => {
       var allCustomAttrs = {};
       const localCustomAttrs = item[4];
-      (0, _mapOwn.mapOwn)(interaction.root.attrs.custom, setCustom); // tack on custom attrs from the interaction
-      (0, _mapOwn.mapOwn)(localCustomAttrs, setCustom);
+      Object.entries(interaction.root.attrs.custom || {}).forEach(setCustom); // tack on custom attrs from the interaction
+      Object.entries(localCustomAttrs || {}).forEach(setCustom);
       var params = item[2];
       if (wasSaved) {
         params.browserInteractionId = interaction.root.attrs.id;
@@ -277,7 +258,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       var jsAttributesHash = (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(allCustomAttrs));
       var aggregateHash = hash + ':' + jsAttributesHash;
       this.aggregator.store(item[0], aggregateHash, params, item[3], allCustomAttrs);
-      function setCustom(key, val) {
+      function setCustom([key, val]) {
         allCustomAttrs[key] = val && typeof val === 'object' ? (0, _stringify.stringify)(val) : val;
       }
     });

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Instrument = void 0;
+exports.JSErrors = exports.Instrument = void 0;
 var _handle = require("../../../common/event-emitter/handle");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
@@ -20,8 +20,7 @@ var _castError = require("../shared/cast-error");
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
   #replayRunning = false;
-  constructor(agentIdentifier, aggregator) {
-    let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  constructor(agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
     try {
       // this try-catch can be removed when IE11 is completely unsupported & gone
@@ -54,4 +53,5 @@ class Instrument extends _instrumentBase.InstrumentBase {
     this.abortHandler = undefined; // weakly allow this abort op to run only once
   }
 }
-exports.Instrument = Instrument;
+exports.Instrument = Instrument;
+const JSErrors = exports.JSErrors = Instrument;

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Aggregate = void 0;
-var _config = require("../../../common/config/config");
+var _info = require("../../../common/config/info");
+var _init = require("../../../common/config/init");
+var _runtime = require("../../../common/config/runtime");
 var _handle = require("../../../common/event-emitter/handle");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
@@ -15,6 +17,9 @@ var _aggregateBase = require("../../utils/aggregate-base");
 var _constants2 = require("../constants");
 var _log = require("../shared/log");
 var _utils = require("../shared/utils");
+var _traverse = require("../../../common/util/traverse");
+var _agentConstants = require("../../../common/constants/agent-constants");
+var _eventBuffer = require("../../utils/event-buffer");
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants2.FEATURE_NAME;
   #agentRuntime;
@@ -23,14 +28,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
     super(agentIdentifier, aggregator, _constants2.FEATURE_NAME);
 
     /** held logs before sending */
-    this.bufferedLogs = [];
-    /** held logs during sending, for retries */
-    this.outgoingLogs = [];
-    /** the estimated bytes of log data waiting to be sent -- triggers a harvest if adding a new log will exceed limit  */
-    this.estimatedBytes = 0;
-    this.#agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
-    this.#agentInfo = (0, _config.getInfo)(this.agentIdentifier);
-    this.harvestTimeSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'logging.harvestTimeSeconds');
+    this.bufferedLogs = new _eventBuffer.EventBuffer();
+    this.#agentRuntime = (0, _runtime.getRuntime)(this.agentIdentifier);
+    this.#agentInfo = (0, _info.getInfo)(this.agentIdentifier);
+    this.harvestTimeSeconds = (0, _init.getConfigurationValue)(this.agentIdentifier, 'logging.harvestTimeSeconds');
     this.waitForFlags([]).then(() => {
       this.scheduler = new _harvestScheduler.HarvestScheduler('browser/logs', {
         onFinished: this.onHarvestFinished.bind(this),
@@ -38,16 +39,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
         getPayload: this.prepareHarvest.bind(this),
         raw: true
       }, this);
-      /** harvest immediately once started to purge pre-load logs collected */
-      this.scheduler.startTimer(this.harvestTimeSeconds, 0);
       /** emitted by instrument class (wrapped loggers) or the api methods directly */
       (0, _registerHandler.registerHandler)(_constants2.LOGGING_EVENT_EMITTER_CHANNEL, this.handleLog.bind(this), this.featureName, this.ee);
       this.drain();
+      /** harvest immediately once started to purge pre-load logs collected */
+      this.scheduler.startTimer(this.harvestTimeSeconds, 0);
     });
   }
-  handleLog(timestamp, message) {
-    let attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    let level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _constants2.LOG_LEVELS.INFO;
+  handleLog(timestamp, message, attributes = {}, level = _constants2.LOG_LEVELS.INFO) {
     if (this.blocked) return;
     if (!attributes || typeof attributes !== 'object') attributes = {};
     if (typeof level === 'string') level = level.toUpperCase();
@@ -67,30 +66,26 @@ class Aggregate extends _aggregateBase.AggregateBase {
       return;
     }
     if (typeof message !== 'string' || !message) return (0, _console.warn)(32);
-    if (message.length > _constants2.MAX_PAYLOAD_SIZE) {
-      (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', message.length]);
-      return (0, _console.warn)(31, message.slice(0, 25) + '...');
-    }
-    const log = new _log.Log(this.#agentRuntime.timeKeeper.convertRelativeTimestamp(timestamp), message, attributes, level);
+    const log = new _log.Log(Math.floor(this.#agentRuntime.timeKeeper.correctAbsoluteTimestamp(this.#agentRuntime.timeKeeper.convertRelativeTimestamp(timestamp))), message, attributes, level);
     const logBytes = log.message.length + (0, _stringify.stringify)(log.attributes).length + log.level.length + 10; // timestamp == 10 chars
-    if (logBytes > _constants2.MAX_PAYLOAD_SIZE) {
-      (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', logBytes]);
-      return (0, _console.warn)(31, log.message.slice(0, 25) + '...');
-    }
-    if (this.estimatedBytes + logBytes >= _constants2.MAX_PAYLOAD_SIZE) {
-      (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Early/Seen', this.estimatedBytes + logBytes]);
-      this.scheduler.runHarvest({});
+
+    if (!this.bufferedLogs.canMerge(logBytes)) {
+      if (this.bufferedLogs.hasData) {
+        (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Early/Seen', this.bufferedLogs.bytes + logBytes]);
+        this.scheduler.runHarvest({});
+        if (logBytes < _agentConstants.MAX_PAYLOAD_SIZE) this.bufferedLogs.add(log);
+      } else {
+        (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', logBytes]);
+        (0, _console.warn)(31, log.message.slice(0, 25) + '...');
+      }
+      return;
     }
-    this.estimatedBytes += logBytes;
-    this.bufferedLogs.push(log);
+    this.bufferedLogs.add(log);
   }
-  prepareHarvest() {
-    if (this.blocked || !(this.bufferedLogs.length || this.outgoingLogs.length)) return;
-    /** populate outgoing array while also clearing main buffer */
-    this.outgoingLogs.push(...this.bufferedLogs.splice(0));
-    this.estimatedBytes = 0;
+  prepareHarvest(options = {}) {
+    if (this.blocked || !this.bufferedLogs.hasData) return;
     /** see https://source.datanerd.us/agents/rum-specs/blob/main/browser/Log for logging spec */
-    return {
+    const payload = {
       qs: {
         browser_monitoring_key: this.#agentInfo.licenseKey
       },
@@ -116,12 +111,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
           }
         },
         /** logs section contains individual unique log entries */
-        logs: this.outgoingLogs
+        logs: (0, _traverse.applyFnToProps)(this.bufferedLogs.buffer, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string')
       }]
     };
+    if (options.retry) this.bufferedLogs.hold();else this.bufferedLogs.clear();
+    return payload;
   }
   onHarvestFinished(result) {
-    if (!result.retry) this.outgoingLogs = [];
+    if (result.retry) this.bufferedLogs.unhold();else this.bufferedLogs.held.clear();
   }
 }
 exports.Aggregate = Aggregate;

package/dist/cjs/features/logging/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MAX_PAYLOAD_SIZE = exports.LOG_LEVELS = exports.LOGGING_EVENT_EMITTER_CHANNEL = exports.FEATURE_NAME = void 0;
+exports.LOG_LEVELS = exports.LOGGING_EVENT_EMITTER_CHANNEL = exports.FEATURE_NAME = void 0;
 var _features = require("../../loaders/features/features");
 const LOG_LEVELS = exports.LOG_LEVELS = {
   ERROR: 'ERROR',
@@ -13,5 +13,4 @@ const LOG_LEVELS = exports.LOG_LEVELS = {
   TRACE: 'TRACE'
 };
 const LOGGING_EVENT_EMITTER_CHANNEL = exports.LOGGING_EVENT_EMITTER_CHANNEL = 'log';
-const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.logging;
-const MAX_PAYLOAD_SIZE = exports.MAX_PAYLOAD_SIZE = 1000000;
+const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.logging;

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

@@ -3,19 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Instrument = void 0;
+exports.Logging = exports.Instrument = void 0;
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 var _utils = require("../shared/utils");
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
-  constructor(agentIdentifier, aggregator) {
-    let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  constructor(agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
     const instanceEE = this.ee;
     /** emitted by wrap-logger function */
-    this.ee.on('wrap-logger-end', function handleLog(_ref) {
-      let [message] = _ref;
+    this.ee.on('wrap-logger-end', function handleLog([message]) {
       const {
         level,
         customAttributes
@@ -25,4 +23,5 @@ class Instrument extends _instrumentBase.InstrumentBase {
     this.importAggregator();
   }
 }
-exports.Instrument = Instrument;
+exports.Instrument = Instrument;
+const Logging = exports.Logging = Instrument;

package/dist/cjs/features/logging/shared/log.js

@@ -23,9 +23,7 @@ class Log {
    * @param {object} attributes - other log event attributes
    * @param {enum} level - Log level
    */
-  constructor(timestamp, message) {
-    let attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    let level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _constants.LOG_LEVELS.INFO;
+  constructor(timestamp, message, attributes = {}, level = _constants.LOG_LEVELS.INFO) {
     /** @type {long} */
     this.timestamp = timestamp;
     this.message = message;

package/dist/cjs/features/logging/shared/utils.js

@@ -16,9 +16,7 @@ var _constants2 = require("../constants");
    * @param {{[key: string]: *}} customAttributes - The log's custom attributes if any
    * @param {enum} level - the log level enum
    */
-function bufferLog(ee, message) {
-  let customAttributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  let level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _constants2.LOG_LEVELS.INFO;
+function bufferLog(ee, message, customAttributes = {}, level = _constants2.LOG_LEVELS.INFO) {
   (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ["API/logging/".concat(level.toLowerCase(), "/called")], undefined, _features.FEATURE_NAMES.metrics, ee);
   (0, _handle.handle)(_constants2.LOGGING_EVENT_EMITTER_CHANNEL, [(0, _now.now)(), message, customAttributes, level], undefined, _features.FEATURE_NAMES.logging, ee);
 }
@@ -30,5 +28,5 @@ function bufferLog(ee, message) {
  */
 function isValidLogLevel(level) {
   if (typeof level !== 'string') return false;
-  return Object.values(_constants2.LOG_LEVELS).some(logLevel => logLevel === level);
+  return Object.values(_constants2.LOG_LEVELS).some(logLevel => logLevel === level.toUpperCase().trim());
 }

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

@@ -4,24 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Aggregate = void 0;
-var _config = require("../../../common/config/config");
+var _init = require("../../../common/config/init");
+var _runtime = require("../../../common/config/runtime");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _constants = require("../constants");
 var _frameworkDetection = require("./framework-detection");
 var _protocol = require("../../../common/url/protocol");
-var _obfuscate = require("../../../common/util/obfuscate");
 var _load = require("../../../common/window/load");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
-var _runtime = require("../../../common/constants/runtime");
+var _runtime2 = require("../../../common/constants/runtime");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _drain = require("../../../common/drain/drain");
+var _wrapWebsocket = require("../../../common/wrap/wrap-websocket");
+var _websocketDetection = require("./websocket-detection");
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
-    this.waitForFlags(['err']).then(_ref => {
-      let [errFlag] = _ref;
+    this.waitForFlags(['err']).then(([errFlag]) => {
       if (errFlag) {
         // *cli, Mar 23 - Per NR-94597, this feature should only harvest ONCE at the (potential) EoL time of the page.
         const scheduler = new _harvestScheduler.HarvestScheduler('jserrors', {
@@ -65,15 +66,15 @@ class Aggregate extends _aggregateBase.AggregateBase {
     const {
       distMethod,
       loaderType
-    } = (0, _config.getRuntime)(this.agentIdentifier);
+    } = (0, _runtime.getRuntime)(this.agentIdentifier);
     const {
       proxy,
       privacy,
       page_view_timing
-    } = (0, _config.getConfiguration)(this.agentIdentifier);
+    } = (0, _init.getConfiguration)(this.agentIdentifier);
     if (loaderType) this.storeSupportabilityMetrics("Generic/LoaderType/".concat(loaderType, "/Detected"));
     if (distMethod) this.storeSupportabilityMetrics("Generic/DistMethod/".concat(distMethod, "/Detected"));
-    if (_runtime.isBrowserScope) {
+    if (_runtime2.isBrowserScope) {
       this.storeSupportabilityMetrics('Generic/Runtime/Browser/Detected');
       const nonce = document?.currentScript?.nonce;
       if (nonce && nonce !== '') {
@@ -88,7 +89,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       });
       if (!privacy.cookies_enabled) this.storeSupportabilityMetrics('Config/SessionTracking/Disabled');
       if (page_view_timing.long_task) this.storeSupportabilityMetrics('Config/LongTask/Enabled');
-    } else if (_runtime.isWorkerScope) {
+    } else if (_runtime2.isWorkerScope) {
       this.storeSupportabilityMetrics('Generic/Runtime/Worker/Detected');
     } else {
       this.storeSupportabilityMetrics('Generic/Runtime/Unknown/Detected');
@@ -101,21 +102,32 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
 
     // Capture SMs to assess customer engagement with the obfuscation config
-    const rules = (0, _obfuscate.getRules)(this.agentIdentifier);
-    if (rules.length > 0) this.storeSupportabilityMetrics('Generic/Obfuscate/Detected');
-    if (rules.length > 0 && !(0, _obfuscate.validateRules)(rules)) this.storeSupportabilityMetrics('Generic/Obfuscate/Invalid');
+    const ruleValidations = this.obfuscator.ruleValidationCache;
+    if (ruleValidations.length > 0) {
+      this.storeSupportabilityMetrics('Generic/Obfuscate/Detected');
+      if (ruleValidations.filter(ruleValidation => !ruleValidation.isValid).length > 0) this.storeSupportabilityMetrics('Generic/Obfuscate/Invalid');
+    }
 
     // Check if proxy for either chunks or beacon is being used
     if (proxy.assets) this.storeSupportabilityMetrics('Config/AssetsUrl/Changed');
     if (proxy.beacon) this.storeSupportabilityMetrics('Config/BeaconUrl/Changed');
-    if (_runtime.isBrowserScope && window.MutationObserver) {
-      this.storeSupportabilityMetrics('Generic/VideoElement/Added', window.document.querySelectorAll('video').length);
+    if (_runtime2.isBrowserScope && window.MutationObserver) {
+      if (window.self !== window.top) {
+        this.storeSupportabilityMetrics('Generic/Runtime/IFrame/Detected');
+      }
+      const preExistingVideos = window.document.querySelectorAll('video').length;
+      if (preExistingVideos) this.storeSupportabilityMetrics('Generic/VideoElement/Added', preExistingVideos);
+      const preExistingIframes = window.document.querySelectorAll('iframe').length;
+      if (preExistingIframes) this.storeSupportabilityMetrics('Generic/IFrame/Added', preExistingIframes);
       const mo = new MutationObserver(records => {
         records.forEach(record => {
           record.addedNodes.forEach(addedNode => {
             if (addedNode instanceof HTMLVideoElement) {
               this.storeSupportabilityMetrics('Generic/VideoElement/Added', 1);
             }
+            if (addedNode instanceof HTMLIFrameElement) {
+              this.storeSupportabilityMetrics('Generic/IFrame/Added', 1);
+            }
           });
         });
       });
@@ -124,9 +136,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
         subtree: true
       });
     }
+    _constants.WATCHABLE_WEB_SOCKET_EVENTS.forEach(tag => {
+      (0, _registerHandler.registerHandler)('buffered-' + _wrapWebsocket.WEBSOCKET_TAG + tag, (...args) => {
+        (0, _websocketDetection.handleWebsocketEvents)(this.storeSupportabilityMetrics.bind(this), tag, ...args);
+      }, this.featureName, this.ee);
+    });
   }
   eachSessionChecks() {
-    if (!_runtime.isBrowserScope) return;
+    if (!_runtime2.isBrowserScope) return;
 
     // [Temporary] Report restores from BFCache to NR1 while feature flag is in place in lieu of sending pageshow events.
     (0, _eventListenerOpts.windowAddEventListener)('pageshow', evt => {
@@ -165,8 +182,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
       if (typeof performance !== 'undefined') {
         const markers = performance.getEntriesByType('mark');
         const measures = performance.getEntriesByType('measure');
-        this.storeSupportabilityMetrics('Generic/Performance/Mark/Seen', markers.length);
-        this.storeSupportabilityMetrics('Generic/Performance/Measure/Seen', measures.length);
+        if (markers.length) this.storeSupportabilityMetrics('Generic/Performance/Mark/Seen', markers.length);
+        if (measures.length) this.storeSupportabilityMetrics('Generic/Performance/Measure/Seen', measures.length);
       }
     } catch (e) {
       // do nothing

package/dist/cjs/features/metrics/aggregate/websocket-detection.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleWebsocketEvents = handleWebsocketEvents;
+var _dataSize = require("../../../common/util/data-size");
+var _text = require("../../../common/util/text");
+var _wrapWebsocket = require("../../../common/wrap/wrap-websocket");
+/**
+ * A SM handler for web socket events, which converts them to a shape suitable for SMs and reports them.
+ * @param {Function} reporter a function that reports data as a supportability metric
+ * @param {string} tag the unique tag to assign to the sm
+ * @param {number} timestamp ms from page origin
+ * @param {number} timeSinceInit ms from class init
+ * @param {boolean} isLoaded whether the even was observed before the page load event
+ * @param {string} socketId a unique id assigned to the observed socket
+ * @param {*} data the data reported alongside the socket event
+ */
+function handleWebsocketEvents(reporter, tag, timestamp, timeSinceInit, isLoaded, socketId, data) {
+  // socketId is unused in the SMs
+  const useDataType = tag === _wrapWebsocket.ADD_EVENT_LISTENER_TAG;
+  let metricTag = (0, _text.toTitleCase)(useDataType ? data.eventType : tag);
+  if (metricTag === 'Close') {
+    if (data?.event.code === 1000 || data?.event.wasClean) metricTag += '-Clean';else metricTag += '-Dirty';
+  }
+  const bytes = metricTag === 'Message' && (0, _dataSize.dataSize)(data?.event?.data) || metricTag === 'Send' && (0, _dataSize.dataSize)(data);
+  reporter(buildSMTag(metricTag, 'Ms'), timestamp);
+  reporter(buildSMTag(metricTag, 'MsSinceClassInit'), timeSinceInit);
+  if (bytes) reporter(buildSMTag(metricTag, 'Bytes'), bytes);
+}
+function buildSMTag(tag, category) {
+  return 'WebSocket/' + tag + '/' + category;
+}

package/dist/cjs/features/metrics/constants.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SUPPORTABILITY_METRIC_CHANNEL = exports.SUPPORTABILITY_METRIC = exports.FEATURE_NAME = exports.CUSTOM_METRIC_CHANNEL = exports.CUSTOM_METRIC = void 0;
+exports.WATCHABLE_WEB_SOCKET_EVENTS = exports.SUPPORTABILITY_METRIC_CHANNEL = exports.SUPPORTABILITY_METRIC = exports.FEATURE_NAME = exports.CUSTOM_METRIC_CHANNEL = exports.CUSTOM_METRIC = void 0;
+var _wrapWebsocket = require("../../common/wrap/wrap-websocket");
 var _features = require("../../loaders/features/features");
 const FEATURE_NAME = exports.FEATURE_NAME = _features.FEATURE_NAMES.metrics;
 const SUPPORTABILITY_METRIC = exports.SUPPORTABILITY_METRIC = 'sm';
 const CUSTOM_METRIC = exports.CUSTOM_METRIC = 'cm';
 const SUPPORTABILITY_METRIC_CHANNEL = exports.SUPPORTABILITY_METRIC_CHANNEL = 'storeSupportabilityMetrics';
-const CUSTOM_METRIC_CHANNEL = exports.CUSTOM_METRIC_CHANNEL = 'storeEventMetrics';
+const CUSTOM_METRIC_CHANNEL = exports.CUSTOM_METRIC_CHANNEL = 'storeEventMetrics';
+const WATCHABLE_WEB_SOCKET_EVENTS = exports.WATCHABLE_WEB_SOCKET_EVENTS = ['new', 'send', 'close', _wrapWebsocket.ADD_EVENT_LISTENER_TAG];

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

@@ -3,15 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Instrument = void 0;
+exports.Metrics = exports.Instrument = void 0;
+var _handle = require("../../../common/event-emitter/handle");
+var _wrapWebsocket = require("../../../common/wrap/wrap-websocket");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
-  constructor(agentIdentifier, aggregator) {
-    let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  constructor(agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME, auto);
+    (0, _wrapWebsocket.wrapWebSocket)(this.ee);
+    _constants.WATCHABLE_WEB_SOCKET_EVENTS.forEach(suffix => {
+      this.ee.on(_wrapWebsocket.WEBSOCKET_TAG + suffix, (...args) => {
+        (0, _handle.handle)('buffered-' + _wrapWebsocket.WEBSOCKET_TAG + suffix, [...args], undefined, this.featureName, this.ee);
+      });
+    });
     this.importAggregator();
   }
 }
-exports.Instrument = Instrument;
+exports.Instrument = Instrument;
+const Metrics = exports.Metrics = Instrument;