@newrelic/browser-agent 0.1.231 → 1.232.1

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

@@ -4,7 +4,6 @@
  */
 
 import { canonicalFunctionName } from './canonical-function-name';
-import { cleanURL } from '../../../common/url/clean-url';
 import { computeStackTrace } from './compute-stack-trace';
 import { stringHashCode } from './string-hash-code';
 import { truncateSize } from './format-stack-trace';
@@ -16,11 +15,16 @@ import { mapOwn } from '../../../common/util/map-own';
 import { getInfo, getConfigurationValue, getRuntime } from '../../../common/config/config';
 import { now } from '../../../common/timing/now';
 import { globalScope } from '../../../common/util/global-scope';
-import { AggregateBase } from '../../utils/aggregate-base';
 import { FEATURE_NAME } from '../constants';
 import { drain } from '../../../common/drain/drain';
 import { FEATURE_NAMES } from '../../../loaders/features/features';
-export class Aggregate extends AggregateBase {
+import { FeatureBase } from '../../utils/feature-base';
+
+/**
+ * @typedef {import('./compute-stack-trace.js').StackInfo} StackInfo
+ */
+
+export class Aggregate extends FeatureBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     var _this;
@@ -103,49 +107,25 @@ export class Aggregate extends AggregateBase {
   getBucketName(params, customParams) {
     return this.nameHash(params) + ':' + stringHashCode(stringify(customParams));
   }
-  canonicalizeURL(url, cleanedOrigin) {
-    if (typeof url !== 'string') return '';
-    var cleanedURL = 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 = 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 = cleanURL(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 = 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
@@ -162,10 +142,10 @@ export class Aggregate extends AggregateBase {
       // Again as with previous usage, all falsey values would include the error.
     }
 
-    var stackInfo = this.canonicalizeStackURLs(computeStackTrace(err));
-    var canonicalStack = this.buildCanonicalStackString(stackInfo);
+    var stackInfo = computeStackTrace(err);
+    var canonicalStackString = this.buildCanonicalStackString(stackInfo);
     const params = {
-      stackHash: stringHashCode(canonicalStack),
+      stackHash: stringHashCode(canonicalStackString),
       exceptionClass: stackInfo.name,
       request_uri: globalScope?.location.pathname
     };
@@ -210,6 +190,7 @@ export class Aggregate extends 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 = 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] || [];
@@ -217,7 +198,6 @@ export class Aggregate extends AggregateBase {
     } else {
       // store custom attributes
       var customParams = {};
-      var att = getInfo(this.agentIdentifier).jsAttributes;
       mapOwn(att, setCustom);
       if (customAttributes) {
         mapOwn(customAttributes, setCustom);

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

@@ -7,7 +7,6 @@ import { handle } from '../../../common/event-emitter/handle';
 import { now } from '../../../common/timing/now';
 import { getOrSet } from '../../../common/util/get-or-set';
 import { wrapRaf, wrapTimer, wrapEvents, wrapXhr } from '../../../common/wrap';
-import slice from 'lodash._slice';
 import './debug';
 import { InstrumentBase } from '../../utils/instrument-base';
 import { FEATURE_NAME, NR_ERR_PROP } from '../constants';

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

@@ -1,7 +1,6 @@
-import { getRuntime } from '../../../common/config/config';
+import { getRuntime, getInfo } from '../../../common/config/config';
 import { registerHandler } from '../../../common/event-emitter/register-handler';
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler';
-import { AggregateBase } from '../../utils/aggregate-base';
 import { FEATURE_NAME, SUPPORTABILITY_METRIC, CUSTOM_METRIC, SUPPORTABILITY_METRIC_CHANNEL, CUSTOM_METRIC_CHANNEL } from '../constants';
 import { drain } from '../../../common/drain/drain';
 import { getFrameworks } from '../../../common/metrics/framework-detection';
@@ -11,7 +10,9 @@ import { VERSION } from "../../../common/constants/env.npm";
 import { onDOMContentLoaded } from '../../../common/window/load';
 import { windowAddEventListener } from '../../../common/event-listener/event-listener-opts';
 import { isBrowserScope } from '../../../common/util/global-scope';
-export class Aggregate extends AggregateBase {
+import { FeatureBase } from '../../utils/feature-base';
+import { stringify } from '../../../common/util/stringify';
+export class Aggregate extends FeatureBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, FEATURE_NAME);
@@ -103,6 +104,7 @@ export class Aggregate extends AggregateBase {
     try {
       if (this.resourcesSent) return;
       const agentRuntime = getRuntime(this.agentIdentifier);
+      const info = getInfo(this.agentIdentifier);
       // make sure this only gets sent once
       this.resourcesSent = true;
       // differentiate between internal+external and ajax+non-ajax
@@ -128,10 +130,19 @@ export class Aggregate extends 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 = stringify(info.jsAttributes);
+      this.storeSupportabilityMetrics('PageSession/Feature/CustomData/Bytes', jsAttributes === '{}' ? 0 : jsAttributes.length);
     } catch (e) {
       // do nothing
     }

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

@@ -9,11 +9,11 @@ import { registerHandler as register } from '../../../common/event-emitter/regis
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler';
 import { cleanURL } from '../../../common/url/clean-url';
 import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config';
-import { AggregateBase } from '../../utils/aggregate-base';
 import { FEATURE_NAME } from '../constants';
 import { drain } from '../../../common/drain/drain';
 import { isBrowserScope } from '../../../common/util/global-scope';
-export class Aggregate extends AggregateBase {
+import { FeatureBase } from '../../utils/feature-base';
+export class Aggregate extends FeatureBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     var _this;

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

@@ -10,13 +10,13 @@ import { paintMetrics } from '../../../common/metrics/paint-metrics';
 import { submitData } from '../../../common/util/submit-data';
 import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config';
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler';
-import { AggregateBase } from '../../utils/aggregate-base';
 import * as CONSTANTS from '../constants';
 import { getActivatedFeaturesFlags } from './initialized-features';
 import { globalScope, isBrowserScope } from '../../../common/util/global-scope';
 import { drain } from '../../../common/drain/drain';
+import { FeatureBase } from '../../utils/feature-base';
 const jsonp = 'NREUM.setToken';
-export class Aggregate extends AggregateBase {
+export class Aggregate extends FeatureBase {
   static featureName = CONSTANTS.FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, CONSTANTS.FEATURE_NAME);
@@ -130,7 +130,10 @@ export class Aggregate extends AggregateBase {
     var queryString = 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.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/esm/features/page_view_timing/aggregate/index.js

@@ -14,11 +14,11 @@ import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { cleanURL } from '../../../common/url/clean-url';
 import { handle } from '../../../common/event-emitter/handle';
 import { getInfo, getConfigurationValue, getRuntime } from '../../../common/config/config';
-import { AggregateBase } from '../../utils/aggregate-base';
 import { FEATURE_NAME } from '../constants';
 import { drain } from '../../../common/drain/drain';
 import { FEATURE_NAMES } from '../../../loaders/features/features';
-export class Aggregate extends AggregateBase {
+import { FeatureBase } from '../../utils/feature-base';
+export class Aggregate extends FeatureBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     var _this;
@@ -29,7 +29,7 @@ export class Aggregate extends 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 = 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
@@ -105,10 +105,10 @@ export class Aggregate extends AggregateBase {
         attributes.size = lcpEntry.size;
         attributes.eid = lcpEntry.id;
         if (lcpEntry.url) {
-          attributes['elUrl'] = cleanURL(lcpEntry.url);
+          attributes.elUrl = cleanURL(lcpEntry.url);
         }
         if (lcpEntry.element?.tagName) {
-          attributes['elTag'] = lcpEntry.element.tagName;
+          attributes.elTag = lcpEntry.element.tagName;
         }
       }
       this.addConnectionAttributes(attributes);
@@ -221,7 +221,7 @@ export class Aggregate extends 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/esm/features/session_trace/aggregate/index.js

@@ -8,14 +8,13 @@ import { mapOwn } from '../../../common/util/map-own';
 import { stringify } from '../../../common/util/stringify';
 import { parseUrl } from '../../../common/url/parse-url';
 import { supportsPerformanceObserver } from '../../../common/window/supports-performance-observer';
-import slice from 'lodash._slice';
 import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config';
 import { now } from '../../../common/timing/now';
-import { AggregateBase } from '../../utils/aggregate-base';
 import { FEATURE_NAME } from '../constants';
 import { drain } from '../../../common/drain/drain';
 import { HandlerCache } from '../../utils/handler-cache';
-export class Aggregate extends AggregateBase {
+import { FeatureBase } from '../../utils/feature-base';
+export class Aggregate extends FeatureBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     var _this;
@@ -252,7 +251,7 @@ export class Aggregate extends AggregateBase {
     } else if (t && typeof t.tagName === 'string') {
       origin = t.tagName.toLowerCase();
       if (t.id) origin += '#' + t.id;
-      if (t.className) origin += '.' + slice(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/esm/features/spa/aggregate/index.js

@@ -2,7 +2,7 @@
  * Copyright 2020 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-/*eslint no-undef: "error"*/
+/* eslint no-undef: "error" */
 import { registerHandler as register } from '../../../common/event-emitter/register-handler';
 import { parseUrl } from '../../../common/url/parse-url';
 import { shouldCollectEvent } from '../../../common/deny-list/deny-list';
@@ -13,13 +13,13 @@ import { paintMetrics } from '../../../common/metrics/paint-metrics';
 import { Interaction } from './interaction';
 import { getConfigurationValue, getRuntime } from '../../../common/config/config';
 import { eventListenerOpts } from '../../../common/event-listener/event-listener-opts';
-import { AggregateBase } from '../../utils/aggregate-base';
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler';
 import { Serializer } from './serializer';
 import { ee } from '../../../common/event-emitter/contextual-ee';
 import * as CONSTANTS from '../constants';
 import { drain } from '../../../common/drain/drain';
 import { FEATURE_NAMES } from '../../../loaders/features/features';
+import { FeatureBase } from '../../utils/feature-base';
 const {
   FEATURE_NAME,
   INTERACTION_EVENTS,
@@ -38,7 +38,7 @@ const {
   JSONP_END,
   originalSetTimeout
 } = CONSTANTS;
-export class Aggregate extends AggregateBase {
+export class Aggregate extends FeatureBase {
   static featureName = FEATURE_NAME;
   constructor(agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, FEATURE_NAME);
@@ -81,7 +81,8 @@ export class Aggregate extends AggregateBase {
       onFinished: onHarvestFinished,
       retryDelay: state.harvestTimeSeconds
     }, {
-      agentIdentifier
+      agentIdentifier,
+      ee: baseEE
     });
     scheduler.harvest.on('events', onHarvestStarted);
 
@@ -213,7 +214,7 @@ export class Aggregate extends 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/esm/features/utils/agent-session.js

@@ -0,0 +1,67 @@
+import { getConfigurationValue, getInfo, getRuntime, setInfo } from '../../common/config/config';
+import { drain } from '../../common/drain/drain';
+import { ee } from '../../common/event-emitter/contextual-ee';
+import { registerHandler } from '../../common/event-emitter/register-handler';
+import { isBrowserScope } from '../../common/util/global-scope';
+import { SessionEntity } from '../../common/session/session-entity';
+import { LocalStorage } from '../../common/storage/local-storage.js';
+import { FirstPartyCookies } from '../../common/storage/first-party-cookies';
+import { LocalMemory } from '../../common/storage/local-memory';
+let ranOnce = 0;
+export function setupAgentSession(agentIdentifier) {
+  const agentRuntime = getRuntime(agentIdentifier);
+  if (ranOnce++) return agentRuntime.session;
+  const sharedEE = 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 = getConfigurationValue(agentIdentifier, 'privacy.cookies_enabled') === true;
+  if (cookiesEnabled && isBrowserScope) {
+    storageAPI = getConfigurationValue(agentIdentifier, 'session.domain') ? new FirstPartyCookies(getConfigurationValue(agentIdentifier, 'session.domain')) : new LocalStorage();
+  }
+  if (cookiesEnabled) {
+    // defaults to "LocalMemory" if storageAPI is undefined, such as in Worker build
+    agentRuntime.session = new SessionEntity({
+      agentIdentifier,
+      key: 'SESSION',
+      storageAPI,
+      expiresMs: getConfigurationValue(agentIdentifier, 'session.expiresMs'),
+      inactiveMs: 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 (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 = getInfo(agentIdentifier);
+    if (customSessionData) {
+      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
+  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
+  registerHandler('api-setUserId', (time, key, value) => {
+    agentRuntime.session.syncCustomAttribute(key, value);
+  }, 'session', sharedEE);
+  drain(agentIdentifier, 'session');
+  return agentRuntime.session;
+}

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

@@ -26,7 +26,7 @@ export 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 (!isConfigured(this.agentIdentifier)) {
       let jsAttributes = {
         ...gosCDN().info?.jsAttributes

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

@@ -48,6 +48,12 @@ export class InstrumentBase extends 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 import( /* webpackChunkName: "session-manager" */'./agent-session');
+        setupAgentSession(this.agentIdentifier);
+        // import and instantiate the aggregator chunk
         const {
           lazyLoader
         } = await import( /* webpackChunkName: "lazy-loader" */'./lazy-loader');
@@ -56,9 +62,8 @@ export class InstrumentBase extends FeatureBase {
         } = await lazyLoader(this.featureName, 'aggregate');
         new Aggregate(this.agentIdentifier, this.aggregator);
       } catch (e) {
-        warn("Downloading ".concat(this.featureName, " failed..."));
+        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/esm/features/utils/lazy-loader.js

@@ -9,7 +9,7 @@ import { FEATURE_NAMES } from '../../loaders/features/features';
  * 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>}
  */
 export function lazyLoader(featureName, featurePart) {
   if (featurePart === 'aggregate') {

package/dist/esm/loaders/agent.js

@@ -66,7 +66,7 @@ export class Agent {
         this.features[featName].abortHandler?.();
       }
       const newrelic = 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/esm/loaders/api/api.js

@@ -9,11 +9,10 @@ import { ee } from '../../common/event-emitter/contextual-ee';
 import { now } from '../../common/timing/now';
 import { drain, registerDrain } from '../../common/drain/drain';
 import { onWindowLoad } from '../../common/window/load';
-import { isBrowserScope, isWorkerScope } from '../../common/util/global-scope';
+import { isWorkerScope } from '../../common/util/global-scope';
 import { warn } from '../../common/util/console';
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../features/metrics/constants';
 import { gosCDN } from '../../common/window/nreum';
-import { putInBrowserStorage, removeFromBrowserStorage } from '../../common/window/session-storage';
 export const CUSTOM_ATTR_GROUP = 'CUSTOM/'; // the subgroup items should be stored under in storage API
 
 export function setTopLevelCallers() {
@@ -72,7 +71,6 @@ export function setAPI(agentIdentifier, forceDrain) {
     const currentInfo = getInfo(agentIdentifier);
     if (value === null) {
       delete currentInfo.jsAttributes[key];
-      if (isBrowserScope) removeFromBrowserStorage(key, CUSTOM_ATTR_GROUP); // addToBrowserStorage flag isn't needed to unset keys from storage
     } else {
       setInfo(agentIdentifier, {
         ...currentInfo,
@@ -81,9 +79,8 @@ export function setAPI(agentIdentifier, forceDrain) {
           [key]: value
         }
       });
-      if (isBrowserScope && addToBrowserStorage) 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/esm/loaders/api/apiAsync.js

@@ -3,7 +3,7 @@ import { getConfigurationValue, getInfo, getRuntime } from '../../common/config/
 import { ee } from '../../common/event-emitter/contextual-ee';
 import { handle } from '../../common/event-emitter/handle';
 import { registerHandler } from '../../common/event-emitter/register-handler';
-import { single } from '../../common/util/single';
+import { single } from '../../common/util/invoke';
 import { submitData } from '../../common/util/submit-data';
 import { isBrowserScope } from '../../common/util/global-scope';
 import { CUSTOM_METRIC_CHANNEL } from '../../features/metrics/constants';
@@ -65,6 +65,7 @@ export function setAPI(agentIdentifier) {
     request_name = window.encodeURIComponent(request_name);
     cycle += 1;
     const agentInfo = getInfo(agentIdentifier);
+    const agentRuntime = getRuntime(agentIdentifier);
     if (!agentInfo.beacon) return;
     var url = scheme + '://' + agentInfo.beacon + '/1/' + agentInfo.licenseKey;
     url += '?a=' + agentInfo.applicationID + '&';

package/dist/esm/loaders/configure/configure.js

@@ -1,9 +1,8 @@
-import { setAPI, setTopLevelCallers, CUSTOM_ATTR_GROUP } from '../api/api';
+import { setAPI, setTopLevelCallers } from '../api/api';
 import { addToNREUM, gosCDN, gosNREUMInitializedAgents } from '../../common/window/nreum';
 import { setConfiguration, setInfo, setLoaderConfig, setRuntime } from '../../common/config/config';
 import { activateFeatures, activatedFeatures } from '../../common/util/feature-flags';
-import { isBrowserScope, isWorkerScope } from '../../common/util/global-scope';
-import { getAllStorageItemsOfGroup } from '../../common/window/session-storage';
+import { isWorkerScope } from '../../common/util/global-scope';
 export function configure(agentIdentifier) {
   let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   let loaderType = arguments.length > 2 ? arguments[2] : undefined;
@@ -28,11 +27,6 @@ export function configure(agentIdentifier) {
     // add a default attr to all worker payloads
     info.jsAttributes.isWorker = true;
   }
-  if (isBrowserScope) {
-    // retrieve & re-add all of the persisted setCustomAttribute|setUserId k-v from previous page load(s)
-    let prevPageSessionJsAttrs = getAllStorageItemsOfGroup(CUSTOM_ATTR_GROUP);
-    Object.assign(info.jsAttributes, prevPageSessionJsAttrs);
-  }
   setInfo(agentIdentifier, info);
   setConfiguration(agentIdentifier, init || {});
   setLoaderConfig(agentIdentifier, loader_config || {});

package/dist/types/common/config/state/configurable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configurable.d.ts","sourceRoot":"","sources":["../../../../../src/common/config/state/configurable.js"],"names":[],"mappings":"AAGA;IACE,kCAoBC;CACF"}
+{"version":3,"file":"configurable.d.ts","sourceRoot":"","sources":["../../../../../src/common/config/state/configurable.js"],"names":[],"mappings":"AAGA;IACE,kCAEC;CACF"}

package/dist/types/common/config/state/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../src/common/config/state/init.js"],"names":[],"mappings":"AA4BA,+CAIC;AAED,0DAIC;AAED,+DAYC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../src/common/config/state/init.js"],"names":[],"mappings":"AAmCA,+CAIC;AAED,0DAIC;AAED,+DAYC"}

package/dist/types/common/config/state/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../../src/common/config/state/runtime.js"],"names":[],"mappings":"AAoCA,yCAIC;AAED,oDAIC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../../../src/common/config/state/runtime.js"],"names":[],"mappings":"AA+BA,yCAIC;AAED,oDAIC"}

package/dist/types/common/context/shared-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared-context.d.ts","sourceRoot":"","sources":["../../../../src/common/context/shared-context.js"],"names":[],"mappings":"AAOA;IACE,0BAWC;IARG,8BAAuB;CAS5B"}
+{"version":3,"file":"shared-context.d.ts","sourceRoot":"","sources":["../../../../src/common/context/shared-context.js"],"names":[],"mappings":"AAQA;IACE,0BAWC;IARG,8BAAuB;CAS5B"}

package/dist/types/common/event-listener/event-listener-opts.d.ts

@@ -4,7 +4,7 @@ export function eventListenerOpts(useCapture: any, abortSignal: any): boolean |
     signal: any;
 };
 /** Do not use this within the worker context. */
-export function windowAddEventListener(event: any, listener: any, capture?: boolean): void;
+export function windowAddEventListener(event: any, listener: any, capture: boolean | undefined, abortSignal: any): void;
 /** Do not use this within the worker context. */
-export function documentAddEventListener(event: any, listener: any, capture?: boolean): void;
+export function documentAddEventListener(event: any, listener: any, capture: boolean | undefined, abortSignal: any): void;
 //# sourceMappingURL=event-listener-opts.d.ts.map

package/dist/types/common/event-listener/event-listener-opts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-listener-opts.d.ts","sourceRoot":"","sources":["../../../../src/common/event-listener/event-listener-opts.js"],"names":[],"mappings":"AAuBA;;;;EAQC;AAED,iDAAiD;AACjD,2FAEC;AACD,iDAAiD;AACjD,6FAEC"}
+{"version":3,"file":"event-listener-opts.d.ts","sourceRoot":"","sources":["../../../../src/common/event-listener/event-listener-opts.js"],"names":[],"mappings":"AAuBA;;;;EAQC;AAED,iDAAiD;AACjD,wHAEC;AACD,iDAAiD;AACjD,0HAEC"}

package/dist/types/common/harvest/harvest-scheduler.d.ts

@@ -9,6 +9,7 @@ export class HarvestScheduler extends SharedContext {
     timeoutHandle: NodeJS.Timeout | null;
     aborted: boolean;
     harvest: Harvest;
+    unload(): void;
     startTimer(interval: any, initialDelay: any): void;
     interval: any;
     stopTimer(permanently?: boolean): void;

package/dist/types/common/harvest/harvest-scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"harvest-scheduler.d.ts","sourceRoot":"","sources":["../../../../src/common/harvest/harvest-scheduler.js"],"names":[],"mappings":"AAWA;;GAEG;AACH;IACE,mDAiBC;IAfC,cAAwB;IACxB,UAAsB;IACtB,iBAAoB;IACpB,qCAAyB;IACzB,iBAAoB;IAEpB,iBAA8C;IAWhD,mDAIC;IAHC,cAAwB;IAK1B,uCAMC;IAED,6CAWC;IAED,yCA8BC;IAED,gDAiBC;CACF;8BAzG6B,2BAA2B;wBAChB,WAAW"}
+{"version":3,"file":"harvest-scheduler.d.ts","sourceRoot":"","sources":["../../../../src/common/harvest/harvest-scheduler.js"],"names":[],"mappings":"AAWA;;GAEG;AACH;IACE,mDAeC;IAbC,cAAwB;IACxB,UAAsB;IACtB,iBAAoB;IACpB,qCAAyB;IACzB,iBAAoB;IAEpB,iBAA8C;IAShD,eAKC;IAED,mDAIC;IAHC,cAAwB;IAK1B,uCAMC;IAED,6CAWC;IAED,yCA6BC;IAED,gDAiBC;CACF;8BA7G6B,2BAA2B;wBAChB,WAAW"}

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

@@ -1 +1 @@
-{"version":3,"file":"harvest.d.ts","sourceRoot":"","sources":["../../../../src/common/harvest/harvest.js"],"names":[],"mappings":"AA2MA;;;EAsBC;AA3MD;IAII,0BAA2H;IAC3H,uBAAoD;IACpD,kCAAsH;IAEtH,YAAiB;IAGnB;;;;;;;;;OASG;IACH,gBANW,MAAM;QAGK,YAAY;QACZ,MAAM;6BAS3B;IAED;;;;;;;;;;;;;;KAcC;IACD,eAZS,MAAM;QAIgB,EAAE,EAAxB,MAAM;QACgB,IAAI,EAA1B,MAAM;;QAIK,YAAY;QACZ,MAAM;gDAYzB;IAED,kGAGC;IAED,uFAmEC;IAGD,0BAmBC;IAED;;;MAYC;IAED,mCAGC;IAED,uBAIC;CACF;8BAvL6B,2BAA2B;2BAF9B,mBAAmB"}
+{"version":3,"file":"harvest.d.ts","sourceRoot":"","sources":["../../../../src/common/harvest/harvest.js"],"names":[],"mappings":"AA6MA;;;EAsBC;AA7MD;IAII,0BAA2H;IAC3H,uBAAoD;IACpD,kCAAsH;IAEtH,YAAiB;IAGnB;;;;;;;;;OASG;IACH,gBANW,MAAM;QAGK,YAAY;QACZ,MAAM;6BAS3B;IAED;;;;;;;;;;;;;;KAcC;IACD,eAZS,MAAM;QAIgB,EAAE,EAAxB,MAAM;QACgB,IAAI,EAA1B,MAAM;;QAIK,YAAY;QACZ,MAAM;gDAYzB;IAED,kGAGC;IAED,uFAqEC;IAGD,0BAmBC;IAED;;;MAYC;IAED,mCAGC;IAED,uBAIC;CACF;8BAzL6B,2BAA2B;2BAF9B,mBAAmB"}

package/dist/types/common/session/constants.d.ts

@@ -0,0 +1,4 @@
+export const PREFIX: "NRBA";
+export const DEFAULT_EXPIRES_MS: 14400000;
+export const DEFAULT_INACTIVE_MS: 1800000;
+//# sourceMappingURL=constants.d.ts.map

package/dist/types/common/session/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../src/common/session/constants.js"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,0CAA0C;AAC1C,0CAA0C"}