@newrelic/browser-agent 1.237.1 → 1.239.0

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);

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

@@ -16,7 +16,6 @@ var _cleanUrl = require("../../../common/url/clean-url");
 var _handle = require("../../../common/event-emitter/handle");
 var _config = require("../../../common/config/config");
 var _constants = require("../constants");
-var _drain = require("../../../common/drain/drain");
 var _features = require("../../../loaders/features/features");
 var _aggregateBase = require("../../utils/aggregate-base");
 /*
@@ -51,7 +50,7 @@ class Aggregate extends _aggregateBase.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 (_runtime.iOS_below16) {
+    if (_runtime.iOSBelow16) {
       try {
         if (!pageStartedHidden) {
           // see ios-version.js for detail on this following bug case; tldr: buffered flag doesn't work but getEntriesByType does
@@ -127,7 +126,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       let {
         value
       } = _ref5;
-      return this.cls = value;
+      this.cls = value;
     }, {
       reportAllChanges: true
     });
@@ -176,7 +175,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.ee.on("drain-".concat(this.featureName), () => {
       this.scheduler.startTimer(harvestTimeSeconds, initialHarvestSeconds);
     });
-    (0, _drain.drain)(this.agentIdentifier, this.featureName);
+    this.drain();
   }
 
   // takes an attributes object and appends connection attributes if available
@@ -230,9 +229,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
       attrs.cls = this.cls;
     }
     this.timings.push({
-      name: name,
-      value: value,
-      attrs: attrs
+      name,
+      value,
+      attrs
     });
     (0, _handle.handle)('pvtAdded', [name, value, attrs], undefined, _features.FEATURE_NAMES.sessionTrace, this.ee);
   }

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RRWEB_VERSION = exports.MAX_PAYLOAD_SIZE = exports.IDEAL_PAYLOAD_SIZE = exports.Aggregate = exports.AVG_COMPRESSION = void 0;
-var _drain = require("../../../common/drain/drain");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _constants = require("../constants");
@@ -14,6 +13,7 @@ var _sessionEntity = require("../../../common/session/session-entity");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _sharedChannel = require("../../../common/constants/shared-channel");
 var _encode = require("../../../common/url/encode");
+var _console = require("../../../common/util/console");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; } /*
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * Copyright 2023 New Relic Corporation. All rights reserved.
@@ -135,7 +135,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
         return this.initializeRecording(flagOn, Math.random() < (0, _config.getConfigurationValue)(this.agentIdentifier, 'session_replay.errorSampleRate'), Math.random() < (0, _config.getConfigurationValue)(this.agentIdentifier, 'session_replay.sampleRate'));
       }).then(() => _sharedChannel.sharedChannel.onReplayReady(this.mode)); // notify watchers that replay started with the mode
 
-      (0, _drain.drain)(this.agentIdentifier, this.featureName);
+      this.drain();
     }
   }
 
@@ -182,11 +182,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.scheduler.startTimer(this.harvestTimeSeconds);
     }
     try {
+      // Do not change the webpackChunkName or it will break the webpack nrba-chunking plugin
       recorder = (await Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "recorder" */'rrweb')))).record;
     } catch (err) {
       return this.abort();
     }
     try {
+      // Do not change the webpackChunkName or it will break the webpack nrba-chunking plugin
       const {
         gzipSync,
         strToU8
@@ -266,7 +268,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
   /** Begin recording using configured recording lib */
   startRecording() {
     if (!recorder) {
-      warn('Recording library was never imported');
+      (0, _console.warn)('Recording library was never imported');
       return this.abort();
     }
     this.recording = true;

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

@@ -10,7 +10,6 @@ var _parseUrl = require("../../../common/url/parse-url");
 var _config = require("../../../common/config/config");
 var _now = require("../../../common/timing/now");
 var _constants = require("../constants");
-var _drain = require("../../../common/drain/drain");
 var _handlerCache = require("../../utils/handler-cache");
 var _sessionEntity = require("../../../common/session/session-entity");
 var _replayMode = require("../../session_replay/replay-mode");
@@ -64,9 +63,13 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.sentTrace = null;
     this.harvestTimeSeconds = (0, _config.getConfigurationValue)(agentIdentifier, 'session_trace.harvestTimeSeconds') || 10;
     this.maxNodesPerHarvest = (0, _config.getConfigurationValue)(agentIdentifier, 'session_trace.maxNodesPerHarvest') || 1000;
+    /**
+     * Standalone (mode) refers to the legacy version of ST before the idea of 'session' or the Replay feature existed.
+     * It has some different behavior vs when used in tandem with replay. */
     this.isStandalone = false;
     const operationalGate = new _handlerCache.HandlerCache(); // acts as a controller-intermediary that can enable or disable this feature's collection dynamically
     const sessionEntity = this.agentRuntime.session;
+    this.operationalGate = operationalGate;
 
     /* --- The following section deals with user sessions concept & contains non-trivial control flow. --- */
     const controlTraceOp = traceMode => {
@@ -140,7 +143,9 @@ class Aggregate extends _aggregateBase.AggregateBase {
             });
             mostRecentModeKnown = updatedTraceMode;
           });
-          this.ee.on(_sessionEntity.SESSION_EVENTS.PAUSE, () => mostRecentModeKnown = sessionEntity.state.sessionTraceMode);
+          this.ee.on(_sessionEntity.SESSION_EVENTS.PAUSE, () => {
+            mostRecentModeKnown = sessionEntity.state.sessionTraceMode;
+          });
           if (!sessionEntity.isNew) {
             // inherit the same mode as existing session's Trace
             if (sessionEntity.state.sessionReplay === _sessionEntity.MODE.OFF) this.isStandalone = true;
@@ -212,7 +217,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
       }
       return operationalGate.settle(() => _this.processPVT(...args));
     }, this.featureName, this.ee);
