@newrelic/browser-agent 0.1.231 → 1.232.1

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Aggregate = void 0;
 var _canonicalFunctionName = require("./canonical-function-name");
-var _cleanUrl = require("../../../common/url/clean-url");
 var _computeStackTrace = require("./compute-stack-trace");
 var _stringHashCode = require("./string-hash-code");
 var _formatStackTrace = require("./format-stack-trace");
@@ -17,16 +16,20 @@ var _mapOwn = require("../../../common/util/map-own");
 var _config = require("../../../common/config/config");
 var _now = require("../../../common/timing/now");
 var _globalScope = require("../../../common/util/global-scope");
-var _aggregateBase = require("../../utils/aggregate-base");
 var _constants = require("../constants");
 var _drain = require("../../../common/drain/drain");
 var _features = require("../../../loaders/features/features");
+var _featureBase = require("../../utils/feature-base");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-class Aggregate extends _aggregateBase.AggregateBase {
+/**
+ * @typedef {import('./compute-stack-trace.js').StackInfo} StackInfo
+ */
+
+class Aggregate extends _featureBase.FeatureBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     var _this;
@@ -109,49 +112,25 @@ class Aggregate extends _aggregateBase.AggregateBase {
   getBucketName(params, customParams) {
     return this.nameHash(params) + ':' + (0, _stringHashCode.stringHashCode)((0, _stringify.stringify)(customParams));
   }
-  canonicalizeURL(url, cleanedOrigin) {
-    if (typeof url !== 'string') return '';
-    var cleanedURL = (0, _cleanUrl.cleanURL)(url);
-    if (cleanedURL === cleanedOrigin) {
-      return '<inline>';
-    } else {
-      return cleanedURL;
-    }
-  }
-  buildCanonicalStackString(stackInfo, cleanedOrigin) {
-    var canonicalStack = '';
-    for (var i = 0; i < stackInfo.frames.length; i++) {
-      var frame = stackInfo.frames[i];
-      var func = (0, _canonicalFunctionName.canonicalFunctionName)(frame.func);
-      if (canonicalStack) canonicalStack += '\n';
-      if (func) canonicalStack += func + '@';
-      if (typeof frame.url === 'string') canonicalStack += frame.url;
-      if (frame.line) canonicalStack += ':' + frame.line;
-    }
-    return canonicalStack;
-  }
 
-  // Strip query parameters and fragments from the stackString property of the
-  // given stackInfo, along with the 'url' properties of each frame in
-  // stackInfo.frames.
-  //
-  // Any URLs that are equivalent to the cleaned version of the origin will also
-  // be replaced with the string '<inline>'.
-  //
-  canonicalizeStackURLs(stackInfo) {
-    // Currently, loader.origin might contain a fragment, but we don't want to use it
-    // for comparing with frame URLs.
-    var cleanedOrigin = (0, _cleanUrl.cleanURL)((0, _config.getRuntime)(this.agentIdentifier).origin);
+  /**
+   * Builds a standardized stack trace string from the frames in the given `stackInfo` object, with each frame separated
+   * by a newline character. Lines take the form `<functionName>@<url>:<lineNumber>`.
+   *
+   * @param {StackInfo} stackInfo - An object specifying a stack string and individual frames.
+   * @returns {string} A canonical stack string built from the URLs and function names in the given `stackInfo` object.
+   */
+  buildCanonicalStackString(stackInfo) {
+    var canonicalStackString = '';
     for (var i = 0; i < stackInfo.frames.length; i++) {
       var frame = stackInfo.frames[i];
-      var originalURL = frame.url;
-      var cleanedURL = this.canonicalizeURL(originalURL, cleanedOrigin);
-      if (cleanedURL && cleanedURL !== frame.url) {
-        frame.url = cleanedURL;
-        stackInfo.stackString = stackInfo.stackString.split(originalURL).join(cleanedURL);
-      }
+      var func = (0, _canonicalFunctionName.canonicalFunctionName)(frame.func);
+      if (canonicalStackString) canonicalStackString += '\n';
+      if (func) canonicalStackString += func + '@';
+      if (typeof frame.url === 'string') canonicalStackString += frame.url;
+      if (frame.line) canonicalStackString += ':' + frame.line;
     }
-    return stackInfo;
+    return canonicalStackString;
   }
   storeError(err, time, internal, customAttributes) {
     // are we in an interaction
@@ -168,10 +147,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
       // Again as with previous usage, all falsey values would include the error.
     }
 
-    var stackInfo = this.canonicalizeStackURLs((0, _computeStackTrace.computeStackTrace)(err));
-    var canonicalStack = this.buildCanonicalStackString(stackInfo);
+    var stackInfo = (0, _computeStackTrace.computeStackTrace)(err);
+    var canonicalStackString = this.buildCanonicalStackString(stackInfo);
     const params = {
-      stackHash: (0, _stringHashCode.stringHashCode)(canonicalStack),
+      stackHash: (0, _stringHashCode.stringHashCode)(canonicalStackString),
       exceptionClass: stackInfo.name,
       request_uri: _globalScope.globalScope?.location.pathname
     };
@@ -216,6 +195,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
 
     // still send EE events for other features such as above, but stop this one from aggregating internal data
     if (this.blocked) return;
+    var att = (0, _config.getInfo)(this.agentIdentifier).jsAttributes;
     if (params._interactionId != null) {
       // hold on to the error until the interaction finishes
       this.errorCache[params._interactionId] = this.errorCache[params._interactionId] || [];
@@ -223,7 +203,6 @@ class Aggregate extends _aggregateBase.AggregateBase {
     } else {
       // store custom attributes
       var customParams = {};
-      var att = (0, _config.getInfo)(this.agentIdentifier).jsAttributes;
       (0, _mapOwn.mapOwn)(att, setCustom);
       if (customAttributes) {
         (0, _mapOwn.mapOwn)(customAttributes, setCustom);

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

@@ -8,7 +8,6 @@ var _handle = require("../../../common/event-emitter/handle");
 var _now = require("../../../common/timing/now");
 var _getOrSet = require("../../../common/util/get-or-set");
 var _wrap = require("../../../common/wrap");
-var _lodash = _interopRequireDefault(require("lodash._slice"));
 require("./debug");
 var _instrumentBase = require("../../utils/instrument-base");
 var _constants = require("../constants");
@@ -17,7 +16,6 @@ var _globalScope = require("../../../common/util/global-scope");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
 var _config = require("../../../common/config/config");
 var _stringify = require("../../../common/util/stringify");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0

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

@@ -7,7 +7,6 @@ exports.Aggregate = void 0;
 var _config = require("../../../common/config/config");
 var _registerHandler = require("../../../common/event-emitter/register-handler");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
-var _aggregateBase = require("../../utils/aggregate-base");
 var _constants = require("../constants");
 var _drain = require("../../../common/drain/drain");
 var _frameworkDetection = require("../../../common/metrics/framework-detection");
@@ -17,7 +16,9 @@ var _env = require("../../../common/constants/env.npm");
 var _load = require("../../../common/window/load");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
 var _globalScope = require("../../../common/util/global-scope");
-class Aggregate extends _aggregateBase.AggregateBase {
+var _featureBase = require("../../utils/feature-base");
+var _stringify = require("../../../common/util/stringify");
+class Aggregate extends _featureBase.FeatureBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, _constants.FEATURE_NAME);
@@ -109,6 +110,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     try {
       if (this.resourcesSent) return;
       const agentRuntime = (0, _config.getRuntime)(this.agentIdentifier);
+      const info = (0, _config.getInfo)(this.agentIdentifier);
       // make sure this only gets sent once
       this.resourcesSent = true;
       // differentiate between internal+external and ajax+non-ajax
@@ -134,10 +136,19 @@ class Aggregate extends _aggregateBase.AggregateBase {
         this.storeSupportabilityMetrics("PageSession/Endpoint/".concat(endpoint.charAt(0).toUpperCase() + endpoint.slice(1), "/BytesSent"), agentRuntime.bytesSent[endpoint]);
       });
 
+      // Capture per-agent query bytes sent for each endpoint (see harvest) and RUM call (see page_view_event aggregator).
+      Object.keys(agentRuntime.bytesSent).forEach(endpoint => {
+        this.storeSupportabilityMetrics("PageSession/Endpoint/".concat(endpoint.charAt(0).toUpperCase() + endpoint.slice(1), "/QueryBytesSent"), agentRuntime.queryBytesSent[endpoint]);
+      });
+
       // Capture metrics for session trace if active (`ptid` is set when returned by replay ingest).
       if (agentRuntime.ptid) {
         this.storeSupportabilityMetrics('PageSession/Feature/SessionTrace/DurationMs', Math.round(performance.now()));
       }
+
+      // Capture metrics for size of custom attributes
+      const jsAttributes = (0, _stringify.stringify)(info.jsAttributes);
+      this.storeSupportabilityMetrics('PageSession/Feature/CustomData/Bytes', jsAttributes === '{}' ? 0 : jsAttributes.length);
     } catch (e) {
       // do nothing
     }

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

@@ -10,16 +10,16 @@ var _registerHandler = require("../../../common/event-emitter/register-handler")
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _cleanUrl = require("../../../common/url/clean-url");
 var _config = require("../../../common/config/config");
-var _aggregateBase = require("../../utils/aggregate-base");
 var _constants = require("../constants");
 var _drain = require("../../../common/drain/drain");
 var _globalScope = require("../../../common/util/global-scope");
+var _featureBase = require("../../utils/feature-base");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-class Aggregate extends _aggregateBase.AggregateBase {
+class Aggregate extends _featureBase.FeatureBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     var _this;

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

@@ -16,15 +16,15 @@ var _paintMetrics = require("../../../common/metrics/paint-metrics");
 var _submitData = require("../../../common/util/submit-data");
 var _config = require("../../../common/config/config");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
-var _aggregateBase = require("../../utils/aggregate-base");
 var CONSTANTS = _interopRequireWildcard(require("../constants"));
 var _initializedFeatures = require("./initialized-features");
 var _globalScope = require("../../../common/util/global-scope");
 var _drain = require("../../../common/drain/drain");
+var _featureBase = require("../../utils/feature-base");
 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; }
 const jsonp = 'NREUM.setToken';
-class Aggregate extends _aggregateBase.AggregateBase {
+class Aggregate extends _featureBase.FeatureBase {
   static featureName = CONSTANTS.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, CONSTANTS.FEATURE_NAME);
@@ -138,7 +138,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
     var queryString = (0, _encode.fromArray)(chunksForQueryString, agentRuntime.maxBytes);
 
     // Capture bytes sent to RUM call endpoint (currently `1`) as a supportability metric. See metrics aggregator (on unload).
-    agentRuntime.bytesSent[protocol] = (agentRuntime.bytesSent[protocol] || 0) + queryString?.length || 0;
+    agentRuntime.bytesSent[protocol] = 0; // Set to zero for now until RUM is moved to POST
+
+    // Capture query bytes sent to RUM call endpoint (currently `1`) as a supportability metric. See metrics aggregator (on unload).
+    agentRuntime.queryBytesSent[protocol] = (agentRuntime.queryBytesSent[protocol] || 0) + queryString?.length || 0;
     const isValidJsonp = _submitData.submitData.jsonp(this.getScheme() + '://' + info.beacon + '/' + protocol + '/' + info.licenseKey + queryString, jsonp);
     // Usually `drain` is invoked automatically after processing feature flags contained in the JSONP callback from
     // ingest (see `activateFeatures`), so when JSONP cannot execute (as with module workers), we drain manually.

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

@@ -15,16 +15,16 @@ var _registerHandler = require("../../../common/event-emitter/register-handler")
 var _cleanUrl = require("../../../common/url/clean-url");
 var _handle = require("../../../common/event-emitter/handle");
 var _config = require("../../../common/config/config");
-var _aggregateBase = require("../../utils/aggregate-base");
 var _constants = require("../constants");
 var _drain = require("../../../common/drain/drain");
 var _features = require("../../../loaders/features/features");
+var _featureBase = require("../../utils/feature-base");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-class Aggregate extends _aggregateBase.AggregateBase {
+class Aggregate extends _featureBase.FeatureBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     var _this;
@@ -35,7 +35,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     this.curSessEndRecorded = false;
     this.cls = null; // this should be null unless set to a numeric value by web-vitals so that we differentiate if CLS is supported
 
-    /*! This is the section that used to be in the loader portion: !*/
+    /* ! This is the section that used to be in the loader portion: ! */
     /* ------------------------------------------------------------ */
     const pageStartedHidden = (0, _config.getRuntime)(agentIdentifier).initHidden; // our attempt at recapturing initial vis state since this code runs post-load time
     this.alreadySent = new Set(); // since we don't support timings on BFCache restores, this tracks and helps cap metrics that web-vitals report more than once
@@ -111,10 +111,10 @@ class Aggregate extends _aggregateBase.AggregateBase {
         attributes.size = lcpEntry.size;
         attributes.eid = lcpEntry.id;
         if (lcpEntry.url) {
-          attributes['elUrl'] = (0, _cleanUrl.cleanURL)(lcpEntry.url);
+          attributes.elUrl = (0, _cleanUrl.cleanURL)(lcpEntry.url);
         }
         if (lcpEntry.element?.tagName) {
-          attributes['elTag'] = lcpEntry.element.tagName;
+          attributes.elTag = lcpEntry.element.tagName;
         }
       }
       this.addConnectionAttributes(attributes);
@@ -227,7 +227,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     Future: onCLS value changes should be reported directly & CLS separated into its own timing node so it's not beholden to 'pageHide' firing. It'd also be possible to report the real final CLS.
     */
     if (this.cls !== null) {
-      attrs['cls'] = this.cls;
+      attrs.cls = this.cls;
     }
     this.timings.push({
       name: name,

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

@@ -10,20 +10,18 @@ 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 _aggregateBase = require("../../utils/aggregate-base");
 var _constants = require("../constants");
 var _drain = require("../../../common/drain/drain");
 var _handlerCache = require("../../utils/handler-cache");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _featureBase = require("../../utils/feature-base");
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-class Aggregate extends _aggregateBase.AggregateBase {
+class Aggregate extends _featureBase.FeatureBase {
   static featureName = _constants.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     var _this;
@@ -260,7 +258,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
     } 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) origin += '.' + Array.from(t.classList).join('.');
     }
     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';

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

@@ -14,20 +14,20 @@ var _paintMetrics = require("../../../common/metrics/paint-metrics");
 var _interaction = require("./interaction");
 var _config = require("../../../common/config/config");
 var _eventListenerOpts = require("../../../common/event-listener/event-listener-opts");
-var _aggregateBase = require("../../utils/aggregate-base");
 var _harvestScheduler = require("../../../common/harvest/harvest-scheduler");
 var _serializer = require("./serializer");
 var _contextualEe = require("../../../common/event-emitter/contextual-ee");
 var CONSTANTS = _interopRequireWildcard(require("../constants"));
 var _drain = require("../../../common/drain/drain");
 var _features = require("../../../loaders/features/features");
+var _featureBase = require("../../utils/feature-base");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /*
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-/*eslint no-undef: "error"*/
+/* eslint no-undef: "error" */
 
 const {
   FEATURE_NAME,
@@ -47,7 +47,7 @@ const {
   JSONP_END,
   originalSetTimeout
 } = CONSTANTS;
-class Aggregate extends _aggregateBase.AggregateBase {
+class Aggregate extends _featureBase.FeatureBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, FEATURE_NAME);
@@ -90,7 +90,8 @@ class Aggregate extends _aggregateBase.AggregateBase {
       onFinished: onHarvestFinished,
       retryDelay: state.harvestTimeSeconds
     }, {
-      agentIdentifier
+      agentIdentifier,
+      ee: baseEE
     });
     scheduler.harvest.on('events', onHarvestStarted);
 
@@ -222,7 +223,7 @@ class Aggregate extends _aggregateBase.AggregateBase {
           if (evName === 'click') {
             var value = getActionText(ev.target);
             if (value) {
-              state.currentNode.attrs.custom['actionText'] = value;
+              state.currentNode.attrs.custom.actionText = value;
             }
           }
         }

package/dist/cjs/features/utils/agent-session.js

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setupAgentSession = setupAgentSession;
+var _config = require("../../common/config/config");
+var _drain = require("../../common/drain/drain");
+var _contextualEe = require("../../common/event-emitter/contextual-ee");
+var _registerHandler = require("../../common/event-emitter/register-handler");
+var _globalScope = require("../../common/util/global-scope");
+var _sessionEntity = require("../../common/session/session-entity");
+var _localStorage = require("../../common/storage/local-storage.js");
+var _firstPartyCookies = require("../../common/storage/first-party-cookies");
+var _localMemory = require("../../common/storage/local-memory");
+let ranOnce = 0;
+function setupAgentSession(agentIdentifier) {
+  const agentRuntime = (0, _config.getRuntime)(agentIdentifier);
+  if (ranOnce++) return agentRuntime.session;
+  const sharedEE = _contextualEe.ee.get(agentIdentifier);
+
+  // domain is a string that can be specified by customer.
+  // only way to keep the session object across subdomains is using first party cookies
+  // This determines which storage wrapper the session manager will use to keep state
+  let storageAPI;
+  const cookiesEnabled = (0, _config.getConfigurationValue)(agentIdentifier, 'privacy.cookies_enabled') === true;
+  if (cookiesEnabled && _globalScope.isBrowserScope) {
+    storageAPI = (0, _config.getConfigurationValue)(agentIdentifier, 'session.domain') ? new _firstPartyCookies.FirstPartyCookies((0, _config.getConfigurationValue)(agentIdentifier, 'session.domain')) : new _localStorage.LocalStorage();
+  }
+  if (cookiesEnabled) {
+    // defaults to "LocalMemory" if storageAPI is undefined, such as in Worker build
+    agentRuntime.session = new _sessionEntity.SessionEntity({
+      agentIdentifier,
+      key: 'SESSION',
+      storageAPI,
+      expiresMs: (0, _config.getConfigurationValue)(agentIdentifier, 'session.expiresMs'),
+      inactiveMs: (0, _config.getConfigurationValue)(agentIdentifier, 'session.inactiveMs')
+    });
+  }
+
+  // The first time the agent runs on a page, it should put everything
+  // that's currently stored in the storage API into the local info.jsAttributes object
+  if (_globalScope.isBrowserScope) {
+    // retrieve & re-add all of the persisted setCustomAttribute|setUserId k-v from previous page load(s)
+    const customSessionData = agentRuntime.session?.read?.()?.custom;
+    const agentInfo = (0, _config.getInfo)(agentIdentifier);
+    if (customSessionData) {
+      (0, _config.setInfo)(agentIdentifier, {
+        ...agentInfo,
+        jsAttributes: {
+          ...agentInfo.jsAttributes,
+          ...customSessionData
+        }
+      });
+    }
+  }
+
+  // any calls to newrelic.setCustomAttribute(<persisted>) will need to be added to:
+  // local info.jsAttributes {}
+  // the session's storage API
+  (0, _registerHandler.registerHandler)('api-setCustomAttribute', (time, key, value) => {
+    agentRuntime.session.syncCustomAttribute(key, value);
+  }, 'session', sharedEE);
+
+  // any calls to newrelic.setUserId(...) will need to be added to:
+  // local info.jsAttributes {}
+  // the session's storage API
+  (0, _registerHandler.registerHandler)('api-setUserId', (time, key, value) => {
+    agentRuntime.session.syncCustomAttribute(key, value);
+  }, 'session', sharedEE);
+  (0, _drain.drain)(agentIdentifier, 'session');
+  return agentRuntime.session;
+}

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

@@ -32,7 +32,7 @@ class FeatureBase {
    * loader configurations may appear after the loader code is executed.
    */
   checkConfiguration() {
-    // NOTE: This check has to happen at aggregator load time, but could be moved to `AggregateBase`.
+    // NOTE: This check has to happen at aggregator load time
     if (!(0, _config.isConfigured)(this.agentIdentifier)) {
       let jsAttributes = {
         ...(0, _nreum.gosCDN)().info?.jsAttributes

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

@@ -53,6 +53,12 @@ class InstrumentBase extends _featureBase.FeatureBase {
        * it's only responsible for aborting its one specific feature, rather than all.
        */
       try {
+        // The session entity needs to be attached to the config internals before the aggregator chunk runs
+        const {
+          setupAgentSession
+        } = await Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "session-manager" */'./agent-session')));
+        setupAgentSession(this.agentIdentifier);
+        // import and instantiate the aggregator chunk
         const {
           lazyLoader
         } = await Promise.resolve().then(() => _interopRequireWildcard(require( /* webpackChunkName: "lazy-loader" */'./lazy-loader')));
@@ -61,9 +67,8 @@ class InstrumentBase extends _featureBase.FeatureBase {
         } = await lazyLoader(this.featureName, 'aggregate');
         new Aggregate(this.agentIdentifier, this.aggregator);
       } catch (e) {
-        (0, _console.warn)("Downloading ".concat(this.featureName, " failed..."));
+        (0, _console.warn)("Downloading ".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
       }
     };

package/dist/cjs/features/utils/lazy-loader.js

@@ -16,7 +16,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * should be.
  * @param featureName Name of the feature to import such as ajax or session_trace
  * @param featurePart Name of the feature part to load; should be either instrument or aggregate
- * @returns {Promise<InstrumentBase|AggregateBase|null>}
+ * @returns {Promise<InstrumentBase|FeatureBase|null>}
  */
 function lazyLoader(featureName, featurePart) {
   if (featurePart === 'aggregate') {

package/dist/cjs/loaders/agent.js

@@ -74,7 +74,7 @@ class Agent {
         this.features[featName].abortHandler?.();
       }
       const newrelic = (0, _nreum.gosNREUM)();
-      delete newrelic.initializedAgents[this.agentIdentifier]?.['api']; // prevent further calls to agent-specific APIs (see "configure.js")
+      delete newrelic.initializedAgents[this.agentIdentifier]?.api; // prevent further calls to agent-specific APIs (see "configure.js")
       delete newrelic.initializedAgents[this.agentIdentifier]?.[NR_FEATURES_REF_NAME]; // GC mem used internally by features
       delete this.sharedAggregator;
       // Keep the initialized agent object with its configs for troubleshooting purposes.

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

@@ -17,7 +17,6 @@ var _globalScope = require("../../common/util/global-scope");
 var _console = require("../../common/util/console");
 var _constants = require("../../features/metrics/constants");
 var _nreum = require("../../common/window/nreum");
-var _sessionStorage = require("../../common/window/session-storage");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; } /*
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       * Copyright 2020 New Relic Corporation. All rights reserved.
@@ -81,7 +80,6 @@ function setAPI(agentIdentifier, forceDrain) {
     const currentInfo = (0, _config.getInfo)(agentIdentifier);
     if (value === null) {
       delete currentInfo.jsAttributes[key];
-      if (_globalScope.isBrowserScope) (0, _sessionStorage.removeFromBrowserStorage)(key, CUSTOM_ATTR_GROUP); // addToBrowserStorage flag isn't needed to unset keys from storage
     } else {
       (0, _config.setInfo)(agentIdentifier, {
         ...currentInfo,
@@ -90,9 +88,8 @@ function setAPI(agentIdentifier, forceDrain) {
           [key]: value
         }
       });
-      if (_globalScope.isBrowserScope && addToBrowserStorage) (0, _sessionStorage.putInBrowserStorage)(key, value, CUSTOM_ATTR_GROUP);
     }
-    return apiCall(prefix, apiName, true)();
+    return apiCall(prefix, apiName, true, !!addToBrowserStorage || value === null ? 'session' : undefined)(key, value);
   }
   apiInterface.setCustomAttribute = function (name, value) {
     let persistAttribute = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;

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

@@ -9,7 +9,7 @@ var _config = require("../../common/config/config");
 var _contextualEe = require("../../common/event-emitter/contextual-ee");
 var _handle = require("../../common/event-emitter/handle");
 var _registerHandler = require("../../common/event-emitter/register-handler");
-var _single = require("../../common/util/single");
+var _invoke = require("../../common/util/invoke");
 var _submitData = require("../../common/util/submit-data");
 var _globalScope = require("../../common/util/global-scope");
 var _constants = require("../../features/metrics/constants");
@@ -18,7 +18,7 @@ function setAPI(agentIdentifier) {
   var cycle = 0;
   var scheme = (0, _config.getConfigurationValue)(agentIdentifier, 'ssl') === false ? 'http' : 'https';
   var api = {
-    finished: (0, _single.single)(finished),
+    finished: (0, _invoke.single)(finished),
     setErrorHandler: setErrorHandler,
     addToTrace: addToTrace,
     inlineHit: inlineHit,
@@ -71,6 +71,7 @@ function setAPI(agentIdentifier) {
     request_name = window.encodeURIComponent(request_name);
     cycle += 1;
     const agentInfo = (0, _config.getInfo)(agentIdentifier);
+    const agentRuntime = (0, _config.getRuntime)(agentIdentifier);
     if (!agentInfo.beacon) return;
     var url = scheme + '://' + agentInfo.beacon + '/1/' + agentInfo.licenseKey;
     url += '?a=' + agentInfo.applicationID + '&';

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

@@ -9,7 +9,6 @@ var _nreum = require("../../common/window/nreum");
 var _config = require("../../common/config/config");
 var _featureFlags = require("../../common/util/feature-flags");
 var _globalScope = require("../../common/util/global-scope");
-var _sessionStorage = require("../../common/window/session-storage");
 function configure(agentIdentifier) {
   let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   let loaderType = arguments.length > 2 ? arguments[2] : undefined;
@@ -34,11 +33,6 @@ function configure(agentIdentifier) {
     // add a default attr to all worker payloads
     info.jsAttributes.isWorker = true;
   }
-  if (_globalScope.isBrowserScope) {
-    // retrieve & re-add all of the persisted setCustomAttribute|setUserId k-v from previous page load(s)
-    let prevPageSessionJsAttrs = (0, _sessionStorage.getAllStorageItemsOfGroup)(_api.CUSTOM_ATTR_GROUP);
-    Object.assign(info.jsAttributes, prevPageSessionJsAttrs);
-  }
   (0, _config.setInfo)(agentIdentifier, info);
   (0, _config.setConfiguration)(agentIdentifier, init || {});
   (0, _config.setLoaderConfig)(agentIdentifier, loader_config || {});