Merge branch 'main' into page-resources-feature

Author: metal-messiah

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

@@ -25,7 +25,7 @@ window.NREUM={
       enabled: true
     },
     performance: {
-      capture_marks: true, 
+      capture_marks: false, 
       capture_measures: true
     },
     proxy: {}

CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.274.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.273.1...v1.274.0) (2024-11-19)
+
+
+### Features
+
+* Upgrade SessionReplay libraries to latest version ([#1251](https://github.com/newrelic/newrelic-browser-agent/issues/1251)) ([2d8d114](https://github.com/newrelic/newrelic-browser-agent/commit/2d8d114e70ba2861fb5639e132f25c9c03df871b))
+
+## [1.273.1](https://github.com/newrelic/newrelic-browser-agent/compare/v1.273.0...v1.273.1) (2024-11-18)
+
+
+### Bug Fixes
+
+* Multiple MicroAgent undefined session and limit available API ([#1252](https://github.com/newrelic/newrelic-browser-agent/issues/1252)) ([19cbb63](https://github.com/newrelic/newrelic-browser-agent/commit/19cbb634b5016e3e8ce0c40a6bf1ee59156c78eb))
+
 ## [1.273.0](https://github.com/newrelic/newrelic-browser-agent/compare/v1.272.0...v1.273.0) (2024-11-11)
 
 

changelog.json

@@ -1,6 +1,40 @@
 {
   "repository": "newrelic/newrelic-browser-agent",
   "entries": [
+    {
+      "changes": [
+        {
+          "type": "feat",
+          "sha": "2d8d114e70ba2861fb5639e132f25c9c03df871b",
+          "message": "Upgrade SessionReplay libraries to latest version",
+          "issues": [
+            "1251"
+          ]
+        }
+      ],
+      "version": "1.274.0",
+      "language": "JAVASCRIPT",
+      "artifactName": "@newrelic/browser-agent",
+      "id": "5c0da2d3-92eb-4ab8-8952-bdb5ac32c823",
+      "createTime": "2024-11-19T20:16:39.794Z"
+    },
+    {
+      "changes": [
+        {
+          "type": "fix",
+          "sha": "19cbb634b5016e3e8ce0c40a6bf1ee59156c78eb",
+          "message": "Multiple MicroAgent undefined session and limit available API",
+          "issues": [
+            "1252"
+          ]
+        }
+      ],
+      "version": "1.273.1",
+      "language": "JAVASCRIPT",
+      "artifactName": "@newrelic/browser-agent",
+      "id": "efd8b450-06d8-450b-8130-d57024674e1b",
+      "createTime": "2024-11-18T16:05:55.225Z"
+    },
     {
       "changes": [
         {
@@ -2201,5 +2235,5 @@
       "createTime": "2023-05-08T21:11:35.144Z"
     }
   ],
-  "updateTime": "2024-11-11T17:36:53.044Z"
+  "updateTime": "2024-11-19T20:16:39.794Z"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@newrelic/browser-agent",
-  "version": "1.273.0",
+  "version": "1.274.0",
   "private": false,
   "author": "New Relic Browser Agent Team <[email protected]>",
   "description": "New Relic Browser Agent",
@@ -195,7 +195,7 @@
   },
   "dependencies": {
     "fflate": "0.7.4",
-    "rrweb": "2.0.0-alpha.12",
+    "rrweb": "^2.0.0-alpha.17",
     "web-vitals": "4.2.3"
   },
   "devDependencies": {

package.json

@@ -13,7 +13,6 @@ import { now } from '../../../common/timing/now'
 import { registerHandler } from '../../../common/event-emitter/register-handler'
 import { SUPPORTABILITY_METRIC_CHANNEL } from '../../metrics/constants'
 import { applyFnToProps } from '../../../common/util/traverse'
-import { IDEAL_PAYLOAD_SIZE } from '../../../common/constants/agent-constants'
 import { FEATURE_TO_ENDPOINT } from '../../../loaders/features/features'
 import { UserActionsAggregator } from './user-actions/user-actions-aggregator'
 import { isIFrameWindow } from '../../../common/dom/iframe'
@@ -222,9 +221,16 @@ export class Aggregate extends AggregateBase {
       ...obj
     }
 
-    this.events.add(eventAttributes)
-
-    this.checkEventLimits()
+    const addedEvent = this.events.add(eventAttributes)
+    if (!addedEvent && !this.events.isEmpty()) {
+      /** could not add the event because it pushed the buffer over the limit
+       * so we harvest early, and try to add it again now that the buffer is cleared
+       * if it fails again, we do nothing
+       */
+      this.ee.emit(SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen'])
+      this.harvestScheduler.runHarvest()
+      this.events.add(eventAttributes)
+    }
   }
 
   serializer (eventBuffer) {
@@ -234,15 +240,7 @@ export class Aggregate extends AggregateBase {
   queryStringsBuilder () {
     return { ua: this.agentRef.info.userAttributes, at: this.agentRef.info.atts }
   }
-
-  checkEventLimits () {
-    // check if we've reached any harvest limits...
-    if (this.events.byteSize() > IDEAL_PAYLOAD_SIZE) {
-      this.ee.emit(SUPPORTABILITY_METRIC_CHANNEL, ['GenericEvents/Harvest/Max/Seen'])
-      this.harvestScheduler.runHarvest()
-    }
-  }
-
+  
   trackSupportabilityMetrics () {
     /** track usage SMs to improve these experimental features */
     const configPerfTag = 'Config/Performance/'

src/features/generic_events/aggregate/index.js

@@ -99,13 +99,6 @@ export class Recorder {
       inlineImages: inline_images,
       collectFonts: collect_fonts,
       checkoutEveryNms: CHECKOUT_MS[this.parent.mode],
-      /** Emits errors thrown by rrweb directly before bubbling them up to the window */
-      errorHandler: (err) => {
-        /** capture rrweb errors as "internal" errors only */
-        this.parent.ee.emit('internal-error', [err])
-        /** returning true informs rrweb to swallow the error instead of throwing it to the window */
-        return true
-      },
       recordAfter: 'DOMContentLoaded'
     })
 

src/features/session_replay/shared/recorder.js

@@ -61,19 +61,30 @@ test('should warn if invalid event is provide', async () => {
   expect(console.debug).toHaveBeenCalledWith('New Relic Warning: https://github.com/newrelic/newrelic-browser-agent/blob/main/docs/warning-codes.md#44', undefined)
 })
 
-test('should only buffer 64kb of events at a time', async () => {
+test('should harvest early if will exceed 1mb', async () => {
   genericEventsAggregate.ee.emit('rumresp', [{ ins: 1 }])
 
   await new Promise(process.nextTick)
 
   genericEventsAggregate.harvestScheduler.runHarvest = jest.fn()
-  genericEventsAggregate.addEvent({ name: 'test', eventType: 'x'.repeat(63000) })
+  genericEventsAggregate.addEvent({ name: 'test', eventType: 'x'.repeat(900000) })
 
   expect(genericEventsAggregate.harvestScheduler.runHarvest).not.toHaveBeenCalled()
-  genericEventsAggregate.addEvent({ name: 1000, eventType: 'x'.repeat(1000) })
+  genericEventsAggregate.addEvent({ name: 1000, eventType: 'x'.repeat(100000) })
   expect(genericEventsAggregate.harvestScheduler.runHarvest).toHaveBeenCalled()
 })
 
+test('should not harvest if single event will exceed 1mb', async () => {
+  genericEventsAggregate.ee.emit('rumresp', [{ ins: 1 }])
+
+  await new Promise(process.nextTick)
+
+  genericEventsAggregate.harvestScheduler.runHarvest = jest.fn()
+  genericEventsAggregate.addEvent({ name: 'test', eventType: 'x'.repeat(1000000) })
+
+  expect(genericEventsAggregate.harvestScheduler.runHarvest).not.toHaveBeenCalled()
+})
+
 describe('sub-features', () => {
   beforeEach(async () => {
     genericEventsAggregate.ee.emit('rumresp', [{ ins: 1 }])

tests/components/generic_events/aggregate/index.test.js

@@ -1,9 +1,5 @@
 /* globals errorFn, noticeErrorFn */
-
-const { Key } = require('webdriverio')
-const { notSafari, notIOS, notAndroid } = require('../../../tools/browser-matcher/common-matchers.mjs')
-const { srConfig } = require('../util/helpers')
-const { testErrorsRequest, testSupportMetricsRequest } = require('../../../tools/testing-server/utils/expect-tests')
+const { testErrorsRequest } = require('../../../tools/testing-server/utils/expect-tests')
 
 describe('error payloads', () => {
   let errorsCapture
@@ -132,28 +128,4 @@ describe('error payloads', () => {
 
     expect(errorResults).toEqual([])
   })
-
-  /**
-   * This is a specific bug observed in rrweb for specific browsers tied to contenteditable divs.
-   * This serves a purpose of checking that rrweb errors are not reported as `err`
-   * **/
-  it.withBrowsersMatching([notSafari, notAndroid, notIOS])('should collect rrweb errors only as internal error supportability metric', async () => {
-    const jsErrCapture = await browser.testHandle.createNetworkCaptures('bamServer', { test: testErrorsRequest })
-    const smCapture = await browser.testHandle.createNetworkCaptures('bamServer', { test: testSupportMetricsRequest })
-    await browser.enableSessionReplay()
-    const [jseCaptureResults, smCaptureResults] = await Promise.all([
-      jsErrCapture.waitForResult({ timeout: 10000 }),
-      smCapture.waitForResult({ totalCount: 1 }),
-      browser.url(await browser.testHandle.assetURL('rrweb-instrumented.html', srConfig()))
-        .then(() => browser.waitForSessionReplayRecording())
-        .then(() => $('#content-editable-div'))
-        .then((elem) => elem.click())
-        .then(() => browser.keys([Key.Ctrl, Key.Backspace]))
-        .then(() => browser.refresh())
-    ])
-
-    const sms = smCaptureResults[0].request.body.sm
-    expect(sms.find(sm => sm.params.name === 'Internal/Error/Rrweb')).toBeTruthy()
-    expect(jseCaptureResults).toEqual([])
-  })
 })

tests/specs/err/error-payload.e2e.js

@@ -102,7 +102,7 @@ describe('ins harvesting', () => {
       pageUrl: expect.any(String),
       timestamp: expect.any(Number)
     })
-    expect(clickUAs[1].actionDuration).toBeGreaterThan(0)
+    expect(clickUAs[1].actionDuration).toBeGreaterThanOrEqual(0)
     expect(clickUAs[1].actionMs).toEqual(expect.stringMatching(/^\[\d+(,\d+){4}\]$/))
   })
 
@@ -327,35 +327,14 @@ describe('ins harvesting', () => {
       insightsCapture.waitForResult({ timeout: 10000 }),
       browser.execute(function () {
         let i = 0
-        while (i++ < 1010) {
+        while (i++ < 10000) {
           newrelic.addPageAction('foobar')
         }
       })
     ])
     expect(insightsResult.length).toBeTruthy()
   })
 
-  it('should harvest early when buffer gets too large (one big event)', async () => {
-    const testUrl = await browser.testHandle.assetURL('instrumented.html', { init: { generic_events: { harvestTimeSeconds: 30 } } })
-    await browser.url(testUrl)
-      .then(() => browser.waitForAgentLoad())
-
-    const [insightsResult] = await Promise.all([
-      insightsCapture.waitForResult({ timeout: 10000 }),
-      browser.execute(function () {
-        newrelic.addPageAction('foobar', createLargeObject())
-        function createLargeObject () {
-          let i = 0; let obj = {}
-          while (i++ < 64000) {
-            obj[i] = 'x'
-          }
-          return obj
-        }
-      })
-    ])
-    expect(insightsResult.length).toBeTruthy()
-  })
-
   it('should not harvest if too large', async () => {
     const testUrl = await browser.testHandle.assetURL('instrumented.html')
     await browser.url(testUrl)
@@ -367,7 +346,7 @@ describe('ins harvesting', () => {
         newrelic.addPageAction('foobar', createLargeObject())
         function createLargeObject () {
           let i = 0; let obj = {}
-          while (i++ < 100000) {
+          while (i++ < 1000000) {
             obj[i] = Math.random()
           }
           return obj