@newrelic/browser-agent 1.241.0 → 1.243.0

package/dist/cjs/loaders/api/apiAsync.js

@@ -10,19 +10,13 @@ var _contextualEe = require("../../common/event-emitter/contextual-ee");
 var _handle = require("../../common/event-emitter/handle");
 var _registerHandler = require("../../common/event-emitter/register-handler");
 var _invoke = require("../../common/util/invoke");
-var submitData = _interopRequireWildcard(require("../../common/util/submit-data"));
-var _runtime = require("../../common/constants/runtime");
 var _constants = require("../../features/metrics/constants");
-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; }
 function setAPI(agentIdentifier) {
   var instanceEE = _contextualEe.ee.get(agentIdentifier);
-  var cycle = 0;
   var api = {
     finished: (0, _invoke.single)(finished),
     setErrorHandler,
     addToTrace,
-    inlineHit,
     addRelease
   };
 
@@ -58,37 +52,6 @@ function setAPI(agentIdentifier) {
     };
     (0, _handle.handle)('bstApi', [report], undefined, _features.FEATURE_NAMES.sessionTrace, instanceEE);
   }
-
-  // NREUM.inlineHit(requestName, queueTime, appTime, totalBackEndTime, domTime, frontEndTime)
-  //
-  // requestName - the 'web page' name or service name
-  // queueTime - the amount of time spent in the app tier queue
-  // appTime - the amount of time spent in the application code
-  // totalBackEndTime - the total roundtrip time of the remote service call
-  // domTime - the time spent processing the result of the service call (or user defined)
-  // frontEndTime - the time spent rendering the result of the service call (or user defined)
-  function inlineHit(t, requestName, queueTime, appTime, totalBackEndTime, domTime, frontEndTime) {
-    if (!_runtime.isBrowserScope) return;
-    requestName = window.encodeURIComponent(requestName);
-    cycle += 1;
-    const agentInfo = (0, _config.getInfo)(agentIdentifier);
-    if (!agentInfo.beacon) return;
-    const agentInit = (0, _config.getConfiguration)(agentIdentifier);
-    const scheme = agentInit.ssl === false ? 'http' : 'https';
-    const beacon = agentInit.proxy.beacon || agentInfo.beacon;
-    let url = "".concat(scheme, "://").concat(beacon, "/1/").concat(agentInfo.licenseKey);
-    url += '?a=' + agentInfo.applicationID + '&';
-    url += 't=' + requestName + '&';
-    url += 'qt=' + ~~queueTime + '&';
-    url += 'ap=' + ~~appTime + '&';
-    url += 'be=' + ~~totalBackEndTime + '&';
-    url += 'dc=' + ~~domTime + '&';
-    url += 'fe=' + ~~frontEndTime + '&';
-    url += 'c=' + cycle;
-    submitData.xhr({
-      url
-    });
-  }
   function setErrorHandler(t, handler) {
     (0, _config.getRuntime)(agentIdentifier).onerror = handler;
   }

package/dist/cjs/loaders/configure/configure.js

