Merge commit 'ffc647c2c757034b14d56bac9b0103b2016c5fbb' into logapi-separation

Author: cwli24

.github/actions/build-ab/templates/experiments.js

@@ -4,8 +4,8 @@ window.NREUM.loader_config.licenseKey = '{{{args.abLicenseKey}}}'
 window.NREUM.info.applicationID = '{{{args.abAppId}}}'
 window.NREUM.info.licenseKey = '{{{args.abLicenseKey}}}'
 window.NREUM.init.proxy = {} // Proxy won't work for experiments
-window.NREUM.init.session_replay.enabled = false // disabled for now to not double wrap the page which can cause extra processing burden
-window.NREUM.init.session_trace.enabled = false // disabled for now to not double wrap the page which can cause extra processing burden
+window.NREUM.init.session_replay.enabled = true // feature is enabled, but the app settings will have sampling at 0.  We can proactively enable SR for certain test cases through app settings
+window.NREUM.init.session_trace.enabled = true // feature is enabled, but the app settings will have sampling at 0.  We can proactively enable SR for certain test cases through app settings
 window.NREUM.init.feature_flags = ['ajax_metrics_deny_list','soft_nav']
 window.NREUM.init.user_actions = {elementAttributes: ['id', 'className', 'tagName', 'type', 'ariaLabel', 'alt', 'title']}
 

.github/actions/build-ab/templates/latest.js

@@ -5,8 +5,8 @@ window.NREUM.info.applicationID = '{{{args.abAppId}}}'
 window.NREUM.info.licenseKey = '{{{args.abLicenseKey}}}'
 window.NREUM.init.proxy.assets = 'https://staging-js-agent.newrelic.com/dev'
 window.NREUM.init.feature_flags = ['soft_nav','ajax_metrics_deny_list']
-window.NREUM.init.session_replay.enabled = false // disabled for now to not double wrap the page which can cause extra processing burden
-window.NREUM.init.session_trace.enabled = false // disabled for now to not double wrap the page which can cause extra processing burden
+window.NREUM.init.session_replay.enabled = true // feature is enabled, but the app settings will have sampling at 0.  We can proactively enable SR for certain test cases through app settings
+window.NREUM.init.session_trace.enabled = true // feature is enabled, but the app settings will have sampling at 0.  We can proactively enable SR for certain test cases through app settings
 window.NREUM.init.user_actions = {elementAttributes: ['id', 'className', 'tagName', 'type', 'ariaLabel', 'alt', 'title']}
 
 {{{latestScript}}}

CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.297.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.296.0...v1.297.0) (2025-09-10)
+
+
+### Features
+
+* Prevent early harvests when in retry period ([#1548](https://github.com/newrelic/newrelic-browser-agent/issues/1548)) ([5ce9e70](https://github.com/newrelic/newrelic-browser-agent/commit/5ce9e705c2d8e55d4f3f93bd704ad78707aa3c84))
+* remove newrelic meta attribute ([#1550](https://github.com/newrelic/newrelic-browser-agent/issues/1550)) ([f165b3e](https://github.com/newrelic/newrelic-browser-agent/commit/f165b3e877fc4fc4c8b2b77c942b791a25d58705))
+
+
+### Bug Fixes
+
+* Fix exceptions for null bodies arising from empty harvests ([#1553](https://github.com/newrelic/newrelic-browser-agent/issues/1553)) ([b763d03](https://github.com/newrelic/newrelic-browser-agent/commit/b763d03215f043e5be555e2dfe2fba85351d672f))
+
 ## [1.296.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.295.0...v1.296.0) (2025-08-19)
 
 

README.md

@@ -245,6 +245,9 @@ browserAgent.recordCustomEvent(...)
 
 ## Deploying one or more "micro" agents per page
 
+> **ℹ️ Note:**  
+> This loader strategy is slated to be deprecated and eventually removed in a future product release. For better memory usage, build size impacts, entity management and relationships -- a new strategy focused around using a single centralized browser agent instance is actively being worked on. Reach out by email to [email protected] for more information or if you would like to participate in a limited preview when the feature is ready for early adoption.
+
 The examples above use the `Agent` class at their core, which is ideal for most cases as it will automatically detect page-level events across your web application.
 
 Using the `MicroAgent` class, it is possible to skip the "auto" instrumentation phases of the other loader types, and provide a *very small* agent designed for capturing data in a controlled manner via the API interfaces. The `MicroAgent` captures a distinct `PageView` event when instantiated, and additional `PageAction` and `JavaScriptError` events may be captured by calling the `noticeError` and `addPageAction` methods.

changelog.json

@@ -1,6 +1,39 @@
 {
   "repository": "newrelic/newrelic-browser-agent",
   "entries": [
+    {
+      "changes": [
+        {
+          "type": "feat",
+          "sha": "5ce9e705c2d8e55d4f3f93bd704ad78707aa3c84",
+          "message": "Prevent early harvests when in retry period",
+          "issues": [
+            "1548"
+          ]
+        },
+        {
+          "type": "feat",
+          "sha": "f165b3e877fc4fc4c8b2b77c942b791a25d58705",
+          "message": "remove newrelic meta attribute",
+          "issues": [
+            "1550"
+          ]
+        },
+        {
+          "type": "fix",
+          "sha": "b763d03215f043e5be555e2dfe2fba85351d672f",
+          "message": "Fix exceptions for null bodies arising from empty harvests",
+          "issues": [
+            "1553"
+          ]
+        }
+      ],
+      "version": "1.297.0",
+      "language": "JAVASCRIPT",
+      "artifactName": "@newrelic/browser-agent",
+      "id": "929351c8-1b39-4255-bbc8-c935c1f27c32",
+      "createTime": "2025-09-10T21:46:13.910Z"
+    },
     {
       "changes": [
         {
@@ -3132,5 +3165,5 @@
       "createTime": "2023-05-08T21:11:35.144Z"
     }
   ],
-  "updateTime": "2025-08-19T21:32:44.379Z"
+  "updateTime": "2025-09-10T21:46:13.910Z"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.296.0",
+  "version": "1.297.0",
   "private": false,
   "author": "New Relic Browser Agent Team <[email protected]>",
   "description": "New Relic Browser Agent",

package.json

@@ -5,3 +5,4 @@
 export const IDEAL_PAYLOAD_SIZE = 16000
 export const MAX_PAYLOAD_SIZE = 1000000
 export const DEFAULT_KEY = 'NR_CONTAINER_AGENT'
+export const SESSION_ERROR = 'SESSION_ERROR'

src/common/constants/agent-constants.js

@@ -43,8 +43,10 @@ export class Aggregate extends AggregateBase {
     /** set at BCS response, stored in runtime */
     this.timeKeeper = undefined
 
-    this.recorder = args?.recorder
-    this.errorNoticed = args?.errorNoticed || false
+    this.instrumentClass = args
+    // point this var here just in case it already exists and can be used by APIs (session pause, resume, etc.) before handling rum flags
+    this.recorder = this.instrumentClass?.recorder
+
     this.harvestOpts.raw = true
 
     this.isSessionTrackingEnabled = canEnableSessionTracking(agentRef.init) && !!agentRef.runtime.session
@@ -64,7 +66,7 @@ export class Aggregate extends AggregateBase {
       // if the mode changed on a different tab, it needs to update this instance to match
       this.mode = agentRef.runtime.session.state.sessionReplayMode
       if (!this.initialized || this.mode === MODE.OFF) return
-      this.recorder?.startRecording()
+      this.recorder?.startRecording(TRIGGERS.RESUME, this.mode)
     })
 
     this.ee.on(SESSION_EVENTS.UPDATE, (type, data) => {
@@ -131,7 +133,7 @@ export class Aggregate extends AggregateBase {
     this.mode = MODE.FULL
     // if the error was noticed AFTER the recorder was already imported....
     if (this.recorder && this.initialized) {
-      if (!this.agentRef.runtime.isRecording) this.recorder.startRecording()
+      if (!this.agentRef.runtime.isRecording) this.recorder.startRecording(TRIGGERS.SWITCH_TO_FULL, this.mode) // off --> full
       this.syncWithSessionManager({ sessionReplayMode: this.mode })
     } else {
       this.initializeRecording(MODE.FULL, true)
@@ -142,9 +144,10 @@ export class Aggregate extends AggregateBase {
    * Evaluate entitlements and sampling before starting feature mechanics, importing and configuring recording library, and setting storage state
    * @param {boolean} srMode - the true/false state of the "sr" flag (aka. entitlements) from RUM response
    * @param {boolean} ignoreSession - whether to force the method to ignore the session state and use just the sample flags
+   * @param {TRIGGERS} [trigger=TRIGGERS.INITIALIZE] - the trigger that initiated the recording.  Usually TRIGGERS.INITIALIZE, but could be TRIGGERS.API since in certain cases that trigger calls this method
    * @returns {void}
    */
-  async initializeRecording (srMode, ignoreSession) {
+  async initializeRecording (srMode, ignoreSession, trigger = TRIGGERS.INITIALIZE) {
     this.initialized = true
     if (!this.entitled) return
 
@@ -156,7 +159,8 @@ export class Aggregate extends AggregateBase {
     // session replays can continue if already in progress
     const { session, timeKeeper } = this.agentRef.runtime
     this.timeKeeper = timeKeeper
-    if (this.recorder?.parent.trigger === TRIGGERS.API && this.agentRef.runtime.isRecording) {
+
+    if (this.recorder?.trigger === TRIGGERS.API && this.agentRef.runtime.isRecording) {
       this.mode = MODE.FULL
     } else if (!session.isNew && !ignoreSession) { // inherit the mode of the existing session
       this.mode = session.state.sessionReplayMode
@@ -167,29 +171,24 @@ export class Aggregate extends AggregateBase {
     // If off, then don't record (early return)
     if (this.mode === MODE.OFF) return
 
-    if (!this.recorder) {
-      try {
-        // Do not change the webpackChunkName or it will break the webpack nrba-chunking plugin
-        const { Recorder } = (await import(/* webpackChunkName: "recorder" */'../shared/recorder'))
-        this.recorder = new Recorder(this)
-        this.recorder.events.hasError = this.errorNoticed
-      } catch (err) {
-        return this.abort(ABORT_REASONS.IMPORT)
-      }
-    } else {
-      this.recorder.parent = this
+    try {
+      /** will return a recorder instance if already imported, otherwise, will fetch the recorder and initialize it */
+      this.recorder ??= await this.instrumentClass.importRecorder()
+    } catch (err) {
+      /** if the recorder fails to import, abort the feature */
+      return this.abort(ABORT_REASONS.IMPORT, err)
     }
 
     // If an error was noticed before the mode could be set (like in the early lifecycle of the page), immediately set to FULL mode
-    if (this.mode === MODE.ERROR && this.errorNoticed) this.mode = MODE.FULL
+    if (this.mode === MODE.ERROR && this.instrumentClass.errorNoticed) { this.mode = MODE.FULL }
 
     // FULL mode records AND reports from the beginning, while ERROR mode only records (but does not report).
     // ERROR mode will do this until an error is thrown, and then switch into FULL mode.
     // The makeHarvestPayload should ensure that no payload is returned if we're not in FULL mode...
 
     await this.prepUtils()
 
-    if (!this.agentRef.runtime.isRecording) this.recorder.startRecording()
+    if (!this.agentRef.runtime.isRecording) this.recorder.startRecording(trigger, this.mode)
 
     this.syncWithSessionManager({ sessionReplayMode: this.mode })
   }

src/features/session_replay/aggregate/index.js

@@ -54,5 +54,9 @@ export const ABORT_REASONS = {
 export const QUERY_PARAM_PADDING = 5000
 
 export const TRIGGERS = {
-  API: 'api'
+  API: 'api',
+  RESUME: 'resume',
+  SWITCH_TO_FULL: 'switchToFull',
+  INITIALIZE: 'initialize',
+  PRELOAD: 'preload'
 }