@newrelic/browser-agent 1.238.0 → 1.239.0

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

@@ -15,13 +15,13 @@ export class DT {
     if (!this.shouldGenerateTrace(parsedOrigin)) {
       return null;
     }
-    var loader_config = getLoaderConfig(this.agentIdentifier);
-    if (!loader_config) {
+    var loaderConfig = 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;
     }
@@ -29,9 +29,9 @@ export class DT {
     var traceId = 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/esm/features/ajax/instrument/index.js

@@ -30,6 +30,38 @@ export class Instrument extends InstrumentBase {
     if (!getRuntime(agentIdentifier).xhrWrappable) return;
     this.dt = new DT(agentIdentifier);
     this.handler = (type, args, ctx, group) => 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'
+      };
+      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, FEATURE_NAMES.ajax);
+        }
+      });
+    } catch (err) {
+      // do nothing
+    }
     wrapFetch(this.ee);
     wrapXhr(this.ee);
     subscribeToEvents(agentIdentifier, this.ee, this.handler, this.dt);
@@ -89,9 +121,9 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     this.metrics = {};
   }
   function onOpenXhrEnd(args, xhr) {
-    var loader_config = getLoaderConfig(agentIdentifier);
-    if (loader_config.xpid && this.sameOrigin) {
-      xhr.setRequestHeader('X-NewRelic-ID', loader_config.xpid);
+    var loaderConfig = getLoaderConfig(agentIdentifier);
+    if (loaderConfig.xpid && this.sameOrigin) {
+      xhr.setRequestHeader('X-NewRelic-ID', loaderConfig.xpid);
     }
     var payload = dt.generateTracePayload(this.parsedOrigin);
     if (payload) {
@@ -273,7 +305,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 = now();
     if (!this.params) {
       this.params = {};
@@ -314,17 +346,6 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     metrics.cbTime = this.cbTime;
     handler('xhr', [params, metrics, this.startTime, this.endTime, 'xhr'], this, FEATURE_NAMES.ajax);
   }
-  function addUrl(ctx, url) {
-    var parsed = 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 = responseSizeFromXhr(xhr, ctx.lastSize);
@@ -337,4 +358,15 @@ function subscribeToEvents(agentIdentifier, ee, handler, dt) {
     }
     ctx.loadCaptureCalled = true;
   }
+}
+function addUrl(ctx, url) {
+  var parsed = 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/esm/features/jserrors/aggregate/canonical-function-name.js

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

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

@@ -62,8 +62,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.
@@ -197,7 +197,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'
     };
@@ -242,7 +242,7 @@ function computeStackTraceBySourceAndLine(ex) {
     mode: 'sourceline',
     name: className,
     message: ex.message,
-    stackString: stackString,
+    stackString,
     frames: [{
       url: canonicalUrl,
       line: ex.line,

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

@@ -16,7 +16,6 @@ import { getInfo, getConfigurationValue, getRuntime } from '../../../common/conf
 import { now } from '../../../common/timing/now';
 import { globalScope } from '../../../common/constants/runtime';
 import { FEATURE_NAME } from '../constants';
-import { drain } from '../../../common/drain/drain';
 import { FEATURE_NAMES } from '../../../loaders/features/features';
 import { AggregateBase } from '../../utils/aggregate-base';
 
@@ -34,7 +33,7 @@ export class Aggregate extends 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
@@ -68,7 +67,7 @@ export class Aggregate extends AggregateBase {
       this.blocked = true;
       scheduler.stopTimer(true);
     }, this.featureName, this.ee);
-    drain(this.agentIdentifier, this.featureName);
+    this.drain();
   }
   onHarvestStarted(options) {
     // this gets rid of dependency in AJAX module
@@ -77,7 +76,7 @@ export class Aggregate extends AggregateBase {
       this.currentBody = body;
     }
     var payload = {
-      body: body,
+      body,
       qs: {}
     };
     var releaseIds = stringify(getRuntime(this.agentIdentifier).releaseIds);
@@ -187,7 +186,7 @@ export class Aggregate extends 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/esm/features/metrics/aggregate/framework-detection.js

@@ -1,31 +1,59 @@
 import { isBrowserScope } from '../../../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'
 };
 export function getFrameworks() {
   if (!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
   }
@@ -45,9 +73,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;
   }
@@ -58,4 +102,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/esm/features/metrics/aggregate/index.js

@@ -1,19 +1,14 @@
-import { getRuntime, getInfo } from '../../../common/config/config';
+import { getRuntime } from '../../../common/config/config';
 import { registerHandler } from '../../../common/event-emitter/register-handler';
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler';
 import { FEATURE_NAME, SUPPORTABILITY_METRIC, CUSTOM_METRIC, SUPPORTABILITY_METRIC_CHANNEL, CUSTOM_METRIC_CHANNEL } from '../constants';
-import { drain } from '../../../common/drain/drain';
 import { getFrameworks } from './framework-detection';
-import { getPolyfills } from './polyfill-detection';
 import { isFileProtocol } from '../../../common/url/protocol';
 import { getRules, validateRules } from '../../../common/util/obfuscate';
-import { VERSION } from "../../../common/constants/env.npm";
 import { onDOMContentLoaded } from '../../../common/window/load';
 import { windowAddEventListener } from '../../../common/event-listener/event-listener-opts';
-import { isBrowserScope } from '../../../common/constants/runtime';
+import { isBrowserScope, isWorkerScope } from '../../../common/constants/runtime';
 import { AggregateBase } from '../../utils/aggregate-base';
-import { stringify } from '../../../common/util/stringify';
-import { endpointMap } from './endpoint-map';
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
@@ -39,9 +34,8 @@ export class Aggregate extends AggregateBase {
     scheduler.harvest.on('jserrors', () => ({
       body: this.aggregator.take(['cm', 'sm'])
     }));
-    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 = SUPPORTABILITY_METRIC;
@@ -59,9 +53,6 @@ export class Aggregate extends 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(VERSION, "/Detected"));
     // report loaderType
     const {
       distMethod,
@@ -72,22 +63,27 @@ export class Aggregate extends AggregateBase {
 
     // frameworks on page
     if (isBrowserScope) {
+      this.storeSupportabilityMetrics('Generic/Runtime/Browser/Detected');
+
+      // These SMs are used by the AppExp team
       onDOMContentLoaded(() => {
         getFrameworks().forEach(framework => {
           this.storeSupportabilityMetrics('Framework/' + framework + '/Detected');
         });
       });
+    } else if (isWorkerScope) {
+      this.storeSupportabilityMetrics('Generic/Runtime/Worker/Detected');
+    } else {
+      this.storeSupportabilityMetrics('Generic/Runtime/Unknown/Detected');
     }
-    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 (isFileProtocol()) {
       this.storeSupportabilityMetrics('Generic/FileProtocol/Detected');
     }
 
-    // obfuscation rules detection
+    // Capture SMs to assess customer engagement with the obfuscation config
     const rules = getRules(this.agentIdentifier);
     if (rules.length > 0) this.storeSupportabilityMetrics('Generic/Obfuscate/Detected');
     if (rules.length > 0 && !validateRules(rules)) this.storeSupportabilityMetrics('Generic/Obfuscate/Invalid');
@@ -100,18 +96,17 @@ export class Aggregate extends 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 = getRuntime(this.agentIdentifier);
-      const info = 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'];
@@ -130,26 +125,14 @@ export class Aggregate extends 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[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[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 = 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/esm/features/metrics/instrument/index.js

@@ -1,7 +1,5 @@
 import { InstrumentBase } from '../../utils/instrument-base';
-import { FEATURE_NAME, SUPPORTABILITY_METRIC_CHANNEL } from '../constants';
-import { handle } from '../../../common/event-emitter/handle';
-import { FEATURE_NAMES } from '../../../loaders/features/features';
+import { FEATURE_NAME } from '../constants';
 export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {

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

@@ -10,7 +10,6 @@ import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler';
 import { cleanURL } from '../../../common/url/clean-url';
 import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config';
 import { FEATURE_NAME } from '../constants';
-import { drain } from '../../../common/drain/drain';
 import { isBrowserScope } from '../../../common/constants/runtime';
 import { AggregateBase } from '../../utils/aggregate-base';
 export class Aggregate extends AggregateBase {
@@ -22,8 +21,8 @@ export class Aggregate extends AggregateBase {
     this.eventsPerMinute = 240;
     this.harvestTimeSeconds = getConfigurationValue(this.agentIdentifier, 'page_action.harvestTimeSeconds') || 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 = getInfo(this.agentIdentifier).jsAttributes; // per-agent, aggregators-shared info context
 
@@ -31,24 +30,23 @@ export class Aggregate extends AggregateBase {
     register('api-addPageAction', function () {
       return _this.addPageAction(...arguments);
     }, this.featureName, this.ee);
-    var scheduler = new HarvestScheduler('ins', {
-      onFinished: function () {
-        return _this.onHarvestFinished(...arguments);
+    this.waitForFlags(['ins']).then(_ref => {
+      let [enabled] = _ref;
+      if (enabled) {
+        const scheduler = new 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
-    register('block-ins', () => {
-      this.blocked = true;
-      scheduler.stopTimer(true);
-    }, this.featureName, this.ee);
-    drain(this.agentIdentifier, this.featureName);
+    this.drain();
   }
   onHarvestStarted(options) {
     const {

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

@@ -9,7 +9,6 @@ import { getConfigurationValue, getInfo, getRuntime } from '../../../common/conf
 import { Harvest } from '../../../common/harvest/harvest';
 import * as CONSTANTS from '../constants';
 import { getActivatedFeaturesFlags } from './initialized-features';
-import { drain } from '../../../common/drain/drain';
 import { activateFeatures } from '../../../common/util/feature-flags';
 import { warn } from '../../../common/util/console';
 import { AggregateBase } from '../../utils/aggregate-base';
@@ -147,7 +146,7 @@ export class Aggregate extends AggregateBase {
         }
         try {
           activateFeatures(JSON.parse(responseText), this.agentIdentifier);
-          drain(this.agentIdentifier, this.featureName);
+          this.drain();
         } catch (err) {
           this.ee.abort();
           warn('RUM call failed. Agent shutting down.');

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

@@ -13,10 +13,12 @@ export class Instrument extends InstrumentBase {
     super(agentIdentifier, aggregator, CONSTANTS.FEATURE_NAME, auto);
     if ((typeof PerformanceNavigationTiming === 'undefined' || 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 = getRuntime(agentIdentifier);
       agentRuntime[CONSTANTS.TTFB] = Math.max(Date.now() - agentRuntime.offset, 0);
-      onDOMContentLoaded(() => agentRuntime[CONSTANTS.FBTDC] = Math.max(now() - agentRuntime[CONSTANTS.TTFB], 0));
+      onDOMContentLoaded(() => {
+        agentRuntime[CONSTANTS.FBTDC] = Math.max(now() - agentRuntime[CONSTANTS.TTFB], 0);
+      });
       onWindowLoad(() => {
         const timeNow = now();
         agentRuntime[CONSTANTS.FBTWL] = Math.max(timeNow - agentRuntime[CONSTANTS.TTFB], 0);

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

@@ -6,7 +6,7 @@
 import { onFCP, onFID, onLCP, onCLS, onINP } from 'web-vitals';
 import { onFirstPaint } from '../first-paint';
 import { onLongTask } from '../long-tasks';
-import { iOS_below16 } from '../../../common/constants/runtime';
+import { iOSBelow16 } from '../../../common/constants/runtime';
 import { nullable, numeric, getAddStringContext, addCustomAttributes } from '../../../common/serialize/bel-serializer';
 import { mapOwn } from '../../../common/util/map-own';
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler';
@@ -15,7 +15,6 @@ import { cleanURL } from '../../../common/url/clean-url';
 import { handle } from '../../../common/event-emitter/handle';
 import { getInfo, getConfigurationValue, getRuntime } from '../../../common/config/config';
 import { FEATURE_NAME } from '../constants';
-import { drain } from '../../../common/drain/drain';
 import { FEATURE_NAMES } from '../../../loaders/features/features';
 import { AggregateBase } from '../../utils/aggregate-base';
 export class Aggregate extends AggregateBase {
@@ -45,7 +44,7 @@ export class Aggregate extends AggregateBase {
     });
 
     /* First Contentful Paint - As of WV v3, it still imperfectly tries to detect document vis state asap and isn't supposed to report if page starts hidden. */
-    if (iOS_below16) {
+    if (iOSBelow16) {
       try {
         if (!pageStartedHidden) {
           // see ios-version.js for detail on this following bug case; tldr: buffered flag doesn't work but getEntriesByType does
@@ -121,7 +120,7 @@ export class Aggregate extends AggregateBase {
       let {
         value
       } = _ref5;
-      return this.cls = value;
+      this.cls = value;
     }, {
       reportAllChanges: true
     });
@@ -170,7 +169,7 @@ export class Aggregate extends AggregateBase {
     this.ee.on("drain-".concat(this.featureName), () => {
       this.scheduler.startTimer(harvestTimeSeconds, initialHarvestSeconds);
     });
-    drain(this.agentIdentifier, this.featureName);
+    this.drain();
   }
 
   // takes an attributes object and appends connection attributes if available
@@ -224,9 +223,9 @@ export class Aggregate extends AggregateBase {
       attrs.cls = this.cls;
     }
     this.timings.push({
-      name: name,
-      value: value,
-      attrs: attrs
+      name,
+      value,
+      attrs
     });
     handle('pvtAdded', [name, value, attrs], undefined, FEATURE_NAMES.sessionTrace, this.ee);
   }