@@ -47,7 +47,7 @@ function configure(agentIdentifier) {
   if (!alreadySetOnce) {
     alreadySetOnce = true;
     if (updatedInit.proxy.assets) {
-      (0, _publicPath.redefinePublicPath)(updatedInit.proxy.assets + '/'); // much like the info.beacon & init.proxy.beacon, this input should not end in a slash, but one is needed for webpack concat
+      (0, _publicPath.redefinePublicPath)(updatedInit.proxy.assets);
       internalTrafficList.push(updatedInit.proxy.assets);
     }
     if (updatedInit.proxy.beacon) internalTrafficList.push(updatedInit.proxy.beacon);

package/dist/cjs/loaders/configure/public-path.js

@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.redefinePublicPath = void 0;
 // Set the default CDN or remote for fetching the assets; NPM shouldn't change this var.
 
-const redefinePublicPath = url => {
-  // There's no URL validation here, so caller should check arg if need be.
-  __webpack_public_path__ = url; // eslint-disable-line
+const redefinePublicPath = urlString => {
+  const isOrigin = urlString.startsWith('http');
+  // Input is not expected to end in a slash, but webpack concats as-is, so one is inserted.
+  urlString += '/';
+  // If there's no existing HTTP scheme, the secure protocol is prepended by default.
+  __webpack_public_path__ = isOrigin ? urlString : 'https://' + urlString; // eslint-disable-line
 };
 exports.redefinePublicPath = redefinePublicPath;

package/dist/esm/cdn/polyfills/lite.js

@@ -4,4 +4,11 @@
  */
 
 import '../polyfills.js';
-import '../lite';
+import { Agent } from '../../loaders/agent';
+import { Instrument as InstrumentPageViewEvent } from '../../features/page_view_event/instrument';
+import { Instrument as InstrumentPageViewTiming } from '../../features/page_view_timing/instrument';
+import { Instrument as InstrumentMetrics } from '../../features/metrics/instrument';
+new Agent({
+  features: [InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentMetrics],
+  loaderType: 'lite-polyfills'
+});

package/dist/esm/cdn/polyfills/pro.js

@@ -1,7 +1,18 @@
 /**
- * @file Creates a version of the "Pro" agent loader with [core-js]{@link https://github.com/zloirock/core-js}
+ * @file Creates a version of the "PRO" agent loader with [core-js]{@link https://github.com/zloirock/core-js}
  * polyfills for pre-ES6 browsers and IE 11.
  */
 
 import '../polyfills.js';
-import '../pro';
+import { Agent } from '../../loaders/agent';
+import { Instrument as InstrumentPageViewEvent } from '../../features/page_view_event/instrument';
+import { Instrument as InstrumentPageViewTiming } from '../../features/page_view_timing/instrument';
+import { Instrument as InstrumentMetrics } from '../../features/metrics/instrument';
+import { Instrument as InstrumentErrors } from '../../features/jserrors/instrument';
+import { Instrument as InstrumentXhr } from '../../features/ajax/instrument';
+import { Instrument as InstrumentSessionTrace } from '../../features/session_trace/instrument';
+import { Instrument as InstrumentPageAction } from '../../features/page_action/instrument';
+new Agent({
+  features: [InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentXhr, InstrumentMetrics, InstrumentPageAction, InstrumentErrors],
+  loaderType: 'pro-polyfills'
+});

package/dist/esm/cdn/polyfills/spa.js

@@ -4,4 +4,16 @@
  */
 
 import '../polyfills.js';
-import '../spa';
+import { Agent } from '../../loaders/agent';
+import { Instrument as InstrumentPageViewEvent } from '../../features/page_view_event/instrument';
+import { Instrument as InstrumentPageViewTiming } from '../../features/page_view_timing/instrument';
+import { Instrument as InstrumentMetrics } from '../../features/metrics/instrument';
+import { Instrument as InstrumentErrors } from '../../features/jserrors/instrument';
+import { Instrument as InstrumentXhr } from '../../features/ajax/instrument';
+import { Instrument as InstrumentSessionTrace } from '../../features/session_trace/instrument';
+import { Instrument as InstrumentSpa } from '../../features/spa/instrument';
+import { Instrument as InstrumentPageAction } from '../../features/page_action/instrument';
+new Agent({
+  features: [InstrumentXhr, InstrumentPageViewEvent, InstrumentPageViewTiming, InstrumentSessionTrace, InstrumentMetrics, InstrumentPageAction, InstrumentErrors, InstrumentSpa],
+  loaderType: 'spa-polyfills'
+});

package/dist/esm/common/config/state/init.js

@@ -1,13 +1,33 @@
+import { isValidSelector } from '../../dom/query-selector';
 import { DEFAULT_EXPIRES_MS, DEFAULT_INACTIVE_MS } from '../../session/constants';
+import { warn } from '../../util/console';
 import { gosNREUMInitializedAgents } from '../../window/nreum';
 import { getModeledObject } from './configurable';
 const model = () => {
   const hiddenState = {
+    mask_selector: '*',
     block_selector: '[data-nr-block]',
     mask_input_options: {
-      password: true
+      color: false,
+      date: false,
+      'datetime-local': false,
+      email: false,
+      month: false,
+      number: false,
+      range: false,
+      search: false,
+      tel: false,
+      text: false,
+      time: false,
+      url: false,
+      week: false,
+      // unify textarea and select element with text input
+      textarea: false,
+      select: false,
+      password: true // This will be enforced to always be true in the setter
     }
   };
+
   return {
     proxy: {
       assets: undefined,
@@ -83,8 +103,15 @@ const model = () => {
       error_sampling_rate: 50,
       // float from 0 - 100
       // recording config settings
-      mask_text_selector: '*',
       mask_all_inputs: true,
+      // this has a getter/setter to facilitate validation of the selectors
+      get mask_text_selector() {
+        return hiddenState.mask_selector;
+      },
+      set mask_text_selector(val) {
+        if (isValidSelector(val)) hiddenState.mask_selector = val + ',[data-nr-mask]';else if (val === null) hiddenState.mask_selector = val; // null is acceptable, which completely disables the behavior
+        else warn('An invalid session_replay.mask_selector was provided and will not be used', val);
+      },
       // these properties only have getters because they are enforcable constants and should error if someone tries to override them
       get block_class() {
         return 'nr-block';
@@ -101,17 +128,17 @@ const model = () => {
         return hiddenState.block_selector;
       },
       set block_selector(val) {
-        hiddenState.block_selector += ",".concat(val);
+        if (isValidSelector(val)) hiddenState.block_selector += ",".concat(val);else if (val !== '') warn('An invalid session_replay.block_selector was provided and will not be used', val);
       },
       // password: must always be present and true no matter what customer sets
       get mask_input_options() {
         return hiddenState.mask_input_options;
       },
       set mask_input_options(val) {
-        hiddenState.mask_input_options = {
+        if (val && typeof val === 'object') hiddenState.mask_input_options = {
           ...val,
           password: true
-        };
+        };else warn('An invalid session_replay.mask_input_option was provided and will not be used', val);
       }
     },
     spa: {

package/dist/esm/common/constants/env.cdn.js

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.241.0";
+export const VERSION = "1.243.0";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/constants/env.npm.js

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.241.0";
+export const VERSION = "1.243.0";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/dom/query-selector.js

@@ -0,0 +1,9 @@
+export const isValidSelector = selector => {
+  if (!selector || typeof selector !== 'string') return false;
+  try {
+    document.createDocumentFragment().querySelector(selector);
+  } catch {
+    return false;
+  }
+  return true;
+};

package/dist/esm/common/session/session-entity.js

@@ -11,6 +11,7 @@ import { getModeledObject } from '../config/state/configurable';
 import { handle } from '../event-emitter/handle';
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../features/metrics/constants';
 import { FEATURE_NAMES } from '../../loaders/features/features';
+import { windowAddEventListener } from '../event-listener/event-listener-opts';
 export const MODE = {
   OFF: 0,
   FULL: 1,
@@ -24,13 +25,19 @@ const model = {
   expiresAt: 0,
   updatedAt: Date.now(),
   sessionReplay: MODE.OFF,
+  sessionReplaySentFirstChunk: false,
   sessionTraceMode: MODE.OFF,
   custom: {}
 };
 export const SESSION_EVENTS = {
   PAUSE: 'session-pause',
   RESET: 'session-reset',
-  RESUME: 'session-resume'
+  RESUME: 'session-resume',
+  UPDATE: 'session-update'
+};
+export const SESSION_EVENT_TYPES = {
+  SAME_TAB: 'same-tab',
+  CROSS_TAB: 'cross-tab'
 };
 export class SessionEntity {
   /**
@@ -57,6 +64,15 @@ export class SessionEntity {
     this.ee = ee.get(agentIdentifier);
     wrapEvents(this.ee);
     this.setup(opts);
+    if (isBrowserScope) {
+      windowAddEventListener('storage', event => {
+        if (event.key === this.lookupKey) {
+          const obj = typeof event.newValue === 'string' ? JSON.parse(event.newValue) : event.newValue;
+          this.sync(obj);
+          this.ee.emit(SESSION_EVENTS.UPDATE, [SESSION_EVENT_TYPES.CROSS_TAB, this.state]);
+        }
+      });
+    }
   }
   setup(_ref) {
     let {
@@ -190,6 +206,7 @@ export class SessionEntity {
       //
       // TODO - compression would need happen here if we decide to do it
       this.storage.set(this.lookupKey, stringify(this.state));
+      this.ee.emit(SESSION_EVENTS.UPDATE, [SESSION_EVENT_TYPES.SAME_TAB, this.state]);
       return data;
     } catch (e) {
       // storage is inaccessible

package/dist/esm/common/wrap/wrap-function.js

@@ -210,5 +210,5 @@ function copy(from, to, emitter) {
  * @returns {boolean} Whether the passed function is ineligible to be wrapped.
  */
 function notWrappable(fn) {
-  return !(fn && fn instanceof Function && fn.apply && !fn[flag]);
+  return !(fn && typeof fn === 'function' && fn.apply && !fn[flag]);
 }

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

@@ -76,7 +76,6 @@ export class Aggregate extends AggregateBase {
       } else {
         hash = stringify([params.status, params.host, params.pathname]);
       }
-      handle('bstXhrAgg', ['xhr', hash, params, metrics], undefined, FEATURE_NAMES.sessionTrace, ee);
 
       // store as metric
       aggregator.store('xhr', hash, params, metrics);
@@ -90,6 +89,7 @@ export class Aggregate extends AggregateBase {
         }
         return;
       }
+      handle('bstXhrAgg', ['xhr', hash, params, metrics], undefined, FEATURE_NAMES.sessionTrace, ee);
       var xhrContext = this;
       var event = {
         method: params.method,

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

@@ -15,16 +15,43 @@ import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler';
 import { FEATURE_NAME } from '../constants';
 import { stringify } from '../../../common/util/stringify';
 import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config';
-import { SESSION_EVENTS, MODE } from '../../../common/session/session-entity';
+import { SESSION_EVENTS, MODE, SESSION_EVENT_TYPES } from '../../../common/session/session-entity';
 import { AggregateBase } from '../../utils/aggregate-base';
 import { sharedChannel } from '../../../common/constants/shared-channel';
 import { obj as encodeObj } from '../../../common/url/encode';
 import { warn } from '../../../common/util/console';
 import { globalScope } from '../../../common/constants/runtime';
+import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants';
 
 // would be better to get this dynamically in some way
 export const RRWEB_VERSION = '2.0.0-alpha.8';
 export const AVG_COMPRESSION = 0.12;
+export const RRWEB_EVENT_TYPES = {
+  DomContentLoaded: 0,
+  Load: 1,
+  FullSnapshot: 2,
+  IncrementalSnapshot: 3,
+  Meta: 4,
+  Custom: 5
+};
+const ABORT_REASONS = {
+  RESET: {
+    message: 'Session was reset',
+    sm: 'Reset'
+  },
+  IMPORT: {
+    message: 'Recorder failed to import',
+    sm: 'Import'
+  },
+  TOO_MANY: {
+    message: '429: Too Many Requests',
+    sm: 'Too-Many'
+  },
+  TOO_BIG: {
+    message: 'Payload was too large',
+    sm: 'Too-Big'
+  }
+};
 let recorder, gzipper, u8;
 
 /** Vortex caps payload sizes at 1MB */
@@ -58,8 +85,6 @@ export class Aggregate extends AggregateBase {
     /** can shut off efforts to compress the data */
     this.shouldCompress = true;
 
-    /** Payload metadata -- Should indicate that the payload being sent is the first of a session */
-    this.isFirstChunk = false;
     /** Payload metadata -- Should indicate that the payload being sent has a full DOM snapshot. This can happen
      * -- When the recording library begins recording, it starts by taking a DOM snapshot
      * -- When visibility changes from "hidden" -> "visible", it must capture a full snapshot for the replay to work correctly across tabs
@@ -73,16 +98,7 @@ export class Aggregate extends AggregateBase {
     /** Payload metadata -- Should indicate when a replay blob started recording.  Resets each time a harvest occurs.
      * cycle timestamps are used as fallbacks if event timestamps cannot be used
      */
-    this.timestamp = {
-      event: {
-        first: undefined,
-        last: undefined
-      },
-      cycle: {
-        first: undefined,
-        last: undefined
-      }
-    };
+    this.cycleTimestamp = undefined;
 
     /** A value which increments with every new mutation node reported. Resets after a harvest is sent */
     this.payloadBytesEstimation = 0;
@@ -96,7 +112,7 @@ export class Aggregate extends AggregateBase {
     if (shouldSetup) {
       // The SessionEntity class can emit a message indicating the session was cleared and reset (expiry, inactivity). This feature must abort and never resume if that occurs.
       this.ee.on(SESSION_EVENTS.RESET, () => {
-        this.abort();
+        this.abort(ABORT_REASONS.RESET);
       });
 
       // The SessionEntity class can emit a message indicating the session was paused (visibility change). This feature must stop recording if that occurs.
@@ -105,9 +121,19 @@ export class Aggregate extends AggregateBase {
       });
       // The SessionEntity class can emit a message indicating the session was resumed (visibility change). This feature must start running again (if already running) if that occurs.
       this.ee.on(SESSION_EVENTS.RESUME, () => {
+        // if the mode changed on a different tab, it needs to update this instance to match
+        const {
+          session
+        } = getRuntime(this.agentIdentifier);
+        this.mode = session.state.sessionReplay;
         if (!this.initialized || this.mode === MODE.OFF) return;
         this.startRecording();
       });
+      this.ee.on(SESSION_EVENTS.UPDATE, (type, data) => {
+        if (!this.initialized || this.blocked || type !== SESSION_EVENT_TYPES.CROSS_TAB) return;
+        if (this.mode !== MODE.OFF && data.sessionReplay === MODE.OFF) this.abort('Session Entity was set to OFF on another tab');
+        this.mode = data.sessionReplay;
+      });
 
       // Bespoke logic for new endpoint.  This will change as downstream dependencies become solidified.
       this.scheduler = new HarvestScheduler('browser/blobs', {
@@ -123,7 +149,7 @@ export class Aggregate extends AggregateBase {
         this.hasError = true;
         this.errorNoticed = true;
         // run once
-        if (this.mode === MODE.ERROR) {
+        if (this.mode === MODE.ERROR && globalScope?.document.visibilityState === 'visible') {
           this.mode = MODE.FULL;
           // if the error was noticed AFTER the recorder was already imported....
           if (recorder && this.initialized) {
@@ -183,7 +209,7 @@ export class Aggregate extends AggregateBase {
       // Do not change the webpackChunkName or it will break the webpack nrba-chunking plugin
       recorder = (await import( /* webpackChunkName: "recorder" */'rrweb')).record;
     } catch (err) {
-      return this.abort();
+      return this.abort(ABORT_REASONS.IMPORT);
     }
 
     // FULL mode records AND reports from the beginning, while ERROR mode only records (but does not report).
@@ -206,7 +232,6 @@ export class Aggregate extends AggregateBase {
       this.shouldCompress = false;
     }
     this.startRecording();
-    this.isFirstChunk = !!session.isNew;
     this.syncWithSessionManager({
       sessionReplay: this.mode
     });
@@ -221,14 +246,39 @@ export class Aggregate extends AggregateBase {
       this.scheduler.opts.gzip = false;
     }
     // TODO -- Gracefully handle the buffer for retries.
+    const {
+      session
+    } = getRuntime(this.agentIdentifier);
+    if (!session.state.sessionReplaySentFirstChunk) this.syncWithSessionManager({
+      sessionReplaySentFirstChunk: true
+    });
     this.clearBuffer();
     return [payload];
   }
   getHarvestContents() {
     const agentRuntime = getRuntime(this.agentIdentifier);
     const info = getInfo(this.agentIdentifier);
-    const firstTimestamp = this.timestamp.event.first || this.timestamp.cycle.first;
-    const lastTimestamp = this.timestamp.event.last || this.timestamp.cycle.last;
+
+    // do not let the last node be a meta node, since this NEEDS to precede a snapshot
+    // we will manually inject it later if we find a payload that is missing a meta node
+    const payloadEndsWithMeta = this.events[this.events.length - 1]?.type === RRWEB_EVENT_TYPES.Meta;
+    if (payloadEndsWithMeta) {
+      this.lastMeta = this.events[this.events.length - 1];
+      this.events = this.events.slice(0, this.events.length - 1);
+      this.hasMeta = !!this.events.find(x => x.type === RRWEB_EVENT_TYPES.Meta);
+    }
+
+    // do not let the first node be a full snapshot node, since this NEEDS to be preceded by a meta node
+    // we will manually inject it if this happens
+    const payloadStartsWithFullSnapshot = this.events[0]?.type === RRWEB_EVENT_TYPES.FullSnapshot;
+    if (payloadStartsWithFullSnapshot) {
+      this.hasMeta = true;
+      this.events.unshift(this.lastMeta);
+    }
+    const firstEventTimestamp = this.events[0]?.timestamp;
+    const lastEventTimestamp = this.events[this.events.length - 1]?.timestamp;
+    const firstTimestamp = firstEventTimestamp || this.cycleTimestamp;
+    const lastTimestamp = lastEventTimestamp || getRuntime(this.agentIdentifier).offset + globalScope.performance.now();
     return {
       qs: {
         browser_monitoring_key: info.licenseKey,
@@ -242,12 +292,13 @@ export class Aggregate extends AggregateBase {
           'replay.firstTimestamp': firstTimestamp,
           'replay.lastTimestamp': lastTimestamp,
           'replay.durationMs': lastTimestamp - firstTimestamp,
+          'replay.nodes': this.events.length,
           agentVersion: agentRuntime.version,
           session: agentRuntime.session.state.value,
           hasMeta: this.hasMeta,
           hasSnapshot: this.hasSnapshot,
           hasError: this.hasError,
-          isFirstChunk: this.isFirstChunk,
+          isFirstChunk: agentRuntime.session.state.sessionReplaySentFirstChunk === false,
           decompressedBytes: this.payloadBytesEstimation,
           'nr.rrweb.version': RRWEB_VERSION
         }, MAX_PAYLOAD_SIZE - this.payloadBytesEstimation).substring(1) // remove the leading '&'
@@ -259,7 +310,7 @@ export class Aggregate extends AggregateBase {
   onHarvestFinished(result) {
     // The mutual decision for now is to stop recording and clear buffers if ingest is experiencing 429 rate limiting
     if (result.status === 429) {
-      this.abort();
+      this.abort(ABORT_REASONS.TOO_MANY);
     }
     if (this.blocked) this.scheduler.stopTimer(true);
   }
@@ -267,7 +318,6 @@ export class Aggregate extends AggregateBase {
   /** Clears the buffer (this.events), and resets all payload metadata properties */
   clearBuffer() {
     this.events = [];
-    this.isFirstChunk = false;
     this.hasSnapshot = false;
     this.hasMeta = false;
     this.hasError = false;
@@ -279,7 +329,7 @@ export class Aggregate extends AggregateBase {
   startRecording() {
     if (!recorder) {
       warn('Recording library was never imported');
-      return this.abort();
+      return this.abort(ABORT_REASONS.IMPORT);
     }
     this.clearTimestamps();
     // set the fallbacks as early as possible
@@ -315,7 +365,7 @@ export class Aggregate extends AggregateBase {
 
   /** Store a payload in the buffer (this.events).  This should be the callback to the recording lib noticing a mutation */
   store(event, isCheckout) {
-    this.setTimestamps(event);
+    this.setTimestamps();
     if (this.blocked) return;
     const eventBytes = stringify(event).length;
     /** The estimated size of the payload after compression */
@@ -323,7 +373,7 @@ export class Aggregate extends AggregateBase {
     // Vortex will block payloads at a certain size, we might as well not send.
     if (payloadSize > MAX_PAYLOAD_SIZE) {
       this.clearBuffer();
-      return this.abort();
+      return this.abort(ABORT_REASONS.TOO_BIG);
     }
     // Checkout events are flags by the recording lib that indicate a fullsnapshot was taken every n ms. These are important
     // to help reconstruct the replay later and must be included.  While waiting and buffering for errors to come through,
@@ -334,19 +384,13 @@ export class Aggregate extends AggregateBase {
     }
 
     // meta event
-    if (event.type === 4) {
+    if (event.type === RRWEB_EVENT_TYPES.Meta) {
       this.hasMeta = true;
       this.lastMeta = event;
     }
     // snapshot event
-    if (event.type === 2) {
+    if (event.type === RRWEB_EVENT_TYPES.FullSnapshot) {
       this.hasSnapshot = true;
-      // small chance that the meta event got separated from its matching snapshot across payload harvests
-      // it needs to precede the snapshot, so shove it in first.
-      if (!this.hasMeta) {
-        this.events.push(this.lastMeta);
-        this.hasMeta = true;
-      }
     }
     this.events.push(event);
     this.payloadBytesEstimation += eventBytes;
@@ -364,26 +408,12 @@ export class Aggregate extends AggregateBase {
     if (!recorder) return;
     recorder.takeFullSnapshot();
   }
-  setTimestamps(event) {
+  setTimestamps() {
     // fallbacks if timestamps cannot be derived from rrweb events
-    this.timestamp.cycle.last = getRuntime(this.agentIdentifier).offset + globalScope.performance.now();
-    if (!this.timestamp.cycle.first) this.timestamp.cycle.first = this.timestamp.cycle.last;
-    // timestamps based on rrweb events
-    if (!event || !event.timestamp) return;
-    if (!this.timestamp.event.first) this.timestamp.event.first = event.timestamp;
-    this.timestamp.event.last = event.timestamp;
+    if (!this.cycleTimestamp) this.cycleTimestamp = getRuntime(this.agentIdentifier).offset + globalScope.performance.now();
   }
   clearTimestamps() {
-    this.timestamp = {
-      event: {
-        first: undefined,
-        last: undefined
-      },
-      cycle: {
-        first: undefined,
-        last: undefined
-      }
-    };
+    this.cycleTimestamp = undefined;
   }
 
   /** Estimate the payload size */
@@ -395,6 +425,9 @@ export class Aggregate extends AggregateBase {
 
   /** Abort the feature, once aborted it will not resume */
   abort() {
+    let reason = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    warn("SR aborted -- ".concat(reason.message));
+    this.ee.emit(SUPPORTABILITY_METRIC_CHANNEL, ["SessionReplay/Abort/".concat(ABORT_REASONS[reason.sm])]);
     this.blocked = true;
     this.mode = MODE.OFF;
     this.stopRecording();

package/dist/esm/features/utils/feature-base.js

@@ -1,4 +1,3 @@
-import { getRuntime } from '../../common/config/config';
 import { ee } from '../../common/event-emitter/contextual-ee';
 export class FeatureBase {
   constructor(agentIdentifier, aggregator, featureName) {
@@ -7,7 +6,7 @@ export class FeatureBase {
     /** @type {Aggregator} */
     this.aggregator = aggregator;
     /** @type {ContextualEE} */
-    this.ee = ee.get(agentIdentifier, getRuntime(this.agentIdentifier).isolatedBacklog);
+    this.ee = ee.get(agentIdentifier);
     /** @type {string} */
     this.featureName = featureName;
     /**

package/dist/esm/features/utils/instrument-base.js

@@ -114,6 +114,7 @@ export class InstrumentBase extends FeatureBase {
         warn("Downloading and initializing ".concat(this.featureName, " failed..."), e);
         this.abortHandler?.(); // undo any important alterations made to the page
         // not supported yet but nice to do: "abort" this agent's EE for this feature specifically
+        drain(this.agentIdentifier, this.featureName);
         loadedSuccessfully(false);
       }
     };

package/dist/esm/loaders/api/api.js

@@ -17,7 +17,7 @@ export const CUSTOM_ATTR_GROUP = 'CUSTOM/'; // the subgroup items should be stor
 
 export function setTopLevelCallers() {
   const nr = gosCDN();
-  const funcs = ['setErrorHandler', 'finished', 'addToTrace', 'inlineHit', 'addRelease', 'addPageAction', 'setCurrentRouteName', 'setPageViewName', 'setCustomAttribute', 'interaction', 'noticeError', 'setUserId', 'setApplicationVersion', 'start'];
+  const funcs = ['setErrorHandler', 'finished', 'addToTrace', 'addRelease', 'addPageAction', 'setCurrentRouteName', 'setPageViewName', 'setCustomAttribute', 'interaction', 'noticeError', 'setUserId', 'setApplicationVersion', 'start'];
   funcs.forEach(f => {
     nr[f] = function () {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -44,7 +44,7 @@ export function setAPI(agentIdentifier, forceDrain) {
   const apiInterface = {};
   var instanceEE = ee.get(agentIdentifier);
   var tracerEE = instanceEE.get('tracer');
-  var asyncApiFns = ['setErrorHandler', 'finished', 'addToTrace', 'inlineHit', 'addRelease'];
+  var asyncApiFns = ['setErrorHandler', 'finished', 'addToTrace', 'addRelease'];
   var prefix = 'api-';
   var spaPrefix = prefix + 'ixn-';