@newrelic/browser-agent 1.263.0 → 1.265.0

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

@@ -1,4 +1,6 @@
-import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config'
+import { getInfo } from '../../../common/config/info'
+import { getConfigurationValue } from '../../../common/config/init'
+import { getRuntime } from '../../../common/config/runtime'
 import { handle } from '../../../common/event-emitter/handle'
 import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
@@ -6,9 +8,12 @@ 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, LOG_LEVELS, MAX_PAYLOAD_SIZE } from '../constants'
+import { FEATURE_NAME, LOGGING_EVENT_EMITTER_CHANNEL, LOG_LEVELS } from '../constants'
 import { Log } from '../shared/log'
 import { isValidLogLevel } from '../shared/utils'
+import { applyFnToProps } from '../../../common/util/traverse'
+import { MAX_PAYLOAD_SIZE } from '../../../common/constants/agent-constants'
+import { EventBuffer } from '../../utils/event-buffer'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -18,11 +23,7 @@ export class Aggregate extends AggregateBase {
     super(agentIdentifier, aggregator, FEATURE_NAME)
 
     /** held logs before sending */
-    this.bufferedLogs = []
-    /** held logs during sending, for retries */
-    this.outgoingLogs = []
-    /** the estimated bytes of log data waiting to be sent -- triggers a harvest if adding a new log will exceed limit  */
-    this.estimatedBytes = 0
+    this.bufferedLogs = new EventBuffer()
 
     this.#agentRuntime = getRuntime(this.agentIdentifier)
     this.#agentInfo = getInfo(this.agentIdentifier)
@@ -36,11 +37,11 @@ export class Aggregate extends AggregateBase {
         getPayload: this.prepareHarvest.bind(this),
         raw: true
       }, this)
-      /** harvest immediately once started to purge pre-load logs collected */
-      this.scheduler.startTimer(this.harvestTimeSeconds, 0)
       /** emitted by instrument class (wrapped loggers) or the api methods directly */
       registerHandler(LOGGING_EVENT_EMITTER_CHANNEL, this.handleLog.bind(this), this.featureName, this.ee)
       this.drain()
+      /** harvest immediately once started to purge pre-load logs collected */
+      this.scheduler.startTimer(this.harvestTimeSeconds, 0)
     })
   }
 
@@ -67,38 +68,36 @@ export class Aggregate extends AggregateBase {
       return
     }
     if (typeof message !== 'string' || !message) return warn(32)
-    if (message.length > MAX_PAYLOAD_SIZE) {
-      handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', message.length])
-      return warn(31, message.slice(0, 25) + '...')
-    }
 
     const log = new Log(
-      this.#agentRuntime.timeKeeper.convertRelativeTimestamp(timestamp),
+      Math.floor(this.#agentRuntime.timeKeeper.correctAbsoluteTimestamp(
+        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(31, log.message.slice(0, 25) + '...')
-    }
 
-    if (this.estimatedBytes + logBytes >= MAX_PAYLOAD_SIZE) {
-      handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Early/Seen', this.estimatedBytes + logBytes])
-      this.scheduler.runHarvest({})
+    if (!this.bufferedLogs.canMerge(logBytes)) {
+      if (this.bufferedLogs.hasData) {
+        handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Early/Seen', this.bufferedLogs.bytes + logBytes])
+        this.scheduler.runHarvest({})
+        if (logBytes < MAX_PAYLOAD_SIZE) this.bufferedLogs.add(log)
+      } else {
+        handle(SUPPORTABILITY_METRIC_CHANNEL, ['Logging/Harvest/Failed/Seen', logBytes])
+        warn(31, log.message.slice(0, 25) + '...')
+      }
+      return
     }
-    this.estimatedBytes += logBytes
-    this.bufferedLogs.push(log)
+
+    this.bufferedLogs.add(log)
   }
 
-  prepareHarvest () {
-    if (this.blocked || !(this.bufferedLogs.length || this.outgoingLogs.length)) return
-    /** populate outgoing array while also clearing main buffer */
-    this.outgoingLogs.push(...this.bufferedLogs.splice(0))
-    this.estimatedBytes = 0
+  prepareHarvest (options = {}) {
+    if (this.blocked || !this.bufferedLogs.hasData) return
     /** see https://source.datanerd.us/agents/rum-specs/blob/main/browser/Log for logging spec */
-    return {
+    const payload = {
       qs: {
         browser_monitoring_key: this.#agentInfo.licenseKey
       },
@@ -117,12 +116,21 @@ export class Aggregate extends AggregateBase {
           }
         },
         /** logs section contains individual unique log entries */
-        logs: this.outgoingLogs
+        logs: applyFnToProps(
+          this.bufferedLogs.buffer,
+          this.obfuscator.obfuscateString.bind(this.obfuscator), 'string'
+        )
       }]
     }
+
+    if (options.retry) this.bufferedLogs.hold()
+    else this.bufferedLogs.clear()
+
+    return payload
   }
 
   onHarvestFinished (result) {
-    if (!result.retry) this.outgoingLogs = []
+    if (result.retry) this.bufferedLogs.unhold()
+    else this.bufferedLogs.held.clear()
   }
 }

