@newrelic/browser-agent 1.261.1 → 1.262.0

package/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.262.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.261.2...v1.262.0) (2024-07-09)
+
+
+### Features
+
+* logging bundle optimization ([#1089](https://github.com/newrelic/newrelic-browser-agent/issues/1089)) ([83d7d1e](https://github.com/newrelic/newrelic-browser-agent/commit/83d7d1ed1863772e5515d128d0710cb456dafafd))
+
+
+### Bug Fixes
+
+* address call to stopTimer on undefined scheduler ([#1104](https://github.com/newrelic/newrelic-browser-agent/issues/1104)) ([5022134](https://github.com/newrelic/newrelic-browser-agent/commit/5022134783152e7eebbd54608eda5a09e8fe0ebb))
+* Release backlog memory when features are blocked by RUM ([#1102](https://github.com/newrelic/newrelic-browser-agent/issues/1102)) ([5eb9164](https://github.com/newrelic/newrelic-browser-agent/commit/5eb91646314b5a225a1a902ecb0b58b57b5ee74f))
+* safeguard api calls ([#1103](https://github.com/newrelic/newrelic-browser-agent/issues/1103)) ([3d815a3](https://github.com/newrelic/newrelic-browser-agent/commit/3d815a3988583911322541007bd5e176a5bba4c1))
+
+## [1.261.2](https://github.com/newrelic/newrelic-browser-agent/compare/v1.261.1...v1.261.2) (2024-07-01)
+
+
+### Bug Fixes
+
+* recordReplay will restart replays on same session page loads ([#1093](https://github.com/newrelic/newrelic-browser-agent/issues/1093)) ([cecddbe](https://github.com/newrelic/newrelic-browser-agent/commit/cecddbebc445dabcf3ce48c1fc88311198be6d0a))
+
 ## [1.261.1](https://github.com/newrelic/newrelic-browser-agent/compare/v1.261.0...v1.261.1) (2024-06-26)
 
 

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

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.261.1";
+const VERSION = exports.VERSION = "1.262.0";
 
 /**
  * Exposes the build type of the agent

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

@@ -12,7 +12,7 @@ exports.VERSION = exports.RRWEB_VERSION = exports.DIST_METHOD = exports.BUILD_EN
 /**
  * Exposes the version of the agent
  */
-const VERSION = exports.VERSION = "1.261.1";
+const VERSION = exports.VERSION = "1.262.0";
 
 /**
  * Exposes the build type of the agent

package/dist/cjs/common/drain/drain.js

@@ -42,8 +42,9 @@ function registerDrain(agentIdentifier, group) {
  * @param {*} group - The named "bucket" to be removed from the registry
  */
 function deregisterDrain(agentIdentifier, group) {
-  curateRegistry(agentIdentifier);
+  if (!agentIdentifier || !registry[agentIdentifier]) return;
   if (registry[agentIdentifier].get(group)) registry[agentIdentifier].delete(group);
+  drainGroup(agentIdentifier, group, false);
   if (registry[agentIdentifier].size) checkCanDrainAll(agentIdentifier);
 }
 
@@ -103,27 +104,32 @@ function checkCanDrainAll(agentIdentifier) {
    * @param {*} group - The name of a particular feature's event "bucket".
    */
 function drainGroup(agentIdentifier, group) {
+  let activateGroup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   const baseEE = agentIdentifier ? _contextualEe.ee.get(agentIdentifier) : _contextualEe.ee;
   const handlers = _registerHandler.registerHandler.handlers; // other storage in registerHandler
   if (!baseEE.backlog || !handlers) return;
-  var bufferedEventsInGroup = baseEE.backlog[group];
-  var groupHandlers = handlers[group]; // each group in the registerHandler storage
-  if (groupHandlers) {
-    // We don't cache the length of the buffer while looping because events might still be added while processing.
-    for (var i = 0; bufferedEventsInGroup && i < bufferedEventsInGroup.length; ++i) {
-      // eslint-disable-line no-unmodified-loop-condition
-      emitEvent(bufferedEventsInGroup[i], groupHandlers);
-    }
-    (0, _mapOwn.mapOwn)(groupHandlers, function (eventType, handlerRegistrationList) {
-      (0, _mapOwn.mapOwn)(handlerRegistrationList, function (i, registration) {
-        // registration is an array of: [targetEE, eventHandler]
-        registration[0].on(eventType, registration[1]);
+
+  // Only activated features being drained should run queued listeners on buffered events. Deactivated features only need to release memory.
+  if (activateGroup) {
+    const bufferedEventsInGroup = baseEE.backlog[group];
+    const groupHandlers = handlers[group]; // each group in the registerHandler storage
+    if (groupHandlers) {
+      // We don't cache the length of the buffer while looping because events might still be added while processing.
+      for (let i = 0; bufferedEventsInGroup && i < bufferedEventsInGroup.length; ++i) {
+        // eslint-disable-line no-unmodified-loop-condition
+        emitEvent(bufferedEventsInGroup[i], groupHandlers);
+      }
+      (0, _mapOwn.mapOwn)(groupHandlers, function (eventType, handlerRegistrationList) {
+        (0, _mapOwn.mapOwn)(handlerRegistrationList, function (i, registration) {
+          // registration is an array of: [targetEE, eventHandler]
+          registration[0].on(eventType, registration[1]);
+        });
       });
-    });
+    }
   }
   if (!baseEE.isolatedBacklog) delete handlers[group];
   baseEE.backlog[group] = null;
-  baseEE.emit('drain-' + group, []);
+  baseEE.emit('drain-' + group, []); // TODO: Code exists purely for a unit test and needs to be refined
 }
 
 /**

package/dist/cjs/common/wrap/wrap-logger.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.scopedEE = scopedEE;
 exports.wrapLogger = wrapLogger;
+var _constants = require("../../features/logging/constants");
 var _contextualEe = require("../event-emitter/contextual-ee");
 var _eventContext = require("../event-emitter/event-context");
+var _console = require("../util/console");
 var _wrapFunction = require("./wrap-function");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -26,6 +28,7 @@ var _wrapFunction = require("./wrap-function");
  */
 // eslint-disable-next-line
 function wrapLogger(sharedEE, parent, loggerFn, context) {
+  if (!(typeof parent === 'object' && !!parent && typeof loggerFn === 'string' && !!loggerFn && typeof parent[loggerFn] === 'function')) return (0, _console.warn)(_constants.LOGGING_FAILURE_MESSAGE + 'invalid argument(s)');
   const ee = scopedEE(sharedEE);
   const wrapFn = (0, _wrapFunction.createWrapperWithEmitter)(ee);
 

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

@@ -14,6 +14,7 @@ var _constants = require("../../metrics/constants");
 var _aggregateBase = require("../../utils/aggregate-base");
 var _constants2 = require("../constants");
 var _log = require("../shared/log");
+var _utils = require("../shared/utils");
 class Aggregate extends _aggregateBase.AggregateBase {
   static featureName = _constants2.FEATURE_NAME;
   #agentRuntime;
@@ -44,13 +45,37 @@ class Aggregate extends _aggregateBase.AggregateBase {
       this.drain();
     });
   }
-  handleLog(timestamp, message, attributes, level) {
+  handleLog(timestamp, message) {
+    let attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    let level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _constants2.LOG_LEVELS.INFO;
     if (this.blocked) return;
+    if (!attributes || typeof attributes !== 'object') attributes = {};
+    if (typeof level === 'string') level = level.toUpperCase();
+    if (!(0, _utils.isValidLogLevel)(level)) return (0, _console.warn)(_constants2.LOGGING_LEVEL_FAILURE_MESSAGE + level, Object.values(_constants2.LOG_LEVELS));
+    try {
+      if (typeof message !== 'string') {
+        const stringified = (0, _stringify.stringify)(message);
+        /**
+           * Error instances convert to `{}` when stringified
+           * Symbol converts to '' when stringified
+           * other cases tbd
+           * */
+        if (!!stringified && stringified !== '{}') message = stringified;else message = String(message);
+      }
+    } catch (err) {
+      (0, _console.warn)('could not cast log message to string', message);
+      return;
+    }
+    if (typeof message !== 'string' || !message) return (0, _console.warn)(_constants2.LOGGING_IGNORED + 'invalid message');
+    if (message.length > _constants2.MAX_PAYLOAD_SIZE) {
+      (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', message.length]);
+      return (0, _console.warn)(_constants2.LOGGING_IGNORED + '> ' + _constants2.MAX_PAYLOAD_SIZE + ' bytes: ', message.slice(0, 25) + '...');
+    }
     const log = new _log.Log(this.#agentRuntime.timeKeeper.convertRelativeTimestamp(timestamp), message, attributes, level);
     const logBytes = log.message.length + (0, _stringify.stringify)(log.attributes).length + log.level.length + 10; // timestamp == 10 chars
     if (logBytes > _constants2.MAX_PAYLOAD_SIZE) {
       (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', logBytes]);
-      return (0, _console.warn)(_constants2.LOGGING_IGNORED + '> ' + _constants2.MAX_PAYLOAD_SIZE + ' bytes', log.message.slice(0, 25) + '...');
+      return (0, _console.warn)(_constants2.LOGGING_IGNORED + '> ' + _constants2.MAX_PAYLOAD_SIZE + ' bytes: ', log.message.slice(0, 25) + '...');
     }
     if (this.estimatedBytes + logBytes >= _constants2.MAX_PAYLOAD_SIZE) {
       (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Early/Seen', this.estimatedBytes + logBytes]);

package/dist/cjs/features/logging/shared/utils.js

@@ -7,8 +7,6 @@ exports.bufferLog = bufferLog;
 exports.isValidLogLevel = isValidLogLevel;
 var _handle = require("../../../common/event-emitter/handle");
 var _now = require("../../../common/timing/now");
-var _console = require("../../../common/util/console");
-var _stringify = require("../../../common/util/stringify");
 var _features = require("../../../loaders/features/features");
 var _constants = require("../../metrics/constants");
 var _constants2 = require("../constants");
@@ -21,30 +19,16 @@ var _constants2 = require("../constants");
 function bufferLog(ee, message) {
   let customAttributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   let level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : _constants2.LOG_LEVELS.INFO;
-  try {
-    if (typeof message !== 'string') {
-      const stringified = (0, _stringify.stringify)(message);
-      /**
-       * Error instances convert to `{}` when stringified
-       * Symbol converts to '' when stringified
-       * other cases tbd
-       * */
-      if (!!stringified && stringified !== '{}') message = stringified;else message = String(message);
-    }
-  } catch (err) {
-    (0, _console.warn)('could not cast log message to string', message);
-    return;
-  }
   (0, _handle.handle)(_constants.SUPPORTABILITY_METRIC_CHANNEL, ["API/logging/".concat(level.toLowerCase(), "/called")], undefined, _features.FEATURE_NAMES.metrics, ee);
   (0, _handle.handle)(_constants2.LOGGING_EVENT_EMITTER_CHANNEL, [(0, _now.now)(), message, customAttributes, level], undefined, _features.FEATURE_NAMES.logging, ee);
 }
 
 /**
  * Checks if a supplied log level is acceptable for use in generating a log event
- * @param {string} level
+ * @param {string} level -- must be cast to uppercase before running this test
  * @returns {boolean}
  */
 function isValidLogLevel(level) {
   if (typeof level !== 'string') return false;
-  return Object.values(_constants2.LOG_LEVELS).some(logLevel => logLevel.toUpperCase() === level.toUpperCase());
+  return Object.values(_constants2.LOG_LEVELS).some(logLevel => logLevel === level);
 }

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

@@ -32,7 +32,7 @@ class Instrument extends _instrumentBase.InstrumentBase {
       session = JSON.parse(localStorage.getItem("".concat(_constants.PREFIX, "_").concat(_constants.DEFAULT_KEY)));
     } catch (err) {}
     if ((0, _utils.hasReplayPrerequisite)(agentIdentifier)) {
-      this.ee.on('recordReplay', () => this.#apiStartOrRestartReplay());
+      this.ee.on(_constants2.SR_EVENT_EMITTER_TYPES.RECORD, () => this.#apiStartOrRestartReplay());
     }
     if (this.#canPreloadRecorder(session)) {
       this.#mode = session?.sessionReplayMode;

package/dist/cjs/features/session_replay/shared/utils.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.buildNRMetaNode = buildNRMetaNode;
-exports.canImportReplayAgg = canImportReplayAgg;
 exports.hasReplayPrerequisite = hasReplayPrerequisite;
 exports.isPreloadAllowed = isPreloadAllowed;
 var _config = require("../../../common/config/config");
@@ -20,10 +19,6 @@ function hasReplayPrerequisite(agentId) {
 function isPreloadAllowed(agentId) {
   return (0, _config.getConfigurationValue)(agentId, 'session_replay.preload') === true && hasReplayPrerequisite(agentId);
 }
-function canImportReplayAgg(agentId, sessionMgr) {
-  if (!hasReplayPrerequisite(agentId)) return false;
-  return !!sessionMgr?.isNew || !!sessionMgr?.state.sessionReplayMode; // Session Replay should only try to run if already running from a previous page, or at the beginning of a session
-}
 function buildNRMetaNode(timestamp, timeKeeper) {
   const correctedTimestamp = timeKeeper.correctAbsoluteTimestamp(timestamp);
   return {

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

@@ -242,7 +242,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.agentRuntime.session.write({
       sessionTraceMode: this.mode
     });
-    this.scheduler.stopTimer();
+    this.scheduler?.stopTimer();
   }
 }
 exports.Aggregate = Aggregate;

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

@@ -137,8 +137,15 @@ class InstrumentBase extends _featureBase.FeatureBase {
   * @returns
   */
   #shouldImportAgg(featureName, session) {
-    if (featureName === _features.FEATURE_NAMES.sessionReplay) return (0, _utils.canImportReplayAgg)(this.agentIdentifier, session);
-    return !(featureName === _features.FEATURE_NAMES.sessionTrace && !session);
+    switch (featureName) {
+      case _features.FEATURE_NAMES.sessionReplay:
+        // the session manager must be initialized successfully for Replay & Trace features
+        return (0, _utils.hasReplayPrerequisite)(this.agentIdentifier) && !!session;
+      case _features.FEATURE_NAMES.sessionTrace:
+        return !!session;
+      default:
+        return true;
+    }
   }
 }
 exports.InstrumentBase = InstrumentBase;

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

@@ -43,7 +43,9 @@ function setTopLevelCallers() {
     }
     let returnVals = [];
     Object.values(nr.initializedAgents).forEach(val => {
-      if (val.exposed && val.api[fnName]) {
+      if (!val || !val.api) {
+        (0, _console.warn)("Call to api '".concat(fnName, "' made before agent fully initialized."));
+      } else if (val.exposed && val.api[fnName]) {
         returnVals.push(val.api[fnName](...args));
       }
     });
@@ -68,23 +70,16 @@ function setAPI(agentIdentifier, forceDrain) {
       customAttributes = {},
       level = _constants4.LOG_LEVELS.INFO
     } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    if (!customAttributes || typeof customAttributes !== 'object') customAttributes = {};
-    if (typeof message !== 'string' || !message) return (0, _console.warn)(_constants4.LOGGING_IGNORED + 'invalid message');
-    if (!(0, _utils.isValidLogLevel)(level)) return (0, _console.warn)(_constants4.LOGGING_LEVEL_FAILURE_MESSAGE + level, _constants4.LOG_LEVELS);
-    if (message.length > _constants4.MAX_PAYLOAD_SIZE) return (0, _console.warn)(_constants4.LOGGING_IGNORED + '> ' + _constants4.MAX_PAYLOAD_SIZE + ' bytes: ', message.slice(0, 25) + '...');
-    (0, _utils.bufferLog)(instanceEE, message, customAttributes, level.toUpperCase());
+    (0, _utils.bufferLog)(instanceEE, message, customAttributes, level);
   };
   apiInterface.wrapLogger = function (parent, functionName) {
     let {
       customAttributes = {},
       level = _constants4.LOG_LEVELS.INFO
     } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    if (!customAttributes || typeof customAttributes !== 'object') customAttributes = {};
-    if (!(typeof parent === 'object' && !!parent && typeof functionName === 'string' && !!functionName && typeof parent[functionName] === 'function' && typeof customAttributes === 'object')) return (0, _console.warn)(_constants4.LOGGING_FAILURE_MESSAGE + 'invalid argument(s)');
-    if (!(0, _utils.isValidLogLevel)(level)) return (0, _console.warn)(_constants4.LOGGING_FAILURE_MESSAGE + _constants4.LOGGING_LEVEL_FAILURE_MESSAGE + level, _constants4.LOG_LEVELS);
     (0, _wrapLogger.wrapLogger)(instanceEE, parent, functionName, {
       customAttributes,
-      level: level.toUpperCase()
+      level
     });
   };
 

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

@@ -6,7 +6,7 @@
 /**
  * Exposes the version of the agent
  */
-export const VERSION = "1.261.1";
+export const VERSION = "1.262.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.261.1";
+export const VERSION = "1.262.0";
 
 /**
  * Exposes the build type of the agent

package/dist/esm/common/drain/drain.js

@@ -34,8 +34,9 @@ export function registerDrain(agentIdentifier, group) {
  * @param {*} group - The named "bucket" to be removed from the registry
  */
 export function deregisterDrain(agentIdentifier, group) {
-  curateRegistry(agentIdentifier);
+  if (!agentIdentifier || !registry[agentIdentifier]) return;
   if (registry[agentIdentifier].get(group)) registry[agentIdentifier].delete(group);
+  drainGroup(agentIdentifier, group, false);
   if (registry[agentIdentifier].size) checkCanDrainAll(agentIdentifier);
 }
 
@@ -95,27 +96,32 @@ function checkCanDrainAll(agentIdentifier) {
    * @param {*} group - The name of a particular feature's event "bucket".
    */
 function drainGroup(agentIdentifier, group) {
+  let activateGroup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   const baseEE = agentIdentifier ? ee.get(agentIdentifier) : ee;
   const handlers = defaultRegister.handlers; // other storage in registerHandler
   if (!baseEE.backlog || !handlers) return;
-  var bufferedEventsInGroup = baseEE.backlog[group];
-  var groupHandlers = handlers[group]; // each group in the registerHandler storage
-  if (groupHandlers) {
-    // We don't cache the length of the buffer while looping because events might still be added while processing.
-    for (var i = 0; bufferedEventsInGroup && i < bufferedEventsInGroup.length; ++i) {
-      // eslint-disable-line no-unmodified-loop-condition
-      emitEvent(bufferedEventsInGroup[i], groupHandlers);
-    }
-    mapOwn(groupHandlers, function (eventType, handlerRegistrationList) {
-      mapOwn(handlerRegistrationList, function (i, registration) {
-        // registration is an array of: [targetEE, eventHandler]
-        registration[0].on(eventType, registration[1]);
+
+  // Only activated features being drained should run queued listeners on buffered events. Deactivated features only need to release memory.
+  if (activateGroup) {
+    const bufferedEventsInGroup = baseEE.backlog[group];
+    const groupHandlers = handlers[group]; // each group in the registerHandler storage
+    if (groupHandlers) {
+      // We don't cache the length of the buffer while looping because events might still be added while processing.
+      for (let i = 0; bufferedEventsInGroup && i < bufferedEventsInGroup.length; ++i) {
+        // eslint-disable-line no-unmodified-loop-condition
+        emitEvent(bufferedEventsInGroup[i], groupHandlers);
+      }
+      mapOwn(groupHandlers, function (eventType, handlerRegistrationList) {
+        mapOwn(handlerRegistrationList, function (i, registration) {
+          // registration is an array of: [targetEE, eventHandler]
+          registration[0].on(eventType, registration[1]);
+        });
       });
-    });
+    }
   }
   if (!baseEE.isolatedBacklog) delete handlers[group];
   baseEE.backlog[group] = null;
-  baseEE.emit('drain-' + group, []);
+  baseEE.emit('drain-' + group, []); // TODO: Code exists purely for a unit test and needs to be refined
 }
 
 /**

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

@@ -7,8 +7,10 @@
  * This module is used by: jserrors, spa.
  */
 
+import { LOGGING_FAILURE_MESSAGE } from '../../features/logging/constants';
 import { ee as baseEE, contextId } from '../event-emitter/contextual-ee';
 import { EventContext } from '../event-emitter/event-context';
+import { warn } from '../util/console';
 import { createWrapperWithEmitter as wfn } from './wrap-function';
 
 /**
@@ -20,6 +22,7 @@ import { createWrapperWithEmitter as wfn } from './wrap-function';
  */
 // eslint-disable-next-line
 export function wrapLogger(sharedEE, parent, loggerFn, context) {
+  if (!(typeof parent === 'object' && !!parent && typeof loggerFn === 'string' && !!loggerFn && typeof parent[loggerFn] === 'function')) return warn(LOGGING_FAILURE_MESSAGE + 'invalid argument(s)');
   const ee = scopedEE(sharedEE);
   const wrapFn = wfn(ee);
 

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

@@ -6,8 +6,9 @@ import { warn } from '../../../common/util/console';
 import { stringify } from '../../../common/util/stringify';
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants';
 import { AggregateBase } from '../../utils/aggregate-base';
-import { FEATURE_NAME, LOGGING_EVENT_EMITTER_CHANNEL, LOGGING_IGNORED, MAX_PAYLOAD_SIZE } from '../constants';
+import { FEATURE_NAME, LOGGING_EVENT_EMITTER_CHANNEL, LOGGING_IGNORED, LOGGING_LEVEL_FAILURE_MESSAGE, LOG_LEVELS, MAX_PAYLOAD_SIZE } from '../constants';
 import { Log } from '../shared/log';
+import { isValidLogLevel } from '../shared/utils';
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME;
   #agentRuntime;
@@ -38,13 +39,37 @@ export class Aggregate extends AggregateBase {
       this.drain();
     });
   }
-  handleLog(timestamp, message, attributes, level) {
+  handleLog(timestamp, message) {
+    let attributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    let level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : LOG_LEVELS.INFO;
     if (this.blocked) return;
+    if (!attributes || typeof attributes !== 'object') attributes = {};
+    if (typeof level === 'string') level = level.toUpperCase();
+    if (!isValidLogLevel(level)) return warn(LOGGING_LEVEL_FAILURE_MESSAGE + level, Object.values(LOG_LEVELS));
+    try {
+      if (typeof message !== 'string') {
+        const stringified = stringify(message);
+        /**
+           * Error instances convert to `{}` when stringified
+           * Symbol converts to '' when stringified
+           * other cases tbd
+           * */
+        if (!!stringified && stringified !== '{}') message = stringified;else message = String(message);
+      }
+    } catch (err) {
+      warn('could not cast log message to string', message);
+      return;
+    }
+    if (typeof message !== 'string' || !message) return warn(LOGGING_IGNORED + 'invalid message');
+    if (message.length > MAX_PAYLOAD_SIZE) {
+      handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', message.length]);
+      return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes: ', message.slice(0, 25) + '...');
+    }
     const log = new Log(this.#agentRuntime.timeKeeper.convertRelativeTimestamp(timestamp), message, attributes, level);
     const logBytes = log.message.length + stringify(log.attributes).length + log.level.length + 10; // timestamp == 10 chars
     if (logBytes > MAX_PAYLOAD_SIZE) {
       handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', logBytes]);
-      return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes', log.message.slice(0, 25) + '...');
+      return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes: ', log.message.slice(0, 25) + '...');
     }
     if (this.estimatedBytes + logBytes >= MAX_PAYLOAD_SIZE) {
       handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Early/Seen', this.estimatedBytes + logBytes]);

package/dist/esm/features/logging/shared/utils.js

@@ -1,7 +1,5 @@
 import { handle } from '../../../common/event-emitter/handle';
 import { now } from '../../../common/timing/now';
-import { warn } from '../../../common/util/console';
-import { stringify } from '../../../common/util/stringify';
 import { FEATURE_NAMES } from '../../../loaders/features/features';
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants';
 import { LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS } from '../constants';
@@ -15,30 +13,16 @@ import { LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS } from '../constants';
 export function bufferLog(ee, message) {
   let customAttributes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   let level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : LOG_LEVELS.INFO;
-  try {
-    if (typeof message !== 'string') {
-      const stringified = stringify(message);
-      /**
-       * Error instances convert to `{}` when stringified
-       * Symbol converts to '' when stringified
-       * other cases tbd
-       * */
-      if (!!stringified && stringified !== '{}') message = stringified;else message = String(message);
-    }
-  } catch (err) {
-    warn('could not cast log message to string', message);
-    return;
-  }
   handle(SUPPORTABILITY_METRIC_CHANNEL, ["API/logging/".concat(level.toLowerCase(), "/called")], undefined, FEATURE_NAMES.metrics, ee);
   handle(LOGGING_EVENT_EMITTER_CHANNEL, [now(), message, customAttributes, level], undefined, FEATURE_NAMES.logging, ee);
 }
 
 /**
  * Checks if a supplied log level is acceptable for use in generating a log event
- * @param {string} level
+ * @param {string} level -- must be cast to uppercase before running this test
  * @returns {boolean}
  */
 export function isValidLogLevel(level) {
   if (typeof level !== 'string') return false;
-  return Object.values(LOG_LEVELS).some(logLevel => logLevel.toUpperCase() === level.toUpperCase());
+  return Object.values(LOG_LEVELS).some(logLevel => logLevel === level);
 }

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

@@ -26,7 +26,7 @@ export class Instrument extends InstrumentBase {
       session = JSON.parse(localStorage.getItem("".concat(PREFIX, "_").concat(DEFAULT_KEY)));
     } catch (err) {}
     if (hasReplayPrerequisite(agentIdentifier)) {
-      this.ee.on('recordReplay', () => this.#apiStartOrRestartReplay());
+      this.ee.on(SR_EVENT_EMITTER_TYPES.RECORD, () => this.#apiStartOrRestartReplay());
     }
     if (this.#canPreloadRecorder(session)) {
       this.#mode = session?.sessionReplayMode;

package/dist/esm/features/session_replay/shared/utils.js

@@ -11,10 +11,6 @@ export function hasReplayPrerequisite(agentId) {
 export function isPreloadAllowed(agentId) {
   return getConfigurationValue(agentId, 'session_replay.preload') === true && hasReplayPrerequisite(agentId);
 }
-export function canImportReplayAgg(agentId, sessionMgr) {
-  if (!hasReplayPrerequisite(agentId)) return false;
-  return !!sessionMgr?.isNew || !!sessionMgr?.state.sessionReplayMode; // Session Replay should only try to run if already running from a previous page, or at the beginning of a session
-}
 export function buildNRMetaNode(timestamp, timeKeeper) {
   const correctedTimestamp = timeKeeper.correctAbsoluteTimestamp(timestamp);
   return {

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

@@ -236,6 +236,6 @@ export class Aggregate extends AggregateBase {
     this.agentRuntime.session.write({
       sessionTraceMode: this.mode
     });
-    this.scheduler.stopTimer();
+    this.scheduler?.stopTimer();
   }
 }

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

@@ -11,7 +11,7 @@ import { isBrowserScope } from '../../common/constants/runtime';
 import { warn } from '../../common/util/console';
 import { FEATURE_NAMES } from '../../loaders/features/features';
 import { getConfigurationValue } from '../../common/config/config';
-import { canImportReplayAgg } from '../session_replay/shared/utils';
+import { hasReplayPrerequisite } from '../session_replay/shared/utils';
 import { canEnableSessionTracking } from './feature-gates';
 import { single } from '../../common/util/invoke';
 
@@ -132,7 +132,14 @@ export class InstrumentBase extends FeatureBase {
   * @returns
   */
   #shouldImportAgg(featureName, session) {
-    if (featureName === FEATURE_NAMES.sessionReplay) return canImportReplayAgg(this.agentIdentifier, session);
-    return !(featureName === FEATURE_NAMES.sessionTrace && !session);
+    switch (featureName) {
+      case FEATURE_NAMES.sessionReplay:
+        // the session manager must be initialized successfully for Replay & Trace features
+        return hasReplayPrerequisite(this.agentIdentifier) && !!session;
+      case FEATURE_NAMES.sessionTrace:
+        return !!session;
+      default:
+        return true;
+    }
   }
 }

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

@@ -16,8 +16,8 @@ import { apiMethods, asyncApiMethods } from './api-methods';
 import { SR_EVENT_EMITTER_TYPES } from '../../features/session_replay/constants';
 import { now } from '../../common/timing/now';
 import { MODE } from '../../common/session/constants';
-import { LOGGING_FAILURE_MESSAGE, LOGGING_IGNORED, LOGGING_LEVEL_FAILURE_MESSAGE, LOG_LEVELS, MAX_PAYLOAD_SIZE } from '../../features/logging/constants';
-import { bufferLog, isValidLogLevel } from '../../features/logging/shared/utils';
+import { LOG_LEVELS } from '../../features/logging/constants';
+import { bufferLog } from '../../features/logging/shared/utils';
 import { wrapLogger } from '../../common/wrap/wrap-logger';
 export function setTopLevelCallers() {
   const nr = gosCDN();
@@ -35,7 +35,9 @@ export function setTopLevelCallers() {
     }
     let returnVals = [];
     Object.values(nr.initializedAgents).forEach(val => {
-      if (val.exposed && val.api[fnName]) {
+      if (!val || !val.api) {
+        warn("Call to api '".concat(fnName, "' made before agent fully initialized."));
+      } else if (val.exposed && val.api[fnName]) {
         returnVals.push(val.api[fnName](...args));
       }
     });
@@ -60,23 +62,16 @@ export function setAPI(agentIdentifier, forceDrain) {
       customAttributes = {},
       level = LOG_LEVELS.INFO
     } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    if (!customAttributes || typeof customAttributes !== 'object') customAttributes = {};
-    if (typeof message !== 'string' || !message) return warn(LOGGING_IGNORED + 'invalid message');
-    if (!isValidLogLevel(level)) return warn(LOGGING_LEVEL_FAILURE_MESSAGE + level, LOG_LEVELS);
-    if (message.length > MAX_PAYLOAD_SIZE) return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes: ', message.slice(0, 25) + '...');
-    bufferLog(instanceEE, message, customAttributes, level.toUpperCase());
+    bufferLog(instanceEE, message, customAttributes, level);
   };
   apiInterface.wrapLogger = function (parent, functionName) {
     let {
       customAttributes = {},
       level = LOG_LEVELS.INFO
     } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    if (!customAttributes || typeof customAttributes !== 'object') customAttributes = {};
-    if (!(typeof parent === 'object' && !!parent && typeof functionName === 'string' && !!functionName && typeof parent[functionName] === 'function' && typeof customAttributes === 'object')) return warn(LOGGING_FAILURE_MESSAGE + 'invalid argument(s)');
-    if (!isValidLogLevel(level)) return warn(LOGGING_FAILURE_MESSAGE + LOGGING_LEVEL_FAILURE_MESSAGE + level, LOG_LEVELS);
     wrapLogger(instanceEE, parent, functionName, {
       customAttributes,
-      level: level.toUpperCase()
+      level
     });
   };
 

package/dist/types/common/drain/drain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drain.d.ts","sourceRoot":"","sources":["../../../../src/common/drain/drain.js"],"names":[],"mappings":"AAYA;;;;;;;GAOG;AACH,+CAHW,MAAM,SACN,MAAM,QAQhB;AAED;;;;GAIG;AACH,iDAHW,GAAC,SACD,GAAC,QAMX;AAYD;;;;;;GAMG;AACH,wCAJW,MAAM,gBACN,MAAM,UACN,OAAO,QAajB"}
+{"version":3,"file":"drain.d.ts","sourceRoot":"","sources":["../../../../src/common/drain/drain.js"],"names":[],"mappings":"AAYA;;;;;;;GAOG;AACH,+CAHW,MAAM,SACN,MAAM,QAQhB;AAED;;;;GAIG;AACH,iDAHW,GAAC,SACD,GAAC,QAOX;AAYD;;;;;;GAMG;AACH,wCAJW,MAAM,gBACN,MAAM,UACN,OAAO,QAajB"}

package/dist/types/common/wrap/wrap-logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-logger.d.ts","sourceRoot":"","sources":["../../../../src/common/wrap/wrap-logger.js"],"names":[],"mappings":"AAaA;;;;;;GAMG;AAEH,qCANW,MAAM,UACN,MAAM,YACN,MAAM,iBACJ,MAAM,CAmBlB;AAED;;;;;;GAMG;AACH,mCAJW,MAAM,GAEJ,MAAM,CAIlB"}
+{"version":3,"file":"wrap-logger.d.ts","sourceRoot":"","sources":["../../../../src/common/wrap/wrap-logger.js"],"names":[],"mappings":"AAeA;;;;;;GAMG;AAEH,qCANW,MAAM,UACN,MAAM,YACN,MAAM,iBACJ,MAAM,CAoBlB;AAED;;;;;;GAMG;AACH,mCAJW,MAAM,GAEJ,MAAM,CAIlB"}

package/dist/types/features/logging/aggregate/index.d.ts

@@ -9,7 +9,7 @@ export class Aggregate extends AggregateBase {
     estimatedBytes: number;
     harvestTimeSeconds: any;
     scheduler: HarvestScheduler;
-    handleLog(timestamp: any, message: any, attributes: any, level: any): void;
+    handleLog(timestamp: any, message: any, attributes?: {}, level?: string): void;
     prepareHarvest(): {
         qs: {
             browser_monitoring_key: any;

package/dist/types/features/logging/aggregate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/logging/aggregate/index.js"],"names":[],"mappings":"AAWA;IACE,2BAAiC;IAGjC,mDA4BC;IAzBC,+BAA+B;IAC/B,oBAAsB;IACtB,4CAA4C;IAC5C,oBAAsB;IACtB,sHAAsH;IACtH,uBAAuB;IAKvB,wBAAmG;IAGjG,4BAKQ;IASZ,2EAoBC;IAED;;;;;;gBAYQ,0FAA0F;;;;;;;;;;;;YAY5F,0DAA0D;;;kBAI/D;IAED,qCAEC;;CACF;8BA7F6B,4BAA4B;iCAJzB,2CAA2C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/features/logging/aggregate/index.js"],"names":[],"mappings":"AAYA;IACE,2BAAiC;IAGjC,mDA4BC;IAzBC,+BAA+B;IAC/B,oBAAsB;IACtB,4CAA4C;IAC5C,oBAAsB;IACtB,sHAAsH;IACtH,uBAAuB;IAKvB,wBAAmG;IAGjG,4BAKQ;IASZ,+EA8CC;IAED;;;;;;gBAYQ,0FAA0F;;;;;;;;;;;;YAY5F,0DAA0D;;;kBAI/D;IAED,qCAEC;;CACF;8BAxH6B,4BAA4B;iCAJzB,2CAA2C"}

package/dist/types/features/logging/shared/utils.d.ts

@@ -9,7 +9,7 @@ export function bufferLog(ee: ContextualEE, message: string, customAttributes?:
 }, level?: enum): void;
 /**
  * Checks if a supplied log level is acceptable for use in generating a log event
- * @param {string} level
+ * @param {string} level -- must be cast to uppercase before running this test
  * @returns {boolean}
  */
 export function isValidLogLevel(level: string): boolean;

package/dist/types/features/logging/shared/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/features/logging/shared/utils.js"],"names":[],"mappings":"AAQA;;;;;KAKK;AACL,8BALa,YAAY,WACZ,MAAM,qBACN;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAC,CAAA;CAAC,UAClB,IAAI,QAoBhB;AAED;;;;GAIG;AACH,uCAHW,MAAM,GACJ,OAAO,CAKnB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/features/logging/shared/utils.js"],"names":[],"mappings":"AAMA;;;;;KAKK;AACL,8BALa,YAAY,WACZ,MAAM,qBACN;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAC,CAAA;CAAC,UAClB,IAAI,QAKhB;AAED;;;;GAIG;AACH,uCAHW,MAAM,GACJ,OAAO,CAKnB"}

package/dist/types/features/session_replay/shared/utils.d.ts

@@ -1,6 +1,5 @@
 export function hasReplayPrerequisite(agentId: any): boolean;
 export function isPreloadAllowed(agentId: any): boolean;
-export function canImportReplayAgg(agentId: any, sessionMgr: any): boolean;
 export function buildNRMetaNode(timestamp: any, timeKeeper: any): {
     originalTimestamp: any;
     correctedTimestamp: any;

package/dist/types/features/session_replay/shared/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/shared/utils.js"],"names":[],"mappings":"AAIA,6DAIC;AAED,wDAEC;AAED,2EAGC;AAED;;;;;;;EAUC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/features/session_replay/shared/utils.js"],"names":[],"mappings":"AAIA,6DAIC;AAED,wDAEC;AAED;;;;;;;EAUC"}

package/dist/types/features/utils/instrument-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrument-base.d.ts","sourceRoot":"","sources":["../../../../src/features/utils/instrument-base.js"],"names":[],"mappings":"AAiBA;;;GAGG;AACH;IACE;;;;;;;;OAQG;IACH,6BAPW,MAAM,cACN,OAAO,mCAAmC,EAAE,UAAU,eACtD,MAAM,8BAqChB;IA9BC,cAAgB;IAEhB,8IAA8I;IAC9I,cADW,WAAW,SAAS,CACF;IAE7B;;;MAGE;IACF,eAHU,OAAO,kBAAkB,EAAE,aAAa,CAGpB;IAE9B;;;MAGE;IACF,kCAAoC;IAiBtC;;;;;OAKG;IACH,mEAiDC;;CAYF;4BA7H2B,gBAAgB"}
+{"version":3,"file":"instrument-base.d.ts","sourceRoot":"","sources":["../../../../src/features/utils/instrument-base.js"],"names":[],"mappings":"AAiBA;;;GAGG;AACH;IACE;;;;;;;;OAQG;IACH,6BAPW,MAAM,cACN,OAAO,mCAAmC,EAAE,UAAU,eACtD,MAAM,8BAqChB;IA9BC,cAAgB;IAEhB,8IAA8I;IAC9I,cADW,WAAW,SAAS,CACF;IAE7B;;;MAGE;IACF,eAHU,OAAO,kBAAkB,EAAE,aAAa,CAGpB;IAE9B;;;MAGE;IACF,kCAAoC;IAiBtC;;;;;OAKG;IACH,mEAiDC;;CAkBF;4BAnI2B,gBAAgB"}

package/dist/types/loaders/api/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../src/loaders/api/api.js"],"names":[],"mappings":"AAsBA,2CAeC;AAID;;;;;;;;;;;;IAsEE;;;;OAIG;qBAFQ,MAAM;IAWjB;;;;OAIG;iCAFQ,MAAM,GAAC,IAAI;;;;;EAiGvB"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../../src/loaders/api/api.js"],"names":[],"mappings":"AAsBA,2CAiBC;AAID;;;;;;;;;;;;IA+DE;;;;OAIG;qBAFQ,MAAM;IAWjB;;;;OAIG;iCAFQ,MAAM,GAAC,IAAI;;;;;EAiGvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.261.1",
+  "version": "1.262.0",
   "private": false,
   "author": "New Relic Browser Agent Team <browser-agent@newrelic.com>",
   "description": "New Relic Browser Agent",

package/src/common/drain/drain.js

@@ -32,8 +32,9 @@ export function registerDrain (agentIdentifier, group) {
  * @param {*} group - The named "bucket" to be removed from the registry
  */
 export function deregisterDrain (agentIdentifier, group) {
-  curateRegistry(agentIdentifier)
+  if (!agentIdentifier || !registry[agentIdentifier]) return
   if (registry[agentIdentifier].get(group)) registry[agentIdentifier].delete(group)
+  drainGroup(agentIdentifier, group, false)
   if (registry[agentIdentifier].size) checkCanDrainAll(agentIdentifier)
 }
 
@@ -86,29 +87,33 @@ function checkCanDrainAll (agentIdentifier) {
    * the subscribed handlers for the group.
    * @param {*} group - The name of a particular feature's event "bucket".
    */
-function drainGroup (agentIdentifier, group) {
+function drainGroup (agentIdentifier, group, activateGroup = true) {
   const baseEE = agentIdentifier ? ee.get(agentIdentifier) : ee
   const handlers = defaultRegister.handlers // other storage in registerHandler
   if (!baseEE.backlog || !handlers) return
 
-  var bufferedEventsInGroup = baseEE.backlog[group]
-  var groupHandlers = handlers[group] // each group in the registerHandler storage
-  if (groupHandlers) {
-    // We don't cache the length of the buffer while looping because events might still be added while processing.
-    for (var i = 0; bufferedEventsInGroup && i < bufferedEventsInGroup.length; ++i) { // eslint-disable-line no-unmodified-loop-condition
-      emitEvent(bufferedEventsInGroup[i], groupHandlers)
-    }
+  // Only activated features being drained should run queued listeners on buffered events. Deactivated features only need to release memory.
+  if (activateGroup) {
+    const bufferedEventsInGroup = baseEE.backlog[group]
+    const groupHandlers = handlers[group] // each group in the registerHandler storage
+    if (groupHandlers) {
+      // We don't cache the length of the buffer while looping because events might still be added while processing.
+      for (let i = 0; bufferedEventsInGroup && i < bufferedEventsInGroup.length; ++i) { // eslint-disable-line no-unmodified-loop-condition
+        emitEvent(bufferedEventsInGroup[i], groupHandlers)
+      }
 
-    mapOwn(groupHandlers, function (eventType, handlerRegistrationList) {
-      mapOwn(handlerRegistrationList, function (i, registration) {
-        // registration is an array of: [targetEE, eventHandler]
-        registration[0].on(eventType, registration[1])
+      mapOwn(groupHandlers, function (eventType, handlerRegistrationList) {
+        mapOwn(handlerRegistrationList, function (i, registration) {
+          // registration is an array of: [targetEE, eventHandler]
+          registration[0].on(eventType, registration[1])
+        })
       })
-    })
+    }
   }
+
   if (!baseEE.isolatedBacklog) delete handlers[group]
   baseEE.backlog[group] = null
-  baseEE.emit('drain-' + group, [])
+  baseEE.emit('drain-' + group, []) // TODO: Code exists purely for a unit test and needs to be refined
 }
 
 /**

package/src/common/wrap/wrap-logger.js

@@ -7,8 +7,10 @@
  * This module is used by: jserrors, spa.
  */
 
+import { LOGGING_FAILURE_MESSAGE } from '../../features/logging/constants'
 import { ee as baseEE, contextId } from '../event-emitter/contextual-ee'
 import { EventContext } from '../event-emitter/event-context'
+import { warn } from '../util/console'
 import { createWrapperWithEmitter as wfn } from './wrap-function'
 
 /**
@@ -20,6 +22,7 @@ import { createWrapperWithEmitter as wfn } from './wrap-function'
  */
 // eslint-disable-next-line
 export function wrapLogger(sharedEE, parent, loggerFn, context) {
+  if (!(typeof parent === 'object' && !!parent && typeof loggerFn === 'string' && !!loggerFn && typeof parent[loggerFn] === 'function')) return warn(LOGGING_FAILURE_MESSAGE + 'invalid argument(s)')
   const ee = scopedEE(sharedEE)
   const wrapFn = wfn(ee)
 

package/src/features/logging/aggregate/index.js

@@ -6,8 +6,9 @@ import { warn } from '../../../common/util/console'
 import { stringify } from '../../../common/util/stringify'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { AggregateBase } from '../../utils/aggregate-base'
-import { FEATURE_NAME, LOGGING_EVENT_EMITTER_CHANNEL, LOGGING_IGNORED, MAX_PAYLOAD_SIZE } from '../constants'
+import { FEATURE_NAME, LOGGING_EVENT_EMITTER_CHANNEL, LOGGING_IGNORED, LOGGING_LEVEL_FAILURE_MESSAGE, LOG_LEVELS, MAX_PAYLOAD_SIZE } from '../constants'
 import { Log } from '../shared/log'
+import { isValidLogLevel } from '../shared/utils'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -43,8 +44,34 @@ export class Aggregate extends AggregateBase {
     })
   }
 
-  handleLog (timestamp, message, attributes, level) {
+  handleLog (timestamp, message, attributes = {}, level = LOG_LEVELS.INFO) {
     if (this.blocked) return
+
+    if (!attributes || typeof attributes !== 'object') attributes = {}
+    if (typeof level === 'string') level = level.toUpperCase()
+    if (!isValidLogLevel(level)) return warn(LOGGING_LEVEL_FAILURE_MESSAGE + level, Object.values(LOG_LEVELS))
+
+    try {
+      if (typeof message !== 'string') {
+        const stringified = stringify(message)
+        /**
+           * Error instances convert to `{}` when stringified
+           * Symbol converts to '' when stringified
+           * other cases tbd
+           * */
+        if (!!stringified && stringified !== '{}') message = stringified
+        else message = String(message)
+      }
+    } catch (err) {
+      warn('could not cast log message to string', message)
+      return
+    }
+    if (typeof message !== 'string' || !message) return warn(LOGGING_IGNORED + 'invalid message')
+    if (message.length > MAX_PAYLOAD_SIZE) {
+      handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', message.length])
+      return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes: ', message.slice(0, 25) + '...')
+    }
+
     const log = new Log(
       this.#agentRuntime.timeKeeper.convertRelativeTimestamp(timestamp),
       message,
@@ -54,7 +81,7 @@ export class Aggregate extends AggregateBase {
     const logBytes = log.message.length + stringify(log.attributes).length + log.level.length + 10 // timestamp == 10 chars
     if (logBytes > MAX_PAYLOAD_SIZE) {
       handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', logBytes])
-      return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes', log.message.slice(0, 25) + '...')
+      return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes: ', log.message.slice(0, 25) + '...')
     }
 
     if (this.estimatedBytes + logBytes >= MAX_PAYLOAD_SIZE) {

package/src/features/logging/shared/utils.js

@@ -1,7 +1,5 @@
 import { handle } from '../../../common/event-emitter/handle'
 import { now } from '../../../common/timing/now'
-import { warn } from '../../../common/util/console'
-import { stringify } from '../../../common/util/stringify'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS } from '../constants'
@@ -13,31 +11,16 @@ import { LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS } from '../constants'
    * @param {enum} level - the log level enum
    */
 export function bufferLog (ee, message, customAttributes = {}, level = LOG_LEVELS.INFO) {
-  try {
-    if (typeof message !== 'string') {
-      const stringified = stringify(message)
-      /**
-       * Error instances convert to `{}` when stringified
-       * Symbol converts to '' when stringified
-       * other cases tbd
-       * */
-      if (!!stringified && stringified !== '{}') message = stringified
-      else message = String(message)
-    }
-  } catch (err) {
-    warn('could not cast log message to string', message)
-    return
-  }
   handle(SUPPORTABILITY_METRIC_CHANNEL, [`API/logging/${level.toLowerCase()}/called`], undefined, FEATURE_NAMES.metrics, ee)
   handle(LOGGING_EVENT_EMITTER_CHANNEL, [now(), message, customAttributes, level], undefined, FEATURE_NAMES.logging, ee)
 }
 
 /**
  * Checks if a supplied log level is acceptable for use in generating a log event
- * @param {string} level
+ * @param {string} level -- must be cast to uppercase before running this test
  * @returns {boolean}
  */
 export function isValidLogLevel (level) {
   if (typeof level !== 'string') return false
-  return Object.values(LOG_LEVELS).some(logLevel => logLevel.toUpperCase() === level.toUpperCase())
+  return Object.values(LOG_LEVELS).some(logLevel => logLevel === level)
 }

package/src/features/session_replay/instrument/index.js

@@ -28,7 +28,7 @@ export class Instrument extends InstrumentBase {
     } catch (err) { }
 
     if (hasReplayPrerequisite(agentIdentifier)) {
-      this.ee.on('recordReplay', () => this.#apiStartOrRestartReplay())
+      this.ee.on(SR_EVENT_EMITTER_TYPES.RECORD, () => this.#apiStartOrRestartReplay())
     }
 
     if (this.#canPreloadRecorder(session)) {

package/src/features/session_replay/shared/utils.js

@@ -12,11 +12,6 @@ export function isPreloadAllowed (agentId) {
   return getConfigurationValue(agentId, 'session_replay.preload') === true && hasReplayPrerequisite(agentId)
 }
 
-export function canImportReplayAgg (agentId, sessionMgr) {
-  if (!hasReplayPrerequisite(agentId)) return false
-  return !!sessionMgr?.isNew || !!sessionMgr?.state.sessionReplayMode // Session Replay should only try to run if already running from a previous page, or at the beginning of a session
-}
-
 export function buildNRMetaNode (timestamp, timeKeeper) {
   const correctedTimestamp = timeKeeper.correctAbsoluteTimestamp(timestamp)
   return {

package/src/features/session_trace/aggregate/index.js

@@ -205,6 +205,6 @@ export class Aggregate extends AggregateBase {
     this.blocked = true
     this.mode = MODE.OFF
     this.agentRuntime.session.write({ sessionTraceMode: this.mode })
-    this.scheduler.stopTimer()
+    this.scheduler?.stopTimer()
   }
 }

package/src/features/utils/instrument-base.js

@@ -11,7 +11,7 @@ import { isBrowserScope } from '../../common/constants/runtime'
 import { warn } from '../../common/util/console'
 import { FEATURE_NAMES } from '../../loaders/features/features'
 import { getConfigurationValue } from '../../common/config/config'
-import { canImportReplayAgg } from '../session_replay/shared/utils'
+import { hasReplayPrerequisite } from '../session_replay/shared/utils'
 import { canEnableSessionTracking } from './feature-gates'
 import { single } from '../../common/util/invoke'
 
@@ -127,7 +127,13 @@ export class InstrumentBase extends FeatureBase {
  * @returns
  */
   #shouldImportAgg (featureName, session) {
-    if (featureName === FEATURE_NAMES.sessionReplay) return canImportReplayAgg(this.agentIdentifier, session)
-    return !(featureName === FEATURE_NAMES.sessionTrace && !session)
+    switch (featureName) {
+      case FEATURE_NAMES.sessionReplay: // the session manager must be initialized successfully for Replay & Trace features
+        return hasReplayPrerequisite(this.agentIdentifier) && !!session
+      case FEATURE_NAMES.sessionTrace:
+        return !!session
+      default:
+        return true
+    }
   }
 }

package/src/loaders/api/api.js

@@ -16,8 +16,8 @@ import { apiMethods, asyncApiMethods } from './api-methods'
 import { SR_EVENT_EMITTER_TYPES } from '../../features/session_replay/constants'
 import { now } from '../../common/timing/now'
 import { MODE } from '../../common/session/constants'
-import { LOGGING_FAILURE_MESSAGE, LOGGING_IGNORED, LOGGING_LEVEL_FAILURE_MESSAGE, LOG_LEVELS, MAX_PAYLOAD_SIZE } from '../../features/logging/constants'
-import { bufferLog, isValidLogLevel } from '../../features/logging/shared/utils'
+import { LOG_LEVELS } from '../../features/logging/constants'
+import { bufferLog } from '../../features/logging/shared/utils'
 import { wrapLogger } from '../../common/wrap/wrap-logger'
 
 export function setTopLevelCallers () {
@@ -29,7 +29,9 @@ export function setTopLevelCallers () {
   function caller (fnName, ...args) {
     let returnVals = []
     Object.values(nr.initializedAgents).forEach(val => {
-      if (val.exposed && val.api[fnName]) {
+      if (!val || !val.api) {
+        warn(`Call to api '${fnName}' made before agent fully initialized.`)
+      } else if (val.exposed && val.api[fnName]) {
         returnVals.push(val.api[fnName](...args))
       }
     })
@@ -55,18 +57,11 @@ export function setAPI (agentIdentifier, forceDrain, runSoftNavOverSpa = false)
   var spaPrefix = prefix + 'ixn-'
 
   apiInterface.log = function (message, { customAttributes = {}, level = LOG_LEVELS.INFO } = {}) {
-    if (!customAttributes || typeof customAttributes !== 'object') customAttributes = {}
-    if (typeof message !== 'string' || !message) return warn(LOGGING_IGNORED + 'invalid message')
-    if (!isValidLogLevel(level)) return warn(LOGGING_LEVEL_FAILURE_MESSAGE + level, LOG_LEVELS)
-    if (message.length > MAX_PAYLOAD_SIZE) return warn(LOGGING_IGNORED + '> ' + MAX_PAYLOAD_SIZE + ' bytes: ', message.slice(0, 25) + '...')
-    bufferLog(instanceEE, message, customAttributes, level.toUpperCase())
+    bufferLog(instanceEE, message, customAttributes, level)
   }
 
   apiInterface.wrapLogger = (parent, functionName, { customAttributes = {}, level = LOG_LEVELS.INFO } = {}) => {
-    if (!customAttributes || typeof customAttributes !== 'object') customAttributes = {}
-    if (!(typeof parent === 'object' && !!parent && typeof functionName === 'string' && !!functionName && typeof parent[functionName] === 'function' && typeof customAttributes === 'object')) return warn(LOGGING_FAILURE_MESSAGE + 'invalid argument(s)')
-    if (!isValidLogLevel(level)) return warn(LOGGING_FAILURE_MESSAGE + LOGGING_LEVEL_FAILURE_MESSAGE + level, LOG_LEVELS)
-    wrapLogger(instanceEE, parent, functionName, { customAttributes, level: level.toUpperCase() })
+    wrapLogger(instanceEE, parent, functionName, { customAttributes, level })
   }
 
   // Setup stub functions that queue calls for later processing.

package/src/features/session_replay/shared/__mocks__/utils.js

@@ -1 +0,0 @@
-export const canImportReplayAgg = jest.fn()