@newrelic/browser-agent 1.264.0 → 1.265.1

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");
@@ -18,10 +18,9 @@ var _castError = require("../shared/cast-error");
  */
 
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = (() => _constants.FEATURE_NAME)();
+  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,22 +17,21 @@ 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)();
+  static featureName = _constants2.FEATURE_NAME;
   #agentRuntime;
   #agentInfo;
   constructor(agentIdentifier, aggregator) {
     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;
+  static featureName = _constants.FEATURE_NAME;
+  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,26 @@ 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");
+// import { WEBSOCKET_TAG } from '../../../common/wrap/wrap-websocket'
+// import { handleWebsocketEvents } from './websocket-detection'
+
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = (() => _constants.FEATURE_NAME)();
+  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 +67,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 +90,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 +103,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 +137,15 @@ class Aggregate extends _aggregateBase.AggregateBase {
         subtree: true
       });
     }
+
+    // WATCHABLE_WEB_SOCKET_EVENTS.forEach(tag => {
+    //   registerHandler('buffered-' + WEBSOCKET_TAG + tag, (...args) => {
+    //     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 +184,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

@@ -5,8 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SUPPORTABILITY_METRIC_CHANNEL = exports.SUPPORTABILITY_METRIC = exports.FEATURE_NAME = exports.CUSTOM_METRIC_CHANNEL = exports.CUSTOM_METRIC = void 0;
 var _features = require("../../loaders/features/features");
+// import { ADD_EVENT_LISTENER_TAG } from '../../common/wrap/wrap-websocket'
+
 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';
+
+// export const WATCHABLE_WEB_SOCKET_EVENTS = ['new', 'send', 'close', ADD_EVENT_LISTENER_TAG]

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

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

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Instrument = void 0;
+exports.PageAction = exports.Instrument = void 0;
 var _generic_events = require("../../generic_events");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -14,9 +14,13 @@ var _generic_events = require("../../generic_events");
  * @deprecated This feature has been replaced by Generic Events. Use/Import `GenericEvents` instead. This wrapper will be removed in a future release
  */
 class Instrument extends _generic_events.GenericEvents {
-  constructor(agentIdentifier, aggregator) {
-    let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  constructor(agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, auto);
   }
 }
-exports.Instrument = Instrument;
+
+/**
+ * @deprecated This feature has been replaced by Generic Events. Use/Import `GenericEvents` instead. This wrapper will be removed in a future release
+ */
+exports.Instrument = Instrument;
+const PageAction = exports.PageAction = Instrument;

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

@@ -7,7 +7,8 @@ exports.Aggregate = void 0;
 var _runtime = require("../../../common/constants/runtime");
 var _navTiming = require("../../../common/timing/nav-timing");
 var _stringify = require("../../../common/util/stringify");
-var _config = require("../../../common/config/config");
+var _info = require("../../../common/config/info");
+var _runtime2 = require("../../../common/config/runtime");
 var _harvest = require("../../../common/harvest/harvest");
 var CONSTANTS = _interopRequireWildcard(require("../constants"));
 var _initializedFeatures = require("./initialized-features");
@@ -17,32 +18,28 @@ var _aggregateBase = require("../../utils/aggregate-base");
 var _firstContentfulPaint = require("../../../common/vitals/first-contentful-paint");
 var _firstPaint = require("../../../common/vitals/first-paint");
 var _timeToFirstByte = require("../../../common/vitals/time-to-first-byte");
-var _drain = require("../../../common/drain/drain");
-var _features = require("../../../loaders/features/features");
-var _handle = require("../../../common/event-emitter/handle");
-var _constants2 = require("../../metrics/constants");
 var _now = require("../../../common/timing/now");
 var _timeKeeper = require("../../../common/timing/time-keeper");
+var _traverse = require("../../../common/util/traverse");
 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; }
 class Aggregate extends _aggregateBase.AggregateBase {
-  static featureName = (() => CONSTANTS.FEATURE_NAME)();
+  static featureName = CONSTANTS.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, CONSTANTS.FEATURE_NAME);
     this.timeToFirstByte = 0;
     this.firstByteToWindowLoad = 0; // our "frontend" duration
     this.firstByteToDomContent = 0; // our "dom processing" duration
     this.timeKeeper = new _timeKeeper.TimeKeeper(this.agentIdentifier);