-    (0, _drain.drain)(this.agentIdentifier, this.featureName);
+    this.drain();
   }
   startTracing(startupBuffer) {
     let dontStartHarvestYet = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -250,17 +255,16 @@ class Aggregate extends _aggregateBase.AggregateBase {
     }
   }
   #prepareHarvest(options) {
-    /* Standalone refers to the legacy version of ST before the idea of 'session' or the Replay feature existed.
-      It has a different behavior on returning a payload for harvest than when used in tandem with either of those concepts. */
     if (this.isStandalone) {
-      if ((0, _now.now)() > MAX_TRACE_DURATION) {
-        // been collecting for over the longest duration we should run for, empty trace object so ST has nothing to send
-        this.#scheduler.stopTimer();
-        this.trace = {};
+      if (this.ptid && (0, _now.now)() >= MAX_TRACE_DURATION) {
+        // Perform a final harvest once we hit or exceed the max session trace time
+        options.isFinalHarvest = true;
+        this.operationalGate.permanentlyDecide(false);
+        this.#scheduler.stopTimer(true);
+      } else if (this.ptid && this.nodeCount <= REQ_THRESHOLD_TO_SEND && !options.isFinalHarvest) {
+        // Only harvest when more than some threshold of nodes are pending, after the very first harvest, with the exception of the last outgoing harvest.
         return;
       }
-      // Only harvest when more than some threshold of nodes are pending, after the very first harvest.
-      if (this.ptid && this.nodeCount <= REQ_THRESHOLD_TO_SEND) return;
     } else {
       //   -- *cli May '26 - Update: Not rate limiting backgrounded pages either for now.
       //   if (this.ptid && document.visibilityState === 'hidden' && this.nodeCount <= REQ_THRESHOLD_TO_SEND) return
@@ -337,8 +341,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     const origin = this.evtOrigin(event.target, target);
     if (event.type in ignoredEvents.global) return true;
     if (!!ignoredEvents[origin] && ignoredEvents[origin].ignoreAll) return true;
-    if (!!ignoredEvents[origin] && event.type in ignoredEvents[origin]) return true;
-    return false;
+    return !!(!!ignoredEvents[origin] && event.type in ignoredEvents[origin]);
   }
   evtName(type) {
     switch (type) {
@@ -448,7 +451,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
       // limit the amount of pending data awaiting next harvest
       if (this.isStandalone || this.agentRuntime.session.state.sessionTraceMode !== _sessionEntity.MODE.ERROR) return;
       const openedSpace = this.trimSTNs(ERROR_MODE_SECONDS_WINDOW); // but maybe we could make some space by discarding irrelevant nodes if we're in sessioned Error mode
-      if (openedSpace == 0) return;
+      if (openedSpace === 0) return;
+    }
+    if (this.isStandalone && (0, _now.now)() >= MAX_TRACE_DURATION) {
+      return;
     }
     if (this.trace[stn.n]) this.trace[stn.n].push(stn);else this.trace[stn.n] = [stn];
     this.nodeCount++;
@@ -468,7 +474,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
        * This isn't exact since nodes go through some processing & EE handlers chain, but it's close enough as we still capture nodes whose duration overlaps the lookback window.
        * ASSUMPTION: all 'end' timings stored are relative to timeOrigin (DOMHighResTimeStamp) and not Unix epoch based. */
       let cutoffIdx = nodeList.findIndex(node => cutoffHighResTime <= node.e);
-      if (cutoffIdx == 0) return;else if (cutoffIdx < 0) {
+      if (cutoffIdx === 0) return;else if (cutoffIdx < 0) {
         // whole list falls outside lookback window and is irrelevant
         cutoffIdx = nodeList.length;
         delete this.trace[nameCategory];
@@ -532,7 +538,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     };
     function trivial(node) {
       const limit = 4;
-      if (node && typeof node.e === 'number' && typeof node.s === 'number' && node.e - node.s < limit) return true;else return false;
+      return !!(node && typeof node.e === 'number' && typeof node.s === 'number' && node.e - node.s < limit);
     }
   }
 }