@newrelic/browser-agent 1.238.0 → 1.239.1

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

@@ -12,7 +12,6 @@ var _config = require("../../../common/config/config");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _denyList = require("../../../common/deny-list/deny-list");
 var _constants = require("../constants");
-var _drain = require("../../../common/drain/drain");
 var _features = require("../../../loaders/features/features");
 var _constants2 = require("../../metrics/constants");
 var _aggregateBase = require("../../utils/aggregate-base");
@@ -29,7 +28,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     const allAjaxIsEnabled = agentInit.ajax.enabled !== false;
     (0, _registerHandler.registerHandler)('xhr', storeXhr, this.featureName, this.ee);
     if (!allAjaxIsEnabled) {
-      (0, _drain.drain)(this.agentIdentifier, this.featureName);
+      this.drain();
       return; // feature will only collect timeslice metrics & ajax trace nodes if it's not fully enabled
     }
 
@@ -71,8 +70,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     ee.on("drain-".concat(this.featureName), () => {
       scheduler.startTimer(harvestTimeSeconds);
     });
-    (0, _drain.drain)(this.agentIdentifier, this.featureName);
-    return;
+    this.drain();
     function storeXhr(params, metrics, startTime, endTime, type) {
       metrics.time = startTime;
 
@@ -104,9 +102,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
         path: params.pathname,
         requestSize: metrics.txSize,
         responseSize: metrics.rxSize,
-        type: type,
-        startTime: startTime,
-        endTime: endTime,
+        type,
+        startTime,
+        endTime,
         callbackDuration: metrics.cbTime
       };
       if (xhrContext.dt) {

package/dist/cjs/features/ajax/instrument/distributed-tracing.js

@@ -22,13 +22,13 @@ class DT {
     if (!this.shouldGenerateTrace(parsedOrigin)) {
       return null;
     }
-    var loader_config = (0, _config.getLoaderConfig)(this.agentIdentifier);
-    if (!loader_config) {
+    var loaderConfig = (0, _config.getLoaderConfig)(this.agentIdentifier);
+    if (!loaderConfig) {
       return null;
     }
-    var accountId = (loader_config.accountID || '').toString() || null;
-    var agentId = (loader_config.agentID || '').toString() || null;
-    var trustKey = (loader_config.trustKey || '').toString() || null;
+    var accountId = (loaderConfig.accountID || '').toString() || null;
+    var agentId = (loaderConfig.agentID || '').toString() || null;
+    var trustKey = (loaderConfig.trustKey || '').toString() || null;
     if (!accountId || !agentId) {
       return null;
     }
@@ -36,9 +36,9 @@ class DT {
     var traceId = (0, _uniqueId.generateTraceId)();
     var timestamp = Date.now();
     var payload = {
-      spanId: spanId,
-      traceId: traceId,
-      timestamp: timestamp
+      spanId,
+      traceId,
+      timestamp
     };
     if (parsedOrigin.sameOrigin || this.isAllowedOrigin(parsedOrigin) && this.useTraceContextHeadersForCors()) {
       payload.traceContextParentHeader = this.generateTraceContextParentHeader(spanId, traceId);

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

@@ -37,6 +37,38 @@ class Instrument extends _instrumentBase.InstrumentBase {
     if (!(0, _config.getRuntime)(agentIdentifier).xhrWrappable) return;
     this.dt = new _distributedTracing.DT(agentIdentifier);
     this.handler = (type, args, ctx, group) => (0, _handle.handle)(type, args, ctx, group, this.ee);
+
+    // this is a best (but imperfect) effort at capturing AJAX calls that may have fired before the agent was instantiated
+    // this could happen because the agent was "improperly" set up (ie, not at the top of the head) or
+    // because it was deferred from loading in some way -- e.g. 'deferred' script loading tags or other lazy-loading techniques
+    //
+    // it is "imperfect" because we cannot capture the following with the API vs wrapping the events directly:
+    // * requestBodySize - (txSize -- request body size)
+    // * method - request type (GET, POST, etc)
+    // * callbackDuration - (cbTime -- sum of resulting callback time)
+    try {
+      const initiators = {
+        xmlhttprequest: 'xhr',
+        fetch: 'fetch',
+        beacon: 'beacon'
+      };
+      _runtime.globalScope?.performance?.getEntriesByType('resource').forEach(resource => {
+        if (resource.initiatorType in initiators && resource.responseStatus !== 0) {
+          const params = {
+            status: resource.responseStatus
+          };
+          const metrics = {
+            rxSize: resource.transferSize,
+            duration: Math.floor(resource.duration),
+            cbTime: 0
+          };
+          addUrl(params, resource.name);
+          this.handler('xhr', [params, metrics, resource.startTime, resource.responseEnd, initiators[resource.initiatorType]], undefined, _features.FEATURE_NAMES.ajax);
+        }
+      });
+    } catch (err) {
+      // do nothing
+    }
     (0, _wrap.wrapFetch)(this.ee);
     (0, _wrap.wrapXhr)(this.ee);
     subscribeToEvents(agentIdentifier, this.ee, this.handler, this.dt);
@@ -97,9 +129,9 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     this.metrics = {};
   }
   function onOpenXhrEnd(args, xhr) {
-    var loader_config = (0, _config.getLoaderConfig)(agentIdentifier);
-    if (loader_config.xpid && this.sameOrigin) {
-      xhr.setRequestHeader('X-NewRelic-ID', loader_config.xpid);
+    var loaderConfig = (0, _config.getLoaderConfig)(agentIdentifier);
+    if (loaderConfig.xpid && this.sameOrigin) {
+      xhr.setRequestHeader('X-NewRelic-ID', loaderConfig.xpid);
     }
     var payload = dt.generateTracePayload(this.parsedOrigin);
     if (payload) {
@@ -281,7 +313,7 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
 
   // we capture failed call as status 0, the actual error is ignored
   // eslint-disable-next-line handle-callback-err
-  function onFetchDone(err, res) {
+  function onFetchDone(_, res) {
     this.endTime = (0, _now.now)();
     if (!this.params) {
       this.params = {};
@@ -322,17 +354,6 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     metrics.cbTime = this.cbTime;
     handler('xhr', [params, metrics, this.startTime, this.endTime, 'xhr'], this, _features.FEATURE_NAMES.ajax);
   }
-  function addUrl(ctx, url) {
-    var parsed = (0, _parseUrl.parseUrl)(url);
-    var params = ctx.params;
-    params.hostname = parsed.hostname;
-    params.port = parsed.port;
-    params.protocol = parsed.protocol;
-    params.host = parsed.hostname + ':' + parsed.port;
-    params.pathname = parsed.pathname;
-    ctx.parsedOrigin = parsed;
-    ctx.sameOrigin = parsed.sameOrigin;
-  }
   function captureXhrData(ctx, xhr) {
     ctx.params.status = xhr.status;
     var size = (0, _responseSize.responseSizeFromXhr)(xhr, ctx.lastSize);
@@ -345,4 +366,15 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     }
     ctx.loadCaptureCalled = true;
   }
+}
+function addUrl(ctx, url) {
+  var parsed = (0, _parseUrl.parseUrl)(url);
+  var params = ctx.params || ctx;
+  params.hostname = parsed.hostname;
+  params.port = parsed.port;
+  params.protocol = parsed.protocol;
+  params.host = parsed.hostname + ':' + parsed.port;
+  params.pathname = parsed.pathname;
+  ctx.parsedOrigin = parsed;
+  ctx.sameOrigin = parsed.sameOrigin;
 }

package/dist/cjs/features/jserrors/aggregate/canonical-function-name.js

@@ -22,5 +22,4 @@ function canonicalFunctionName(functionNameString) {
   if (!functionNameString) return;
   const match = functionNameString.match(canonicalFunctionNameRe);
   if (match) return match[1];
-  return;
 }

package/dist/cjs/features/jserrors/aggregate/compute-stack-trace.js

@@ -69,8 +69,8 @@ var debug = false;
 var classNameRegex = /function (.+?)\s*\(/;
 var chrome = /^\s*at (?:((?:\[object object\])?(?:[^(]*\([^)]*\))*[^()]*(?: \[as \S+\])?) )?\(?((?:file|http|https|chrome-extension):.*?)?:(\d+)(?::(\d+))?\)?\s*$/i;
 var gecko = /^\s*(?:(\S*|global code)(?:\(.*?\))?@)?((?:file|http|https|chrome|safari-extension).*?):(\d+)(?::(\d+))?\s*$/i;
-var chrome_eval = /^\s*at .+ \(eval at \S+ \((?:(?:file|http|https):[^)]+)?\)(?:, [^:]*:\d+:\d+)?\)$/i;
-var ie_eval = /^\s*at Function code \(Function code:\d+:\d+\)\s*/i;
+var chromeEval = /^\s*at .+ \(eval at \S+ \((?:(?:file|http|https):[^)]+)?\)(?:, [^:]*:\d+:\d+)?\)$/i;
+var ieEval = /^\s*at Function code \(Function code:\d+:\d+\)\s*/i;
 
 /**
  * Represents an error with a stack trace.
@@ -204,7 +204,7 @@ function getStackElement(line) {
       column: parts[4] ? +parts[4] : null
     };
   }
-  if (line.match(chrome_eval) || line.match(ie_eval) || line === 'anonymous') {
+  if (line.match(chromeEval) || line.match(ieEval) || line === 'anonymous') {
     return {
       func: 'evaluated code'
     };
@@ -249,7 +249,7 @@ function computeStackTraceBySourceAndLine(ex) {
     mode: 'sourceline',
     name: className,
     message: ex.message,
-    stackString: stackString,
+    stackString,
     frames: [{
       url: canonicalUrl,
       line: ex.line,

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

@@ -17,7 +17,6 @@ var _config = require("../../../common/config/config");
 var _now = require("../../../common/timing/now");
 var _runtime = require("../../../common/constants/runtime");
 var _constants = require("../constants");
-var _drain = require("../../../common/drain/drain");
 var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
 /*
@@ -39,7 +38,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.observedAt = {};
     this.pageviewReported = {};
     this.errorCache = {};
-    this.currentBody;
+    this.currentBody = undefined;
     this.errorOnPage = false;
 
     // this will need to change to match whatever ee we use in the instrument
@@ -73,7 +72,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.blocked = true;
       scheduler.stopTimer(true);
     }, this.featureName, this.ee);
-    (0, _drain.drain)(this.agentIdentifier, this.featureName);
+    this.drain();
   }
   onHarvestStarted(options) {
     // this gets rid of dependency in AJAX module
@@ -82,7 +81,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.currentBody = body;
     }
     var payload = {
-      body: body,
+      body,
       qs: {}
     };
     var releaseIds = (0, _stringify.stringify)((0, _config.getRuntime)(this.agentIdentifier).releaseIds);
@@ -192,7 +191,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     params.firstOccurrenceTimestamp = this.observedAt[bucketHash];
     var type = internal ? 'ierr' : 'err';
     var newMetrics = {
-      time: time
+      time
     };
 
     // sr, stn and spa aggregators listen to this event - stn sends the error in its payload,

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

@@ -7,31 +7,59 @@ exports.getFrameworks = getFrameworks;
 var _runtime = require("../../../common/constants/runtime");
 const FRAMEWORKS = {
   REACT: 'React',
+  NEXTJS: 'NextJS',
+  VUE: 'Vue',
+  NUXTJS: 'NuxtJS',
   ANGULAR: 'Angular',
+  ANGULARUNIVERSAL: 'AngularUniversal',
+  SVELTE: 'Svelte',
+  SVELTEKIT: 'SvelteKit',
+  PREACT: 'Preact',
+  PREACTSSR: 'PreactSSR',
   ANGULARJS: 'AngularJS',
   BACKBONE: 'Backbone',
   EMBER: 'Ember',
-  VUE: 'Vue',
   METEOR: 'Meteor',
   ZEPTO: 'Zepto',
   JQUERY: 'Jquery',
-  MOOTOOLS: 'MooTools'
+  MOOTOOLS: 'MooTools',
+  QWIK: 'Qwik',
+  ELECTRON: 'Electron'
 };
 function getFrameworks() {
   if (!_runtime.isBrowserScope) return []; // don't bother detecting frameworks if not in the main window context
 
   const frameworks = [];
   try {
-    if (detectReact()) frameworks.push(FRAMEWORKS.REACT);
+    if (detectReact()) {
+      frameworks.push(FRAMEWORKS.REACT);
+      if (detectNextJS()) frameworks.push(FRAMEWORKS.NEXTJS);
+    }
+    if (detectVue()) {
+      frameworks.push(FRAMEWORKS.VUE);
+      if (detectNuxtJS()) frameworks.push(FRAMEWORKS.NUXTJS);
+    }
+    if (detectAngular()) {
+      frameworks.push(FRAMEWORKS.ANGULAR);
+      if (detectAngularUniversal()) frameworks.push(FRAMEWORKS.ANGULARUNIVERSAL);
+    }
+    if (detectSvelte()) {
+      frameworks.push(FRAMEWORKS.SVELTE);
+      if (detectSvelteKit()) frameworks.push(FRAMEWORKS.SVELTEKIT);
+    }
+    if (detectPreact()) {
+      frameworks.push(FRAMEWORKS.PREACT);
+      if (detectPreactSSR()) frameworks.push(FRAMEWORKS.PREACTSSR);
+    }
     if (detectAngularJs()) frameworks.push(FRAMEWORKS.ANGULARJS);
-    if (detectAngular()) frameworks.push(FRAMEWORKS.ANGULAR);
     if (Object.prototype.hasOwnProperty.call(window, 'Backbone')) frameworks.push(FRAMEWORKS.BACKBONE);
     if (Object.prototype.hasOwnProperty.call(window, 'Ember')) frameworks.push(FRAMEWORKS.EMBER);
-    if (Object.prototype.hasOwnProperty.call(window, 'Vue')) frameworks.push(FRAMEWORKS.VUE);
     if (Object.prototype.hasOwnProperty.call(window, 'Meteor')) frameworks.push(FRAMEWORKS.METEOR);
     if (Object.prototype.hasOwnProperty.call(window, 'Zepto')) frameworks.push(FRAMEWORKS.ZEPTO);
     if (Object.prototype.hasOwnProperty.call(window, 'jQuery')) frameworks.push(FRAMEWORKS.JQUERY);
     if (Object.prototype.hasOwnProperty.call(window, 'MooTools')) frameworks.push(FRAMEWORKS.MOOTOOLS);
+    if (Object.prototype.hasOwnProperty.call(window, 'qwikevents')) frameworks.push(FRAMEWORKS.QWIK);
+    if (detectElectron()) frameworks.push(FRAMEWORKS.ELECTRON);
   } catch (err) {
     // Possibly not supported
   }
@@ -51,9 +79,25 @@ function detectReact() {
     return false;
   }
 }
-function detectAngularJs() {
+function detectNextJS() {
+  // React SSR
   try {
-    return Object.prototype.hasOwnProperty.call(window, 'angular') || document.querySelector('.ng-binding, [ng-app], [data-ng-app], [ng-controller], [data-ng-controller], [ng-repeat], [data-ng-repeat]') || document.querySelector('script[src*="angular.js"], script[src*="angular.min.js"]');
+    return Object.prototype.hasOwnProperty.call(window, 'next') && Object.prototype.hasOwnProperty.call(window.next, 'version');
+  } catch (err) {
+    return false;
+  }
+}
+function detectVue() {
+  try {
+    return Object.prototype.hasOwnProperty.call(window, 'Vue');
+  } catch (err) {
+    return false;
+  }
+}
+function detectNuxtJS() {
+  // Vue SSR
+  try {
+    return Object.prototype.hasOwnProperty.call(window, '$nuxt') && Object.prototype.hasOwnProperty.call(window.$nuxt, 'nuxt');
   } catch (err) {
     return false;
   }
@@ -64,4 +108,56 @@ function detectAngular() {
   } catch (err) {
     return false;
   }
+}
+function detectAngularUniversal() {
+  // Anguler SSR
+  try {
+    return document.querySelector('[ng-server-context]');
+  } catch (err) {
+    return false;
+  }
+}
+function detectSvelte() {
+  try {
+    return Object.prototype.hasOwnProperty.call(window, '__svelte');
+  } catch (err) {
+    return false;
+  }
+}
+function detectSvelteKit() {
+  // Svelte SSR
+  try {
+    return !!Object.keys(window).find(prop => prop.startsWith('__sveltekit'));
+  } catch (err) {
+    return false;
+  }
+}
+function detectPreact() {
+  try {
+    return Object.prototype.hasOwnProperty.call(window, 'preact');
+  } catch (err) {
+    return false;
+  }
+}
+function detectPreactSSR() {
+  // Svelte SSR
+  try {
+    return document.querySelector('script[type="__PREACT_CLI_DATA__"]');
+  } catch (err) {
+    return false;
+  }
+}
+function detectAngularJs() {
+  try {
+    return Object.prototype.hasOwnProperty.call(window, 'angular') || document.querySelector('.ng-binding, [ng-app], [data-ng-app], [ng-controller], [data-ng-controller], [ng-repeat], [data-ng-repeat]') || document.querySelector('script[src*="angular.js"], script[src*="angular.min.js"]');
+  } catch (err) {
+    return false;
+  }
+}
+function detectElectron() {
+  try {
+    return typeof navigator === 'object' && typeof navigator.userAgent === 'string' && navigator.userAgent.indexOf('Electron') >= 0;
+  } catch (err) {
+    return false;
+  }
 }

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

@@ -8,18 +8,13 @@ var _config = require("../../../common/config/config");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _constants = require("../constants");
-var _drain = require("../../../common/drain/drain");
 var _frameworkDetection = require("./framework-detection");
-var _polyfillDetection = require("./polyfill-detection");
 var _protocol = require("../../../common/url/protocol");
 var _obfuscate = require("../../../common/util/obfuscate");
-var _env = require("../../../common/constants/env.npm");
 var _load = require("../../../common/window/load");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
 var _runtime = require("../../../common/constants/runtime");
 var _aggregateBase = require("../../utils/aggregate-base");
-var _stringify = require("../../../common/util/stringify");
-var _endpointMap = require("./endpoint-map");
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
@@ -45,9 +40,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     scheduler.harvest.on('jserrors', () => ({
       body: this.aggregator.take(['cm', 'sm'])
     }));
-    (0, _drain.drain)(this.agentIdentifier, this.featureName); // regardless if this is blocked or not, drain is needed to unblock other features from harvesting (counteract registerDrain)
+    this.drain();
   }
-
   storeSupportabilityMetrics(name, value) {
     if (this.blocked) return;
     const type = _constants.SUPPORTABILITY_METRIC;
@@ -65,9 +59,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.aggregator.store(type, name, params, metrics);
   }
   singleChecks() {
-    // report generic info about the agent itself
-    // note the browser agent version
-    this.storeSupportabilityMetrics("Generic/Version/".concat(_env.VERSION, "/Detected"));
     // report loaderType
     const {
       distMethod,
@@ -78,22 +69,27 @@ class Aggregate extends _aggregateBase.AggregateBase {
 
     // frameworks on page
     if (_runtime.isBrowserScope) {
+      this.storeSupportabilityMetrics('Generic/Runtime/Browser/Detected');
+
+      // These SMs are used by the AppExp team
       (0, _load.onDOMContentLoaded)(() => {
         (0, _frameworkDetection.getFrameworks)().forEach(framework => {
           this.storeSupportabilityMetrics('Framework/' + framework + '/Detected');
         });
       });
+    } else if (_runtime.isWorkerScope) {
+      this.storeSupportabilityMetrics('Generic/Runtime/Worker/Detected');
+    } else {
+      this.storeSupportabilityMetrics('Generic/Runtime/Unknown/Detected');
     }
-    (0, _polyfillDetection.getPolyfills)().forEach(polyfill => {
-      this.storeSupportabilityMetrics('Polyfill/' + polyfill + '/Detected');
-    });
 
-    // file protocol detection
+    // Track if the agent is being loaded using a file protocol such as is the case in some
+    // set-top box applications or Electron applications
     if ((0, _protocol.isFileProtocol)()) {
       this.storeSupportabilityMetrics('Generic/FileProtocol/Detected');
     }
 
-    // obfuscation rules detection
+    // 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');
@@ -106,18 +102,17 @@ class Aggregate extends _aggregateBase.AggregateBase {
       if (evt.persisted) {
         this.storeSupportabilityMetrics('Generic/BFCache/PageRestored');
       }
-      return;
     });
   }
   unload() {
-    // Page Resources detection for estimations with resources feature work
-    // TODO - these SMs are to be removed when we implement the actual resources feature
     try {
       if (this.resourcesSent) return;
+      this.resourcesSent = true; // make sure this only gets sent once
+
       const agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
-      const info = (0, _config.getInfo)(this.agentIdentifier);
-      // make sure this only gets sent once
-      this.resourcesSent = true;
+
+      // Capture SMs around network resources using the performance API to assess
+      // work to split this out from the ST nodes
       // differentiate between internal+external and ajax+non-ajax
       const ajaxResources = ['beacon', 'fetch', 'xmlhttprequest'];
       const internalUrls = ['nr-data.net', 'newrelic.com', 'nr-local.net', 'localhost'];
@@ -136,26 +131,14 @@ class Aggregate extends _aggregateBase.AggregateBase {
         }
       });
 
-      // Capture per-agent bytes sent for each endpoint (see harvest) and RUM call (see page_view_event aggregator).
-      Object.keys(agentRuntime.bytesSent).forEach(endpoint => {
-        this.storeSupportabilityMetrics("PageSession/Endpoint/".concat(_endpointMap.endpointMap[endpoint], "/BytesSent"), agentRuntime.bytesSent[endpoint]);
-      });
-
-      // Capture per-agent query bytes sent for each endpoint (see harvest) and RUM call (see page_view_event aggregator).
-      Object.keys(agentRuntime.bytesSent).forEach(endpoint => {
-        this.storeSupportabilityMetrics("PageSession/Endpoint/".concat(_endpointMap.endpointMap[endpoint], "/QueryBytesSent"), agentRuntime.queryBytesSent[endpoint]);
-      });
-
-      // Capture metrics for session trace if active (`ptid` is set when returned by replay ingest).
+      // Capture SMs for session trace if active (`ptid` is set when returned by replay ingest).
+      // Retain these SMs while we are working through the session_replay feature
       if (agentRuntime.ptid) {
         this.storeSupportabilityMetrics('PageSession/Feature/SessionTrace/DurationMs', Math.round(performance.now()));
       }
 
-      // Capture metrics for size of custom attributes
-      const jsAttributes = (0, _stringify.stringify)(info.jsAttributes);
-      this.storeSupportabilityMetrics('PageSession/Feature/CustomData/Bytes', jsAttributes === '{}' ? 0 : jsAttributes.length);
-
-      // Capture metrics for performance markers and measures
+      // Capture SMs for performance markers and measures to assess the usage and possible inclusion of this
+      // data in the agent for use in NR
       if (typeof performance !== 'undefined') {
         const markers = performance.getEntriesByType('mark');
         const measures = performance.getEntriesByType('measure');

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

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.Instrument = void 0;
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
-var _handle = require("../../../common/event-emitter/handle");
-var _features = require("../../../loaders/features/features");
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {

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

@@ -11,7 +11,6 @@ var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _cleanUrl = require("../../../common/url/clean-url");
 var _config = require("../../../common/config/config");
 var _constants = require("../constants");
-var _drain = require("../../../common/drain/drain");
 var _runtime = require("../../../common/constants/runtime");
 var _aggregateBase = require("../../utils/aggregate-base");
 /*
@@ -28,8 +27,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.eventsPerMinute = 240;
     this.harvestTimeSeconds = (0, _config.getConfigurationValue)(this.agentIdentifier, 'page_action.harvestTimeSeconds') || (0, _config.getConfigurationValue)(this.agentIdentifier, 'ins.harvestTimeSeconds') || 30;
     this.eventsPerHarvest = this.eventsPerMinute * this.harvestTimeSeconds / 60;
-    this.referrerUrl;
-    this.currentEvents;
+    this.referrerUrl = undefined;
+    this.currentEvents = undefined;
     this.events = [];
     this.att = (0, _config.getInfo)(this.agentIdentifier).jsAttributes; // per-agent, aggregators-shared info context
 
@@ -37,24 +36,23 @@ class Aggregate extends _aggregateBase.AggregateBase {
     (0, _registerHandler.registerHandler)('api-addPageAction', function () {
       return _this.addPageAction(...arguments);
     }, this.featureName, this.ee);
-    var scheduler = new _harvestScheduler.HarvestScheduler('ins', {
-      onFinished: function () {
-        return _this.onHarvestFinished(...arguments);
+    this.waitForFlags(['ins']).then(_ref => {
+      let [enabled] = _ref;
+      if (enabled) {
+        const scheduler = new _harvestScheduler.HarvestScheduler('ins', {
+          onFinished: function () {
+            return _this.onHarvestFinished(...arguments);
+          }
+        }, this);
+        scheduler.harvest.on('ins', function () {
+          return _this.onHarvestStarted(...arguments);
+        });
+        scheduler.startTimer(this.harvestTimeSeconds, 0);
+      } else {
+        this.blocked = true;
       }
-    }, this);
-    scheduler.harvest.on('ins', function () {
-      return _this.onHarvestStarted(...arguments);
     });
-    this.ee.on("drain-".concat(this.featureName), () => {
-      if (!this.blocked) scheduler.startTimer(this.harvestTimeSeconds, 0);
-    });
-
-    // if rum response determines that customer lacks entitlements for ins endpoint, block it
-    (0, _registerHandler.registerHandler)('block-ins', () => {
-      this.blocked = true;
-      scheduler.stopTimer(true);
-    }, this.featureName, this.ee);
-    (0, _drain.drain)(this.agentIdentifier, this.featureName);
+    this.drain();
   }
   onHarvestStarted(options) {
     const {

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

@@ -15,7 +15,6 @@ var _config = require("../../../common/config/config");
 var _harvest = require("../../../common/harvest/harvest");
 var CONSTANTS = _interopRequireWildcard(require("../constants"));
 var _initializedFeatures = require("./initialized-features");
-var _drain = require("../../../common/drain/drain");
 var _featureFlags = require("../../../common/util/feature-flags");
 var _console = require("../../../common/util/console");
 var _aggregateBase = require("../../utils/aggregate-base");
@@ -155,7 +154,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
         }
         try {
           (0, _featureFlags.activateFeatures)(JSON.parse(responseText), this.agentIdentifier);
-          (0, _drain.drain)(this.agentIdentifier, this.featureName);
+          this.drain();
         } catch (err) {
           this.ee.abort();
           (0, _console.warn)('RUM call failed. Agent shutting down.');

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

@@ -21,10 +21,12 @@ class Instrument extends _instrumentBase.InstrumentBase {
     super(agentIdentifier, aggregator, CONSTANTS.FEATURE_NAME, auto);
     if ((typeof PerformanceNavigationTiming === 'undefined' || _runtime.isiOS) && typeof PerformanceTiming !== 'undefined') {
       // For majority browser versions in which PNT exists, we can get load timings later from the nav entry (in the aggregate portion). At minimum, PT should exist for main window.
-      // *cli Mar'23 - iOS 15.2 & 15.4 testing in Sauce still fails with onTTFB. Hence, all iOS will fallback to this for now. Unknown if this is similar in nature to iOS_below16 bug.
+      // *cli Mar'23 - iOS 15.2 & 15.4 testing in Sauce still fails with onTTFB. Hence, all iOS will fallback to this for now. Unknown if this is similar in nature to iOSBelow16 bug.
       const agentRuntime = (0, _config.getRuntime)(agentIdentifier);
       agentRuntime[CONSTANTS.TTFB] = Math.max(Date.now() - agentRuntime.offset, 0);
-      (0, _load.onDOMContentLoaded)(() => agentRuntime[CONSTANTS.FBTDC] = Math.max((0, _now.now)() - agentRuntime[CONSTANTS.TTFB], 0));
+      (0, _load.onDOMContentLoaded)(() => {
+        agentRuntime[CONSTANTS.FBTDC] = Math.max((0, _now.now)() - agentRuntime[CONSTANTS.TTFB], 0);
+      });
       (0, _load.onWindowLoad)(() => {
         const timeNow = (0, _now.now)();
         agentRuntime[CONSTANTS.FBTWL] = Math.max(timeNow - agentRuntime[CONSTANTS.TTFB], 0);