Merge branch 'NR-443293-network-requests' into NR-443294-navigations

Author: ptang-nr

src/features/generic_events/aggregate/index.js

@@ -59,7 +59,7 @@ export class Aggregate extends AggregateBase {
 
       let addUserAction = () => { /** no-op */ }
       if (isBrowserScope && agentRef.init.user_actions.enabled) {
-        this.userActionAggregator = new UserActionsAggregator()
+        this.userActionAggregator = new UserActionsAggregator(agentRef.init.feature_flags.includes('user_frustrations'))
         this.harvestOpts.beforeUnload = () => addUserAction?.(this.userActionAggregator.aggregationEvent)
 
         addUserAction = (aggregatedUserAction) => {

src/features/generic_events/aggregate/user-actions/user-actions-aggregator.js

@@ -11,16 +11,18 @@ export class UserActionsAggregator {
   /** @type {AggregatedUserAction=} */
   #aggregationEvent = undefined
   #aggregationKey = ''
+  #ufEnabled = false
   #deadClickTimer = undefined
   #domObserver = {
     instance: undefined
   }
 
   #errorClickTimer = undefined
 
-  constructor () {
-    if (MutationObserver) {
+  constructor (userFrustrationsEnabled) {
+    if (userFrustrationsEnabled && MutationObserver) {
       this.#domObserver.instance = new MutationObserver(this.treatAsLiveClick.bind(this))
+      this.#ufEnabled = true
     }
   }
 
@@ -49,13 +51,13 @@ export class UserActionsAggregator {
     } else {
       // return the prev existing one (if there is one)
       const finishedEvent = this.#aggregationEvent
-      this.#deadClickCleanup()
-      this.#errorClickCleanup()
+      this.#ufEnabled && this.#deadClickCleanup()
+      this.#ufEnabled && this.#errorClickCleanup()
 
       // then start new event aggregation
       this.#aggregationKey = aggregationKey
       this.#aggregationEvent = new AggregatedUserAction(evt, selectorInfo)
-      if (evt.type === 'click' && (selectorInfo.hasButton || selectorInfo.hasLink)) {
+      if (this.#ufEnabled && evt.type === 'click' && (selectorInfo.hasButton || selectorInfo.hasLink)) {
         this.#deadClickSetup(this.#aggregationEvent)
         this.#errorClickSetup()
       }

tests/specs/npm/index.e2e.js

@@ -95,6 +95,7 @@ describe('basic npm agent', () => {
     expect(agentSession.localStorage).toEqual({})
   })
 
+  // Note: the order of this test and the "session manager cannot be imported" test is important
   it('vite-react-wrapper sends basic calls', async () => {
     const [rumHarvests] = await Promise.all([
       rumCapture.waitForResult({ totalCount: 1 }),

tests/unit/features/generic_events/aggregate/user-actions/user-actions-aggregator.test.js

@@ -80,16 +80,32 @@ describe('UserActionsAggregator - Dead Clicks', () => {
   let aggregator
   beforeEach(() => {
     jest.useFakeTimers()
-    aggregator = new UserActionsAggregator()
+    aggregator = new UserActionsAggregator(true)
   })
   afterEach(() => {
     jest.useRealTimers()
   })
+
+  test('should NOT set deadClick if user frustrations is disabled', () => {
+    aggregator = new UserActionsAggregator(false)
+    const link = document.createElement('a')
+    document.body.appendChild(link)
+    const evt = { type: 'click', target: link }
+    aggregator.process(evt)
+    expect(aggregator.isEvaluatingDeadClick()).toBe(false)
+
+    jest.advanceTimersByTime(2000)
+
+    const userAction = aggregator.aggregationEvent
+    expect(userAction.deadClick).toBe(false)
+  })
+
   test('should set deadClick to true if no change detected after 2 seconds - buttons', () => {
     const btn = document.createElement('button')
     document.body.appendChild(btn)
     const evt = { type: 'click', target: btn }
     aggregator.process(evt)
+    expect(aggregator.isEvaluatingDeadClick()).toBe(true)
 
     jest.advanceTimersByTime(2000)
 
@@ -102,6 +118,7 @@ describe('UserActionsAggregator - Dead Clicks', () => {
     document.body.appendChild(link)
     const evt = { type: 'click', target: link }
     aggregator.process(evt)
+    expect(aggregator.isEvaluatingDeadClick()).toBe(true)
 
     jest.advanceTimersByTime(2000)
 
@@ -114,6 +131,7 @@ describe('UserActionsAggregator - Dead Clicks', () => {
     document.body.appendChild(span)
     const evt = { type: 'click', target: span }
     aggregator.process(evt)
+    expect(aggregator.isEvaluatingDeadClick()).toBe(false)
 
     jest.advanceTimersByTime(2000)
 
@@ -126,6 +144,7 @@ describe('UserActionsAggregator - Dead Clicks', () => {
     document.body.appendChild(btn)
     const evt = { type: 'click', target: btn }
     aggregator.process(evt)
+    expect(aggregator.isEvaluatingDeadClick()).toBe(true)
 
     // Simulate a DOM mutation before the timer ends
     btn.setAttribute('data-test', 'mutated')
@@ -159,6 +178,7 @@ describe('UserActionsAggregator - Dead Clicks', () => {
     const keydownEvt = { type: 'keydown', target: btn }
 
     aggregator.process(clickEvt)
+    expect(aggregator.isEvaluatingDeadClick()).toBe(true)
     const finishedEvent = aggregator.process(keydownEvt) // Ends aggregation before timer
 
     jest.advanceTimersByTime(2000)
@@ -171,11 +191,31 @@ describe('UserActionsAggregator - Error Clicks', () => {
   let aggregator
   beforeEach(() => {
     jest.useFakeTimers()
-    aggregator = new UserActionsAggregator()
+    aggregator = new UserActionsAggregator(true)
   })
   afterEach(() => {
     jest.useRealTimers()
   })
+  test('should NOT set errorClick if user frustrations is disabled', () => {
+    aggregator = new UserActionsAggregator(false)
+    const btn = document.createElement('button')
+    btn.onclick = () => {
+      console.log('Simulating an error')
+      throw new Error('Simulated error')
+    }
+    document.body.appendChild(btn)
+    const evt = {
+      type: 'click',
+      target: btn
+    }
+    aggregator.process(evt, ['id', 'className', 'tagName', 'type'])
+    jest.advanceTimersByTime(1999)
+    aggregator.markAsErrorClick() // Simulate the error click
+    jest.advanceTimersByTime(1)
+
+    const userAction = aggregator.aggregationEvent
+    expect(userAction.errorClick).toBe(false)
+  })
   test('should set errorClick to true if an error is detected within 2 seconds - buttons', () => {
     const btn = document.createElement('button')
     btn.onclick = () => {