@newrelic/browser-agent 1.232.0 → 1.233.0

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

@@ -6,93 +6,67 @@ Object.defineProperty(exports, "__esModule", {
 exports.Aggregate = void 0;
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
-var _mapOwn = require("../../../common/util/map-own");
 var _stringify = require("../../../common/util/stringify");
 var _parseUrl = require("../../../common/url/parse-url");
-var _supportsPerformanceObserver = require("../../../common/window/supports-performance-observer");
-var _lodash = _interopRequireDefault(require("lodash._slice"));
 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 _featureBase = require("../../utils/feature-base");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _aggregateBase = require("../../utils/aggregate-base");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-class Aggregate extends _featureBase.FeatureBase {
+const ignoredEvents = {
+  // we find that certain events make the data too noisy to be useful
+  global: {
+    mouseup: true,
+    mousedown: true
+  },
+  // certain events are present both in the window and in PVT metrics.  PVT metrics are prefered so the window events should be ignored
+  window: {
+    load: true,
+    pagehide: true
+  },
+  // when ajax instrumentation is disabled, all XMLHttpRequest events will return with origin = xhrOriginMissing and should be ignored
+  xhrOriginMissing: {
+    ignoreAll: true
+  }
+};
+const toAggregate = {
+  typing: [1000, 2000],
+  scrolling: [100, 1000],
+  mousing: [1000, 2000],
+  touching: [1000, 2000]
+};
+const MAX_TRACE_DURATION = 15 * 60 * 1000; // 15 minutes
+
+class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants.FEATURE_NAME;
-  constructor(agentIdentifier, aggregator) {
+  constructor(agentIdentifier, aggregator, argsObj) {
     var _this;
     // Very unlikely, but in case the existing XMLHttpRequest.prototype object on the page couldn't be wrapped.
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
     _this = this;
     if (!(0, _config.getRuntime)(agentIdentifier).xhrWrappable) return;
-    const handlerCache = new _handlerCache.HandlerCache();
+    this.resourceObserver = argsObj?.resourceObserver; // undefined if observer couldn't be created
     this.ptid = '';
-    this.ignoredEvents = {
-      // we find that certain events make the data too noisy to be useful
-      global: {
-        mouseup: true,
-        mousedown: true
-      },
-      // certain events are present both in the window and in PVT metrics.  PVT metrics are prefered so the window events should be ignored
-      window: {
-        load: true,
-        pagehide: true
-      },
-      // when ajax instrumentation is disabled, all XMLHttpRequest events will return with origin = xhrOriginMissing and should be ignored
-      xhrOriginMissing: {
-        ignoreAll: true
-      }
-    };
-    this.toAggregate = {
-      typing: [1000, 2000],
-      scrolling: [100, 1000],
-      mousing: [1000, 2000],
-      touching: [1000, 2000]
-    };
-    this.rename = {
-      typing: {
-        keydown: true,
-        keyup: true,
-        keypress: true
-      },
-      mousing: {
-        mousemove: true,
-        mouseenter: true,
-        mouseleave: true,
-        mouseover: true,
-        mouseout: true
-      },
-      scrolling: {
-        scroll: true
-      },
-      touching: {
-        touchstart: true,
-        touchmove: true,
-        touchend: true,
-        touchcancel: true,
-        touchenter: true,
-        touchleave: true
-      }
-    };
     this.trace = {};
     this.nodeCount = 0;
     this.sentTrace = null;
     this.harvestTimeSeconds = (0, _config.getConfigurationValue)(agentIdentifier, 'session_trace.harvestTimeSeconds') || 10;
     this.maxNodesPerHarvest = (0, _config.getConfigurationValue)(agentIdentifier, 'session_trace.maxNodesPerHarvest') || 1000;
     this.laststart = 0;
+    const handlerCache = new _handlerCache.HandlerCache();
     (0, _registerHandler.registerHandler)('feat-stn', () => {
       if (typeof PerformanceNavigationTiming !== 'undefined') {
-        this.storeTiming(window.performance?.getEntriesByType('navigation')?.[0] || {});
+        this.storeTiming(window.performance.getEntriesByType('navigation')[0]);
       } else {
-        this.storeTiming(window.performance?.timing);
+        this.storeTiming(window.performance.timing);
       }
-      var scheduler = new _harvestScheduler.HarvestScheduler('resources', {
+      const scheduler = new _harvestScheduler.HarvestScheduler('resources', {
         onFinished: onHarvestFinished.bind(this),
         retryDelay: this.harvestTimeSeconds
       }, this);
@@ -100,38 +74,37 @@ class Aggregate extends _featureBase.FeatureBase {
       scheduler.runHarvest({
         needResponse: true
       }); // sends first stn harvest immediately
-
+      handlerCache.decide(true);
       function onHarvestFinished(result) {
-        // start timer only if ptid was returned by server
         if (result.sent && result.responseText && !this.ptid) {
-          this.ptid = result.responseText;
-          (0, _config.getRuntime)(this.agentIdentifier).ptid = this.ptid;
+          // continue interval harvest only if ptid was returned by server on the first
+          (0, _config.getRuntime)(this.agentIdentifier).ptid = this.ptid = result.responseText;
           scheduler.startTimer(this.harvestTimeSeconds);
         }
         if (result.sent && result.retry && this.sentTrace) {
-          (0, _mapOwn.mapOwn)(this.sentTrace, (name, nodes) => {
-            this.mergeSTNs(name, nodes);
+          // merge previous trace back into buffer to retry for next harvest
+          Object.entries(this.sentTrace).forEach(_ref => {
+            let [name, listOfSTNodes] = _ref;
+            if (this.nodeCount >= this.maxNodesPerHarvest) return;
+            this.nodeCount += listOfSTNodes.length;
+            this.trace[name] = this.trace[name] ? listOfSTNodes.concat(this.trace[name]) : listOfSTNodes;
           });
           this.sentTrace = null;
         }
       }
       function prepareHarvest(options) {
-        if ((0, _now.now)() > 15 * 60 * 1000) {
+        if ((0, _now.now)() > MAX_TRACE_DURATION) {
           // been collecting for over 15 min, empty trace object and bail
           scheduler.stopTimer();
           this.trace = {};
           return;
         }
-
-        // only send when there are more than 30 nodes to send
+        // Only harvest when there are more than 30 nodes to send after the very first.
         if (this.ptid && this.nodeCount <= 30) return;
         return this.takeSTNs(options.retry);
       }
-      handlerCache.decide(true);
-    }, this.featureName, this.ee);
-    (0, _registerHandler.registerHandler)('block-stn', () => {
-      handlerCache.decide(false);
     }, this.featureName, this.ee);
+    (0, _registerHandler.registerHandler)('block-stn', () => handlerCache.decide(false), this.featureName, this.ee);
 
     // register the handlers immediately... but let the handlerCache decide if the data should actually get stored...
     (0, _registerHandler.registerHandler)('bst', function () {
@@ -184,19 +157,28 @@ class Aggregate extends _featureBase.FeatureBase {
     }, this.featureName, this.ee);
     (0, _drain.drain)(this.agentIdentifier, this.featureName);
   }
+
+  // PageViewTiming (FEATURE) events and metrics, such as 'load', 'lcp', etc. pipes into ST here.
   processPVT(name, value, attrs) {
-    var t = {};
-    t[name] = value;
-    this.storeTiming(t);
-    if (this.hasFID(name, attrs)) this.storeEvent({
+    this.storeTiming({
+      [name]: value
+    });
+    if (hasFID(name, attrs)) this.storeEvent({
       type: 'fid',
       target: 'document'
     }, 'document', value, value + attrs.fid);
+    function hasFID(name, attrs) {
+      return name === 'fi' && !!attrs && typeof attrs.fid === 'number';
+    }
   }
-  storeTiming(_t) {
+
+  // This processes the aforementioned PVT and the first navigation entry of the page.
+  storeTiming(timingEntry) {
+    if (!timingEntry) return;
+
     // loop iterates through prototype also (for FF)
-    for (let key in _t) {
-      const val = _t[key];
+    for (let key in timingEntry) {
+      let val = timingEntry[key];
 
       // ignore size and status type nodes that do not map to timestamp metrics
       const lck = key.toLowerCase();
@@ -205,31 +187,33 @@ class Aggregate extends _featureBase.FeatureBase {
       // ignore inherited methods, meaningless 0 values, and bogus timestamps
       // that are in the future (Microsoft Edge seems to sometimes produce these)
       if (!(typeof val === 'number' && val >= 0)) continue;
-      const timeOffset = Math.round(_t[key]);
+      val = Math.round(val);
       this.storeSTN({
         n: key,
-        s: timeOffset,
-        e: timeOffset,
+        s: val,
+        e: val,
         o: 'document',
         t: 'timing'
       });
     }
   }
+
+  // Tracks duration of native APIs wrapped by wrap-timer & wrap-raf.
   storeTimer(target, start, end, type) {
-    var category = 'timer';
-    if (type === 'requestAnimationFrame') category = type;
-    var evt = {
+    const evt = {
       n: type,
       s: start,
       e: end,
       o: 'window',
-      t: category
+      t: type === 'requestAnimationFrame' ? type : 'timer'
     };
     this.storeSTN(evt);
   }
+
+  // Tracks the events and their listener's duration on objects wrapped by wrap-events.
   storeEvent(currentEvent, target, start, end) {
-    if (this.shouldIgnoreEvent(currentEvent, target)) return false;
-    var evt = {
+    if (this.shouldIgnoreEvent(currentEvent, target)) return;
+    const evt = {
       n: this.evtName(currentEvent.type),
       s: start,
       e: end,
@@ -244,31 +228,60 @@ class Aggregate extends _featureBase.FeatureBase {
     }
     this.storeSTN(evt);
   }
+  shouldIgnoreEvent(event, target) {
+    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;
+  }
   evtName(type) {
-    var name = type;
-    (0, _mapOwn.mapOwn)(this.rename, function (key, val) {
-      if (type in val) name = key;
-    });
-    return name;
+    switch (type) {
+      case 'keydown':
+      case 'keyup':
+      case 'keypress':
+        return 'typing';
+      case 'mousemove':
+      case 'mouseenter':
+      case 'mouseleave':
+      case 'mouseover':
+      case 'mouseout':
+        return 'mousing';
+      case 'scroll':
+        return 'scrolling';
+      case 'touchstart':
+      case 'touchmove':
+      case 'touchend':
+      case 'touchcancel':
+      case 'touchenter':
+      case 'touchleave':
+        return 'touching';
+      default:
+        return type;
+    }
   }
   evtOrigin(t, target) {
-    var origin = 'unknown';
+    let origin = 'unknown';
     if (t && t instanceof XMLHttpRequest) {
-      var params = this.ee.context(t).params;
+      const params = this.ee.context(t).params;
       if (!params || !params.status || !params.method || !params.host || !params.pathname) return 'xhrOriginMissing';
       origin = params.status + ' ' + params.method + ': ' + params.host + params.pathname;
     } else if (t && typeof t.tagName === 'string') {
       origin = t.tagName.toLowerCase();
       if (t.id) origin += '#' + t.id;
-      if (t.className) origin += '.' + (0, _lodash.default)(t.classList).join('.');
+      if (t.className) {
+        for (let i = 0; i < t.classList.length; i++) origin += '.' + t.classList[i];
+      }
     }
     if (origin === 'unknown') {
       if (typeof target === 'string') origin = target;else if (target === document) origin = 'document';else if (target === window) origin = 'window';else if (target instanceof FileReader) origin = 'FileReader';
     }
     return origin;
   }
+
+  // Tracks when the window history API specified by wrap-history is used.
   storeHist(path, old, time) {
-    var node = {
+    const node = {
       n: 'history.pushState',
       s: time,
       e: time,
@@ -277,11 +290,15 @@ class Aggregate extends _featureBase.FeatureBase {
     };
     this.storeSTN(node);
   }
+
+  // Processes all the PerformanceResourceTiming entries captured (by observer).
   storeResources(resources) {
     if (!resources || resources.length === 0) return;
     resources.forEach(currentResource => {
-      var parsed = (0, _parseUrl.parseUrl)(currentResource.name);
-      var res = {
+      if ((currentResource.fetchStart | 0) <= this.laststart) return; // don't recollect already-seen resources
+
+      const parsed = (0, _parseUrl.parseUrl)(currentResource.name);
+      const res = {
         n: currentResource.initiatorType,
         s: currentResource.fetchStart | 0,
         e: currentResource.responseEnd | 0,
@@ -289,16 +306,15 @@ class Aggregate extends _featureBase.FeatureBase {
         // resource.name is actually a URL so it's the source
         t: currentResource.entryType
       };
-
-      // don't recollect old resources
-      if (res.s <= this.laststart) return;
       this.storeSTN(res);
     });
     this.laststart = resources[resources.length - 1].fetchStart | 0;
   }
+
+  // JavascriptError (FEATURE) events pipes into ST here.
   storeErrorAgg(type, name, params, metrics) {
-    if (type !== 'err') return;
-    var node = {
+    if (type !== 'err') return; // internal errors are purposefully ignored
+    const node = {
       n: 'error',
       s: metrics.time,
       e: metrics.time,
@@ -307,9 +323,11 @@ class Aggregate extends _featureBase.FeatureBase {
     };
     this.storeSTN(node);
   }
+
+  // Ajax (FEATURE) events--XML & fetches--pipes into ST here.
   storeXhrAgg(type, name, params, metrics) {
     if (type !== 'xhr') return;
-    var node = {
+    const node = {
       n: 'Ajax',
       s: metrics.time,
       e: metrics.time + metrics.duration,
@@ -318,46 +336,46 @@ class Aggregate extends _featureBase.FeatureBase {
     };
     this.storeSTN(node);
   }
+
+  // Central function called by all the other store__ & addToTrace API to append a trace node.
   storeSTN(stn) {
-    // limit the number of data that is stored
-    if (this.nodeCount >= this.maxNodesPerHarvest) return;
-    var traceArr = this.trace[stn.n];
-    if (!traceArr) traceArr = this.trace[stn.n] = [];
-    traceArr.push(stn);
+    if (this.nodeCount >= this.maxNodesPerHarvest) return; // limit the amount of data that is stored at once
+
+    if (this.trace[stn.n]) this.trace[stn.n].push(stn);else this.trace[stn.n] = [stn];
     this.nodeCount++;
   }
-  mergeSTNs(key, nodes) {
-    // limit the number of data that is stored
-    if (this.nodeCount >= this.maxNodesPerHarvest) return;
-    var traceArr = this.trace[key];
-    if (!traceArr) traceArr = this.trace[key] = [];
-    this.trace[key] = nodes.concat(traceArr);
-    this.nodeCount += nodes.length;
-  }
+
+  // Used by session trace's harvester to create the payload body.
   takeSTNs(retry) {
-    // if the observer is not being used, this checks resourcetiming buffer every harvest
-    if (!(0, _supportsPerformanceObserver.supportsPerformanceObserver)()) {
+    if (!this.resourceObserver) {
+      // if PO isn't supported, this checks resourcetiming buffer every harvest.
       this.storeResources(window.performance.getEntriesByType('resource'));
     }
-    var stns = (0, _mapOwn.mapOwn)(this.trace, (name, nodes) => {
-      if (!(name in this.toAggregate)) return nodes;
-      return (0, _mapOwn.mapOwn)(nodes.sort(this.byStart).reduce(this.smearEvtsByOrigin(name), {}), this.val).reduce(this.flatten, []);
-    }).reduce(this.flatten, []);
+    const stns = Object.entries(this.trace).flatMap(_ref2 => {
+      let [name, listOfSTNodes] = _ref2;
+      // basically take the "this.trace" map-obj and concat all the list-type values
+      if (!(name in toAggregate)) return listOfSTNodes;
+      // Special processing for event nodes dealing with user inputs:
+      const reindexByOriginFn = this.smearEvtsByOrigin(name);
+      const partitionListByOriginMap = listOfSTNodes.sort((a, b) => a.s - b.s).reduce(reindexByOriginFn, {});
+      return Object.values(partitionListByOriginMap).flat(); // join the partitions back into 1-D, now ordered by origin then start time
+    }, this);
     if (stns.length === 0) return {};
     if (retry) {
       this.sentTrace = this.trace;
     }
     this.trace = {};
     this.nodeCount = 0;
-    var stnInfo = {
+    const stnInfo = {
       qs: {
-        st: '' + (0, _config.getRuntime)(this.agentIdentifier).offset
+        st: String((0, _config.getRuntime)(this.agentIdentifier).offset)
       },
       body: {
         res: stns
       }
     };
     if (!this.ptid) {
+      // send custom and user attributes on the very first ST harvest only
       const {
         userAttributes,
         atts,
@@ -365,54 +383,35 @@ class Aggregate extends _featureBase.FeatureBase {
       } = (0, _config.getInfo)(this.agentIdentifier);
       stnInfo.qs.ua = userAttributes;
       stnInfo.qs.at = atts;
-      var ja = (0, _stringify.stringify)(jsAttributes);
+      const ja = (0, _stringify.stringify)(jsAttributes);
       stnInfo.qs.ja = ja === '{}' ? null : ja;
     }
     return stnInfo;
   }
-  byStart(a, b) {
-    return a.s - b.s;
-  }
   smearEvtsByOrigin(name) {
-    var maxGap = this.toAggregate[name][0];
-    var maxLen = this.toAggregate[name][1];
-    var lastO = {};
-    return (byOrigin, evt) => {
-      var lastArr = byOrigin[evt.o];
-      lastArr || (lastArr = byOrigin[evt.o] = []);
-      var last = lastO[evt.o];
-      if (name === 'scrolling' && !this.trivial(evt)) {
-        lastO[evt.o] = null;
-        evt.n = 'scroll';
-        lastArr.push(evt);
-      } else if (last && evt.s - last.s < maxLen && last.e > evt.s - maxGap) {
-        last.e = evt.e;
+    const maxGap = toAggregate[name][0];
+    const maxLen = toAggregate[name][1];
+    const lastO = {};
+    return (byOrigin, evtNode) => {
+      let lastArr = byOrigin[evtNode.o];
+      if (!lastArr) lastArr = byOrigin[evtNode.o] = [];
+      const last = lastO[evtNode.o];
+      if (name === 'scrolling' && !trivial(evtNode)) {
+        lastO[evtNode.o] = null;
+        evtNode.n = 'scroll';
+        lastArr.push(evtNode);
+      } else if (last && evtNode.s - last.s < maxLen && last.e > evtNode.s - maxGap) {
+        last.e = evtNode.e;
       } else {
-        lastO[evt.o] = evt;
-        lastArr.push(evt);
+        lastO[evtNode.o] = evtNode;
+        lastArr.push(evtNode);
       }
       return byOrigin;
     };
-  }
-  val(key, value) {
-    return value;
-  }
-  flatten(a, b) {
-    return a.concat(b);
-  }
-  hasFID(name, attrs) {
-    return name === 'fi' && !!attrs && typeof attrs.fid === 'number';
-  }
-  trivial(node) {
-    var limit = 4;
-    if (node && typeof node.e === 'number' && typeof node.s === 'number' && node.e - node.s < limit) return true;else return false;
-  }
-  shouldIgnoreEvent(event, target) {
-    var origin = this.evtOrigin(event.target, target);
-    if (event.type in this.ignoredEvents.global) return true;
-    if (!!this.ignoredEvents[origin] && this.ignoredEvents[origin].ignoreAll) return true;
-    if (!!this.ignoredEvents[origin] && event.type in this.ignoredEvents[origin]) return true;
-    return false;
+    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;
+    }
   }
 }
 exports.Aggregate = Aggregate;

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

@@ -3,13 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.START = exports.RESOURCE_TIMING_BUFFER_FULL = exports.RESOURCE = exports.PUSH_STATE = exports.ORIG_EVENT = exports.FN_START = exports.FN_END = exports.FEATURE_NAME = exports.END = exports.BST_TIMER = exports.BST_RESOURCE = exports.ADD_EVENT_LISTENER = void 0;
-var _config = require("../../common/config/config");
+exports.START = exports.RESOURCE = exports.PUSH_STATE = exports.FN_START = exports.FN_END = exports.FEATURE_NAME = exports.END = exports.BST_TIMER = exports.BST_RESOURCE = void 0;
 var _features = require("../../loaders/features/features");
 const FEATURE_NAME = _features.FEATURE_NAMES.sessionTrace;
 exports.FEATURE_NAME = FEATURE_NAME;
-const RESOURCE_TIMING_BUFFER_FULL = 'resourcetimingbufferfull';
-exports.RESOURCE_TIMING_BUFFER_FULL = RESOURCE_TIMING_BUFFER_FULL;
 const BST_RESOURCE = 'bstResource';
 exports.BST_RESOURCE = BST_RESOURCE;
 const RESOURCE = 'resource';
@@ -25,8 +22,4 @@ exports.FN_END = FN_END;
 const BST_TIMER = 'bstTimer';
 exports.BST_TIMER = BST_TIMER;
 const PUSH_STATE = 'pushState';
-exports.PUSH_STATE = PUSH_STATE;
-const ORIG_EVENT = _config.originals.EV;
-exports.ORIG_EVENT = ORIG_EVENT;
-const ADD_EVENT_LISTENER = 'addEventListener';
-exports.ADD_EVENT_LISTENER = ADD_EVENT_LISTENER;
+exports.PUSH_STATE = PUSH_STATE;

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

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.Instrument = void 0;
 var _handle = require("../../../common/event-emitter/handle");
 var _wrap = require("../../../common/wrap");
-var _supportsPerformanceObserver = require("../../../common/window/supports-performance-observer");
-var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
 var _now = require("../../../common/timing/now");
 var _instrumentBase = require("../../utils/instrument-base");
 var CONSTANTS = _interopRequireWildcard(require("../constants"));
@@ -22,19 +20,15 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 const {
   BST_RESOURCE,
+  RESOURCE,
   BST_TIMER,
+  START,
   END,
   FEATURE_NAME,
   FN_END,
   FN_START,
-  ADD_EVENT_LISTENER,
-  PUSH_STATE,
-  RESOURCE,
-  RESOURCE_TIMING_BUFFER_FULL,
-  START,
-  ORIG_EVENT: origEvent
+  PUSH_STATE
 } = CONSTANTS;
-const CRT = 'clearResourceTimings';
 class Instrument extends _instrumentBase.InstrumentBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
@@ -46,20 +40,14 @@ class Instrument extends _instrumentBase.InstrumentBase {
     this.timerEE = (0, _wrap.wrapTimer)(thisInstrumentEE);
     this.rafEE = (0, _wrap.wrapRaf)(thisInstrumentEE);
     (0, _wrap.wrapHistory)(thisInstrumentEE);
-    (0, _wrap.wrapEvents)(thisInstrumentEE);
-    thisInstrumentEE.on(FN_START, function (args, target) {
-      var evt = args[0];
-      if (evt instanceof origEvent) {
-        this.bstStart = (0, _now.now)();
-      }
+    this.eventsEE = (0, _wrap.wrapEvents)(thisInstrumentEE);
+    this.eventsEE.on(FN_START, function (args, target) {
+      this.bstStart = (0, _now.now)();
     });
-    thisInstrumentEE.on(FN_END, function (args, target) {
-      var evt = args[0];
-      if (evt instanceof origEvent) {
-        // ISSUE: when target is XMLHttpRequest, nr@context should have params so we can calculate event origin
-        // When ajax is disabled, this may fail without making ajax a dependency of session_trace
-        (0, _handle.handle)('bst', [evt, target, this.bstStart, (0, _now.now)()], undefined, _features.FEATURE_NAMES.sessionTrace, thisInstrumentEE);
-      }
+    this.eventsEE.on(FN_END, function (args, target) {
+      // ISSUE: when target is XMLHttpRequest, nr@context should have params so we can calculate event origin
+      // When ajax is disabled, this may fail without making ajax a dependency of session_trace
+      (0, _handle.handle)('bst', [args[0], target, this.bstStart, (0, _now.now)()], undefined, _features.FEATURE_NAMES.sessionTrace, thisInstrumentEE);
     });
     this.timerEE.on(FN_START, function (args, obj, type) {
       this.bstStart = (0, _now.now)();
@@ -81,54 +69,24 @@ class Instrument extends _instrumentBase.InstrumentBase {
     thisInstrumentEE.on(PUSH_STATE + END, function (args) {
       (0, _handle.handle)('bstHist', [location.pathname + location.hash, this.startPath, this.time], undefined, _features.FEATURE_NAMES.sessionTrace, thisInstrumentEE);
     });
-    if ((0, _supportsPerformanceObserver.supportsPerformanceObserver)()) {
-      // capture initial resources, in case our observer missed anything
-      (0, _handle.handle)(BST_RESOURCE, [window.performance.getEntriesByType('resource')], undefined, _features.FEATURE_NAMES.sessionTrace, thisInstrumentEE);
-      observeResourceTimings();
-    } else {
-      // collect resource timings once when buffer is full
-      if (window.performance[CRT] && window.performance[ADD_EVENT_LISTENER]) {
-        window.performance.addEventListener(RESOURCE_TIMING_BUFFER_FULL, this.onResourceTimingBufferFull, (0, _eventListenerOpts.eventListenerOpts)(false));
-      }
-    }
-    function observeResourceTimings() {
-      var observer = new PerformanceObserver((list, observer) => {
+    let observer;
+    try {
+      // Capture initial resources and watch for future ones. Don't defer this given there's a default cap on the number of buffered entries.
+      observer = new PerformanceObserver(list => {
         // eslint-disable-line no-undef
-        var entries = list.getEntries();
+        const entries = list.getEntries();
         (0, _handle.handle)(BST_RESOURCE, [entries], undefined, _features.FEATURE_NAMES.sessionTrace, thisInstrumentEE);
       });
-      try {
-        observer.observe({
-          entryTypes: ['resource']
-        });
-      } catch (e) {
-        // do nothing
-      }
-    }
-    document.addEventListener('scroll', this.noOp, (0, _eventListenerOpts.eventListenerOpts)(false));
-    document.addEventListener('keypress', this.noOp, (0, _eventListenerOpts.eventListenerOpts)(false));
-    document.addEventListener('click', this.noOp, (0, _eventListenerOpts.eventListenerOpts)(false));
-    this.abortHandler = this.#abort;
-    this.importAggregator();
-  }
-
-  /** Restoration and resource release tasks to be done if Session trace loader is being aborted. Unwind changes to globals. */
-  #abort() {
-    window.performance.removeEventListener(RESOURCE_TIMING_BUFFER_FULL, this.onResourceTimingBufferFull, false);
-    // The doc interaction noOp listeners are harmless--cannot buffer data into EE.
-    this.abortHandler = undefined; // weakly allow this abort op to run only once
-  }
-
-  noOp(e) {/* no-op */}
-  onResourceTimingBufferFull(evt) {
-    (0, _handle.handle)(BST_RESOURCE, [window.performance.getEntriesByType(RESOURCE)], undefined, _features.FEATURE_NAMES.sessionTrace, this.ee);
-
-    // stop recording once buffer is full
-    if (window.performance[CRT]) {
-      try {
-        window.performance.removeEventListener(RESOURCE_TIMING_BUFFER_FULL, this.onResourceTimingBufferFull, false);
-      } catch (e) {}
+      observer.observe({
+        type: RESOURCE,
+        buffered: true
+      });
+    } catch (e) {
+      // Per NEWRELIC-8525, we don't have a fallback for capturing resources for older versions that don't support PO at this time.
     }
+    this.importAggregator({
+      resourceObserver: observer
+    });
   }
 }
 exports.Instrument = Instrument;