package/src/features/logging/constants.js

@@ -11,5 +11,3 @@ export const LOG_LEVELS = {
 export const LOGGING_EVENT_EMITTER_CHANNEL = 'log'
 
 export const FEATURE_NAME = FEATURE_NAMES.logging
-
-export const MAX_PAYLOAD_SIZE = 1000000

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

@@ -16,3 +16,5 @@ export class Instrument extends InstrumentBase {
     this.importAggregator()
   }
 }
+
+export const Logging = Instrument

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

@@ -22,5 +22,5 @@ export function bufferLog (ee, message, customAttributes = {}, level = LOG_LEVEL
  */
 export function isValidLogLevel (level) {
   if (typeof level !== 'string') return false
-  return Object.values(LOG_LEVELS).some(logLevel => logLevel === level)
+  return Object.values(LOG_LEVELS).some(logLevel => logLevel === level.toUpperCase().trim())
 }

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

@@ -1,15 +1,17 @@
-import { getRuntime, getConfiguration } from '../../../common/config/config'
+import { getConfiguration } from '../../../common/config/init'
+import { getRuntime } from '../../../common/config/runtime'
 import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
-import { FEATURE_NAME, SUPPORTABILITY_METRIC, CUSTOM_METRIC, SUPPORTABILITY_METRIC_CHANNEL, CUSTOM_METRIC_CHANNEL } from '../constants'
+import { FEATURE_NAME, SUPPORTABILITY_METRIC, CUSTOM_METRIC, SUPPORTABILITY_METRIC_CHANNEL, CUSTOM_METRIC_CHANNEL, WATCHABLE_WEB_SOCKET_EVENTS } from '../constants'
 import { getFrameworks } from './framework-detection'
 import { isFileProtocol } from '../../../common/url/protocol'
-import { getRules, validateRules } from '../../../common/util/obfuscate'
 import { onDOMContentLoaded } from '../../../common/window/load'
 import { windowAddEventListener } from '../../../common/event-listener/event-listener-opts'
 import { isBrowserScope, isWorkerScope } from '../../../common/constants/runtime'
 import { AggregateBase } from '../../utils/aggregate-base'
 import { deregisterDrain } from '../../../common/drain/drain'
+import { WEBSOCKET_TAG } from '../../../common/wrap/wrap-websocket'
+import { handleWebsocketEvents } from './websocket-detection'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -89,25 +91,38 @@ export class Aggregate extends AggregateBase {
     }
 
     // Capture SMs to assess customer engagement with the obfuscation config
-    const rules = getRules(this.agentIdentifier)
-    if (rules.length > 0) this.storeSupportabilityMetrics('Generic/Obfuscate/Detected')
-    if (rules.length > 0 && !validateRules(rules)) this.storeSupportabilityMetrics('Generic/Obfuscate/Invalid')
+    const ruleValidations = this.obfuscator.ruleValidationCache
+    if (ruleValidations.length > 0) {
+      this.storeSupportabilityMetrics('Generic/Obfuscate/Detected')
+      if (ruleValidations.filter(ruleValidation => !ruleValidation.isValid).length > 0) this.storeSupportabilityMetrics('Generic/Obfuscate/Invalid')
+    }
 
     // Check if proxy for either chunks or beacon is being used
     if (proxy.assets) this.storeSupportabilityMetrics('Config/AssetsUrl/Changed')
     if (proxy.beacon) this.storeSupportabilityMetrics('Config/BeaconUrl/Changed')
 
     if (isBrowserScope && window.MutationObserver) {
-      this.storeSupportabilityMetrics('Generic/VideoElement/Added', window.document.querySelectorAll('video').length)
+      if (window.self !== window.top) { this.storeSupportabilityMetrics('Generic/Runtime/IFrame/Detected') }
+      const preExistingVideos = window.document.querySelectorAll('video').length
+      if (preExistingVideos) this.storeSupportabilityMetrics('Generic/VideoElement/Added', preExistingVideos)
+      const preExistingIframes = window.document.querySelectorAll('iframe').length
+      if (preExistingIframes) this.storeSupportabilityMetrics('Generic/IFrame/Added', preExistingIframes)
       const mo = new MutationObserver(records => {
         records.forEach(record => {
           record.addedNodes.forEach(addedNode => {
             if (addedNode instanceof HTMLVideoElement) { this.storeSupportabilityMetrics('Generic/VideoElement/Added', 1) }
+            if (addedNode instanceof HTMLIFrameElement) { this.storeSupportabilityMetrics('Generic/IFrame/Added', 1) }
           })
         })
       })
       mo.observe(window.document.body, { childList: true, subtree: true })
     }
+
+    WATCHABLE_WEB_SOCKET_EVENTS.forEach(tag => {
+      registerHandler('buffered-' + WEBSOCKET_TAG + tag, (...args) => {
+        handleWebsocketEvents(this.storeSupportabilityMetrics.bind(this), tag, ...args)
+      }, this.featureName, this.ee)
+    })
   }
 
   eachSessionChecks () {
@@ -147,8 +162,8 @@ export class Aggregate extends AggregateBase {
       if (typeof performance !== 'undefined') {
         const markers = performance.getEntriesByType('mark')
         const measures = performance.getEntriesByType('measure')
-        this.storeSupportabilityMetrics('Generic/Performance/Mark/Seen', markers.length)
-        this.storeSupportabilityMetrics('Generic/Performance/Measure/Seen', measures.length)
+        if (markers.length) this.storeSupportabilityMetrics('Generic/Performance/Mark/Seen', markers.length)
+        if (measures.length) this.storeSupportabilityMetrics('Generic/Performance/Measure/Seen', measures.length)
       }
     } catch (e) {
       // do nothing

package/src/features/metrics/aggregate/websocket-detection.js

@@ -0,0 +1,31 @@
+import { dataSize } from '../../../common/util/data-size'
+import { toTitleCase } from '../../../common/util/text'
+import { ADD_EVENT_LISTENER_TAG } from '../../../common/wrap/wrap-websocket'
+
+/**
+ * A SM handler for web socket events, which converts them to a shape suitable for SMs and reports them.
+ * @param {Function} reporter a function that reports data as a supportability metric
+ * @param {string} tag the unique tag to assign to the sm
+ * @param {number} timestamp ms from page origin
+ * @param {number} timeSinceInit ms from class init
+ * @param {boolean} isLoaded whether the even was observed before the page load event
+ * @param {string} socketId a unique id assigned to the observed socket
+ * @param {*} data the data reported alongside the socket event
+ */
+export function handleWebsocketEvents (reporter, tag, timestamp, timeSinceInit, isLoaded, socketId, data) {
+  // socketId is unused in the SMs
+  const useDataType = tag === ADD_EVENT_LISTENER_TAG
+  let metricTag = toTitleCase(useDataType ? data.eventType : tag)
+  if (metricTag === 'Close') {
+    if (data?.event.code === 1000 || data?.event.wasClean) metricTag += '-Clean'
+    else metricTag += '-Dirty'
+  }
+  const bytes = (metricTag === 'Message' && dataSize(data?.event?.data)) || (metricTag === 'Send' && dataSize(data))
+  reporter(buildSMTag(metricTag, 'Ms'), timestamp)
+  reporter(buildSMTag(metricTag, 'MsSinceClassInit'), timeSinceInit)
+  if (bytes) reporter(buildSMTag(metricTag, 'Bytes'), bytes)
+}
+
+function buildSMTag (tag, category) {
+  return 'WebSocket/' + tag + '/' + category
+}

package/src/features/metrics/constants.js

@@ -1,3 +1,4 @@
+import { ADD_EVENT_LISTENER_TAG } from '../../common/wrap/wrap-websocket'
 import { FEATURE_NAMES } from '../../loaders/features/features'
 
 export const FEATURE_NAME = FEATURE_NAMES.metrics
@@ -5,3 +6,5 @@ export const SUPPORTABILITY_METRIC = 'sm'
 export const CUSTOM_METRIC = 'cm'
 export const SUPPORTABILITY_METRIC_CHANNEL = 'storeSupportabilityMetrics'
 export const CUSTOM_METRIC_CHANNEL = 'storeEventMetrics'
+
+export const WATCHABLE_WEB_SOCKET_EVENTS = ['new', 'send', 'close', ADD_EVENT_LISTENER_TAG]

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

@@ -1,10 +1,22 @@
+import { handle } from '../../../common/event-emitter/handle'
+import { WEBSOCKET_TAG, wrapWebSocket } from '../../../common/wrap/wrap-websocket'
 import { InstrumentBase } from '../../utils/instrument-base'
-import { FEATURE_NAME } from '../constants'
+import { FEATURE_NAME, WATCHABLE_WEB_SOCKET_EVENTS } from '../constants'
 
 export class Instrument extends InstrumentBase {
   static featureName = FEATURE_NAME
   constructor (agentIdentifier, aggregator, auto = true) {
     super(agentIdentifier, aggregator, FEATURE_NAME, auto)
+    wrapWebSocket(this.ee)
+
+    WATCHABLE_WEB_SOCKET_EVENTS.forEach((suffix) => {
+      this.ee.on(WEBSOCKET_TAG + suffix, (...args) => {
+        handle('buffered-' + WEBSOCKET_TAG + suffix, [...args], undefined, this.featureName, this.ee)
+      })
+    })
+
     this.importAggregator()
   }
 }
+
+export const Metrics = Instrument

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

@@ -3,13 +3,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { InstrumentBase } from '../../utils/instrument-base'
-import { FEATURE_NAME } from '../constants'
+import { GenericEvents } from '../../generic_events'
 
-export class Instrument extends InstrumentBase {
-  static featureName = FEATURE_NAME
+/**
+ * @deprecated This feature has been replaced by Generic Events. Use/Import `GenericEvents` instead. This wrapper will be removed in a future release
+ */
+export class Instrument extends GenericEvents {
   constructor (agentIdentifier, aggregator, auto = true) {
-    super(agentIdentifier, aggregator, FEATURE_NAME, auto)
-    this.importAggregator()
+    super(agentIdentifier, aggregator, auto)
   }
 }
+
+/**
+ * @deprecated This feature has been replaced by Generic Events. Use/Import `GenericEvents` instead. This wrapper will be removed in a future release
+ */
+export const PageAction = Instrument

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

@@ -1,7 +1,8 @@
 import { globalScope, isBrowserScope, originTime } from '../../../common/constants/runtime'
 import { addPT, addPN } from '../../../common/timing/nav-timing'
 import { stringify } from '../../../common/util/stringify'
-import { getInfo, getRuntime, isConfigured } from '../../../common/config/config'
+import { getInfo, isValid } from '../../../common/config/info'
+import { getRuntime } from '../../../common/config/runtime'
 import { Harvest } from '../../../common/harvest/harvest'
 import * as CONSTANTS from '../constants'
 import { getActivatedFeaturesFlags } from './initialized-features'
@@ -11,12 +12,9 @@ import { AggregateBase } from '../../utils/aggregate-base'
 import { firstContentfulPaint } from '../../../common/vitals/first-contentful-paint'
 import { firstPaint } from '../../../common/vitals/first-paint'
 import { timeToFirstByte } from '../../../common/vitals/time-to-first-byte'
-import { drain } from '../../../common/drain/drain'
-import { FEATURE_NAMES } from '../../../loaders/features/features'
-import { handle } from '../../../common/event-emitter/handle'
-import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { now } from '../../../common/timing/now'
 import { TimeKeeper } from '../../../common/timing/time-keeper'
+import { applyFnToProps } from '../../../common/util/traverse'
 
 export class Aggregate extends AggregateBase {
   static featureName = CONSTANTS.FEATURE_NAME
@@ -28,7 +26,7 @@ export class Aggregate extends AggregateBase {
     this.firstByteToDomContent = 0 // our "dom processing" duration
     this.timeKeeper = new TimeKeeper(this.agentIdentifier)
 
-    if (!isConfigured(agentIdentifier)) {
+    if (!isValid(agentIdentifier)) {
       this.ee.abort()
       return warn(43)
     }
@@ -84,7 +82,7 @@ export class Aggregate extends AggregateBase {
 
     let body
     if (typeof info.jsAttributes === 'object' && Object.keys(info.jsAttributes).length > 0) {
-      body = { ja: info.jsAttributes }
+      body = applyFnToProps({ ja: info.jsAttributes }, this.obfuscator.obfuscateString.bind(this.obfuscator), 'string')
     }
 
     if (globalScope.performance) {
@@ -108,7 +106,9 @@ export class Aggregate extends AggregateBase {
     queryParameters.fcp = firstContentfulPaint.current.value
 
     if (this.timeKeeper?.ready) {
-      queryParameters.timestamp = this.timeKeeper.convertRelativeTimestamp(now())
+      queryParameters.timestamp = Math.floor(this.timeKeeper.correctAbsoluteTimestamp(
+        this.timeKeeper.convertRelativeTimestamp(now())
+      ))
     }
 
     const rumStartTime = now()
@@ -130,22 +130,7 @@ export class Aggregate extends AggregateBase {
           if (!this.timeKeeper.ready) throw new Error('TimeKeeper not ready')
 
           agentRuntime.timeKeeper = this.timeKeeper
-
-          // Check if the time diff is such that we need to capture a supportability metric
-          if (this.timeKeeper.localTimeDiff >= 12 * 60 * 60 * 1000) {
-            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/DiffExceed12Hrs'], undefined, FEATURE_NAMES.metrics, this.ee)
-          } else if (this.timeKeeper.localTimeDiff >= 6 * 60 * 60 * 1000) {
-            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/DiffExceed6Hrs'], undefined, FEATURE_NAMES.metrics, this.ee)
-          } else if (this.timeKeeper.localTimeDiff >= 60 * 60 * 1000) {
-            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/DiffExceed1Hrs'], undefined, FEATURE_NAMES.metrics, this.ee)
-          }
         } catch (error) {
-          if (error?.message?.indexOf('invalid format') > 0) {
-            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/InvalidFormat'], undefined, FEATURE_NAMES.metrics, this.ee)
-          } else {
-            handle(SUPPORTABILITY_METRIC_CHANNEL, ['PVE/NRTime/Calculation/Failed'], undefined, FEATURE_NAMES.metrics, this.ee)
-          }
-          drain(this.agentIdentifier, FEATURE_NAMES.metrics, true)
           this.ee.abort()
           warn(17, error)
           return

package/src/features/page_view_event/aggregate/initialized-features.js

@@ -18,7 +18,7 @@ export function getActivatedFeaturesFlags (agentId) {
           flagArr.push('xhr'); break
         case FEATURE_NAMES.jserrors:
           flagArr.push('err'); break
-        case FEATURE_NAMES.pageAction:
+        case FEATURE_NAMES.genericEvents:
           flagArr.push('ins'); break
         case FEATURE_NAMES.sessionTrace:
           flagArr.push('stn'); break

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

@@ -9,3 +9,5 @@ export class Instrument extends InstrumentBase {
     this.importAggregator()
   }
 }
+
+export const PageViewEvent = Instrument

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

@@ -4,11 +4,11 @@
  */
 
 import { nullable, numeric, getAddStringContext, addCustomAttributes } from '../../../common/serialize/bel-serializer'
-import { mapOwn } from '../../../common/util/map-own'
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
 import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { handle } from '../../../common/event-emitter/handle'
-import { getInfo, getConfigurationValue } from '../../../common/config/config'
+import { getInfo } from '../../../common/config/info'
+import { getConfigurationValue } from '../../../common/config/init'
 import { FEATURE_NAME } from '../constants'
 import { FEATURE_NAMES } from '../../../loaders/features/features'
 import { AggregateBase } from '../../utils/aggregate-base'
@@ -22,6 +22,7 @@ import { timeToFirstByte } from '../../../common/vitals/time-to-first-byte'
 import { longTask } from '../../../common/vitals/long-task'
 import { subscribeToVisibilityChange } from '../../../common/window/page-visibility'
 import { VITAL_NAMES } from '../../../common/vitals/constants'
+import { EventBuffer } from '../../utils/event-buffer'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -33,8 +34,7 @@ export class Aggregate extends AggregateBase {
   constructor (agentIdentifier, aggregator) {
     super(agentIdentifier, aggregator, FEATURE_NAME)
 
-    this.timings = []
-    this.timingsSent = []
+    this.timings = new EventBuffer()
     this.curSessEndRecorded = false
 
     if (getConfigurationValue(this.agentIdentifier, 'page_view_timing.long_task') === true) longTask.subscribe(this.#handleVitalMetric)
@@ -116,7 +116,7 @@ export class Aggregate extends AggregateBase {
       attrs.cls = cumulativeLayoutShift.current.value
     }
 
-    this.timings.push({
+    this.timings.add({
       name,
       value,
       attrs
@@ -126,10 +126,8 @@ export class Aggregate extends AggregateBase {
   }
 
   onHarvestFinished (result) {
-    if (result.retry && this.timingsSent.length > 0) {
-      this.timings.unshift(...this.timingsSent)
-      this.timingsSent = []
-    }
+    if (result.retry && this.timings.held.hasData) this.timings.unhold()
+    else this.timings.held.clear()
   }
 
   appendGlobalCustomAttributes (timing) {
@@ -138,7 +136,7 @@ export class Aggregate extends AggregateBase {
 
     var reservedAttributes = ['size', 'eid', 'cls', 'type', 'fid', 'elTag', 'elUrl', 'net-type',
       'net-etype', 'net-rtt', 'net-dlink']
-    mapOwn(customAttributes, function (key, val) {
+    Object.entries(customAttributes || {}).forEach(([key, val]) => {
       if (reservedAttributes.indexOf(key) < 0) {
         timingAttributes[key] = val
       }
@@ -147,16 +145,15 @@ export class Aggregate extends AggregateBase {
 
   // serialize and return current timing data, clear and save current data for retry
   prepareHarvest (options) {
-    if (this.timings.length === 0) return
+    if (!this.timings.hasData) return
 
-    var payload = this.getPayload(this.timings)
-    if (options.retry) {
-      for (var i = 0; i < this.timings.length; i++) {
-        this.timingsSent.push(this.timings[i])
-      }
+    var payload = this.getPayload(this.timings.buffer)
+    if (options.retry) this.timings.hold()
+    else this.timings.clear()
+
+    return {
+      body: { e: payload }
     }
-    this.timings = []
-    return { body: { e: payload } }
   }
 
   // serialize array of timing data

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

@@ -25,3 +25,5 @@ export class Instrument extends InstrumentBase {
     this.importAggregator()
   }
 }
+
+export const PageViewTiming = Instrument

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

@@ -4,16 +4,14 @@
  */
 /**
  * @file Records, aggregates, and harvests session replay data.
- *
- * NOTE: This code is under development and dormant. It will not download to instrumented pages or record any data.
- * It is not production ready, and is not intended to be imported or implemented in any build of the browser agent until
- * functionality is validated and a full user experience is curated.
  */
 
 import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { HarvestScheduler } from '../../../common/harvest/harvest-scheduler'
-import { ABORT_REASONS, FEATURE_NAME, MAX_PAYLOAD_SIZE, QUERY_PARAM_PADDING, RRWEB_EVENT_TYPES, SR_EVENT_EMITTER_TYPES, TRIGGERS } from '../constants'
-import { getConfigurationValue, getInfo, getRuntime } from '../../../common/config/config'
+import { ABORT_REASONS, FEATURE_NAME, QUERY_PARAM_PADDING, RRWEB_EVENT_TYPES, SR_EVENT_EMITTER_TYPES, TRIGGERS } from '../constants'
+import { getInfo } from '../../../common/config/info'
+import { getConfigurationValue } from '../../../common/config/init'
+import { getRuntime } from '../../../common/config/runtime'
 import { AggregateBase } from '../../utils/aggregate-base'
 import { sharedChannel } from '../../../common/constants/shared-channel'
 import { obj as encodeObj } from '../../../common/url/encode'
@@ -29,6 +27,7 @@ import { stylesheetEvaluator } from '../shared/stylesheet-evaluator'
 import { deregisterDrain } from '../../../common/drain/drain'
 import { now } from '../../../common/timing/now'
 import { buildNRMetaNode } from '../shared/utils'
+import { MAX_PAYLOAD_SIZE } from '../../../common/constants/agent-constants'
 
 export class Aggregate extends AggregateBase {
   static featureName = FEATURE_NAME
@@ -328,8 +327,13 @@ export class Aggregate extends AggregateBase {
 
     const firstEventTimestamp = this.getCorrectedTimestamp(events[0]) // from rrweb node
     const lastEventTimestamp = this.getCorrectedTimestamp(events[events.length - 1]) // from rrweb node
-    const firstTimestamp = firstEventTimestamp || this.timeKeeper.correctAbsoluteTimestamp(recorderEvents.cycleTimestamp) // from rrweb node || from when the harvest cycle started
-    const lastTimestamp = lastEventTimestamp || this.timeKeeper.convertRelativeTimestamp(relativeNow)
+    // from rrweb node || from when the harvest cycle started
+    const firstTimestamp = firstEventTimestamp || Math.floor(this.timeKeeper.correctAbsoluteTimestamp(
+      this.timeKeeper.correctAbsoluteTimestamp(recorderEvents.cycleTimestamp)
+    ))
+    const lastTimestamp = lastEventTimestamp || Math.floor(this.timeKeeper.correctAbsoluteTimestamp(
+      this.timeKeeper.convertRelativeTimestamp(relativeNow)
+    ))
 
     const agentMetadata = agentRuntime.appMetadata?.agents?.[0] || {}
 
@@ -363,7 +367,7 @@ export class Aggregate extends AggregateBase {
           'rrweb.version': RRWEB_VERSION,
           'payload.type': recorderEvents.type,
           // customer-defined data should go last so that if it exceeds the query param padding limit it will be truncated instead of important attrs
-          ...(endUserId && { 'enduser.id': endUserId })
+          ...(endUserId && { 'enduser.id': this.obfuscator.obfuscateString(endUserId) })
           // The Query Param is being arbitrarily limited in length here.  It is also applied when estimating the size of the payload in getPayloadSize()
         }, QUERY_PARAM_PADDING).substring(1) // remove the leading '&'
       },

package/src/features/session_replay/constants.js

@@ -19,10 +19,6 @@ export const RRWEB_EVENT_TYPES = {
   Meta: 4,
   Custom: 5
 }
-/** Vortex caps payload sizes at 1MB */
-export const MAX_PAYLOAD_SIZE = 1000000
-/** Unloading caps around 64kb */
-export const IDEAL_PAYLOAD_SIZE = 64000
 /** Interval between forcing new full snapshots -- 15 seconds in error mode (x2), 5 minutes in full mode */
 export const CHECKOUT_MS = { [MODE.ERROR]: 15000, [MODE.FULL]: 300000, [MODE.OFF]: 0 }
 export const ABORT_REASONS = {

package/src/features/session_replay/index.js

@@ -2,11 +2,5 @@
  * Copyright 2023 New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-/**
- * @file The top-level entry point for the eventual Session Replay feature.
- *
- * NOTE: This code is under development and dormant. It will not download to instrumented pages or record any data.
- * It is not production ready, and is not intended to be imported or implemented in any build of the browser agent until
- * functionality is validated and a full user experience is curated.
- */
+
 export { Instrument as SessionReplay } from './instrument/index'

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

@@ -4,11 +4,8 @@
  */
 /**
  * @file Primes the Session Replay feature for lazy loading.
- *
- * NOTE: This code is under development and dormant. It will not download to instrumented pages or record any data.
- * It is not production ready, and is not intended to be imported or implemented in any build of the browser agent until
- * functionality is validated and a full user experience is curated.
  */
+
 import { handle } from '../../../common/event-emitter/handle'
 import { DEFAULT_KEY, MODE, PREFIX } from '../../../common/session/constants'
 import { InstrumentBase } from '../../utils/instrument-base'
@@ -106,3 +103,5 @@ export class Instrument extends InstrumentBase {
     }
   }
 }
+
+export const SessionReplay = Instrument