-    if (!(0, _config.isConfigured)(agentIdentifier)) {
+    if (!(0, _info.isValid)(agentIdentifier)) {
       this.ee.abort();
       return (0, _console.warn)(43);
     }
     if (_runtime.isBrowserScope) {
-      _timeToFirstByte.timeToFirstByte.subscribe(_ref => {
-        let {
-          value,
-          attrs
-        } = _ref;
+      _timeToFirstByte.timeToFirstByte.subscribe(({
+        value,
+        attrs
+      }) => {
         const navEntry = attrs.navigationEntry;
         this.timeToFirstByte = Math.max(value, this.timeToFirstByte);
         this.firstByteToWindowLoad = Math.max(Math.round(navEntry.loadEventEnd - this.timeToFirstByte), this.firstByteToWindowLoad); // our "frontend" duration
@@ -56,8 +53,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
   }
   sendRum() {
-    const info = (0, _config.getInfo)(this.agentIdentifier);
-    const agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
+    const info = (0, _info.getInfo)(this.agentIdentifier);
+    const agentRuntime = (0, _runtime2.getRuntime)(this.agentIdentifier);
     const harvester = new _harvest.Harvest(this);
     if (info.queueTime) this.aggregator.store('measures', 'qt', {
       value: info.queueTime
@@ -84,8 +81,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       ac: info.account,
       pr: info.product,
       af: (0, _initializedFeatures.getActivatedFeaturesFlags)(this.agentIdentifier).join(','),
-      ...Object.entries(this.aggregator.get('measures') || {}).reduce((aggregator, _ref2) => {
-        let [metricName, measure] = _ref2;
+      ...Object.entries(this.aggregator.get('measures') || {}).reduce((aggregator, [metricName, measure]) => {
         aggregator[metricName] = measure.params?.value;
         return aggregator;
       }, {}),
@@ -97,9 +93,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
 
     let body;
     if (typeof info.jsAttributes === 'object' && Object.keys(info.jsAttributes).length > 0) {
-      body = {
+      body = (0, _traverse.applyFnToProps)({
         ja: info.jsAttributes
-      };
+      }, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string');
     }
     if (_runtime.globalScope.performance) {
       if (typeof PerformanceNavigationTiming !== 'undefined') {
@@ -122,7 +118,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     queryParameters.fp = _firstPaint.firstPaint.current.value;
     queryParameters.fcp = _firstContentfulPaint.firstContentfulPaint.current.value;
     if (this.timeKeeper?.ready) {
-      queryParameters.timestamp = this.timeKeeper.convertRelativeTimestamp((0, _now.now)());
+      queryParameters.timestamp = Math.floor(this.timeKeeper.correctAbsoluteTimestamp(this.timeKeeper.convertRelativeTimestamp((0, _now.now)())));
     }
     const rumStartTime = (0, _now.now)();
     harvester.send({
@@ -135,12 +131,11 @@ class Aggregate extends _aggregateBase.AggregateBase {
         needResponse: true,
         sendEmptyBody: true
       },
-      cbFinished: _ref3 => {
-        let {
-          status,
-          responseText,
-          xhr
-        } = _ref3;
+      cbFinished: ({
+        status,
+        responseText,
+        xhr
+      }) => {
         const rumEndTime = (0, _now.now)();
         if (status >= 400 || status === 0) {
           // Adding retry logic for the rum call will be a separate change
@@ -151,22 +146,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
           this.timeKeeper.processRumRequest(xhr, rumStartTime, rumEndTime);
           if (!this.timeKeeper.ready) throw new Error('TimeKeeper not ready');
           agentRuntime.timeKeeper = this.timeKeeper;
-
-          // Check if the time diff is such that we need to capture a supportability metric
-          if (this.timeKeeper.localTimeDiff >= 12 * 60 * 60 * 1000) {
-            (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/DiffExceed12Hrs'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
-          } else if (this.timeKeeper.localTimeDiff >= 6 * 60 * 60 * 1000) {
-            (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/DiffExceed6Hrs'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
-          } else if (this.timeKeeper.localTimeDiff >= 60 * 60 * 1000) {
-            (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/DiffExceed1Hrs'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
-          }
         } catch (error) {
-          if (error?.message?.indexOf('invalid format') > 0) {
-            (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/InvalidFormat'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
-          } else {
-            (0, _handle.handle)(_constants2.SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/Failed'], undefined, _features.FEATURE_NAMES.metrics, this.ee);
-          }
-          (0, _drain.drain)(this.agentIdentifier, _features.FEATURE_NAMES.metrics, true);
           this.ee.abort();
           (0, _console.warn)(17, error);
           return;

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

@@ -3,17 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Instrument = void 0;
+exports.PageViewEvent = exports.Instrument = void 0;
 var _instrumentBase = require("../../utils/instrument-base");
 var CONSTANTS = _interopRequireWildcard(require("../constants"));
 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; }
 class Instrument extends _instrumentBase.InstrumentBase {
-  static featureName = (() => CONSTANTS.FEATURE_NAME)();
-  constructor(agentIdentifier, aggregator) {
-    let auto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  static featureName = CONSTANTS.FEATURE_NAME;
+  constructor(agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, CONSTANTS.FEATURE_NAME, auto);
     this.importAggregator();
   }
 }
-exports.Instrument = Instrument;
+exports.Instrument = Instrument;
+const PageViewEvent = exports.PageViewEvent = Instrument;