✨ [RUMF-1029] remove the limit on view.loading_time

packages/rum-core/src/domain/rumEventsCollection/action/trackActions.spec.ts

@@ -4,15 +4,15 @@ import { RumEvent } from '../../../../../rum/src'
 import { setup, TestSetupBuilder } from '../../../../test/specHelper'
 import { RumEventType, ActionType } from '../../../rawRumEvent.types'
 import { LifeCycleEventType } from '../../lifeCycle'
-import { PAGE_ACTIVITY_MAX_DURATION, PAGE_ACTIVITY_VALIDATION_DELAY } from '../../trackPageActivities'
-import { AutoAction, trackActions } from './trackActions'
+import { PAGE_ACTIVITY_VALIDATION_DELAY } from '../../trackPageActivities'
+import { AutoAction, AUTO_ACTION_MAX_DURATION, trackActions } from './trackActions'
 
 // Used to wait some time after the creation of a action
 const BEFORE_PAGE_ACTIVITY_VALIDATION_DELAY = PAGE_ACTIVITY_VALIDATION_DELAY * 0.8
 // Used to wait some time but it doesn't matter how much.
 const SOME_ARBITRARY_DELAY = 50
 // A long delay used to wait after any action is finished.
-const EXPIRE_DELAY = PAGE_ACTIVITY_MAX_DURATION * 10
+const EXPIRE_DELAY = AUTO_ACTION_MAX_DURATION * 10
 
 function eventsCollector<T>() {
   const events: T[] = []

packages/rum-core/src/domain/rumEventsCollection/action/trackActions.ts

@@ -9,6 +9,7 @@ import {
   clocksNow,
   TimeStamp,
   Configuration,
+  ONE_SECOND,
 } from '@datadog/browser-core'
 import { ActionType } from '../../../rawRumEvent.types'
 import { LifeCycle, LifeCycleEventType } from '../../lifeCycle'
@@ -47,12 +48,15 @@ export interface AutoActionCreatedEvent {
   startClocks: ClocksState
 }
 
+// Maximum duration for automatic actions
+export const AUTO_ACTION_MAX_DURATION = 10 * ONE_SECOND
+
 export function trackActions(
   lifeCycle: LifeCycle,
   domMutationObservable: DOMMutationObservable,
-  configuration: Configuration
+  { actionNameAttribute }: Configuration
 ) {
-  const action = startActionManagement(lifeCycle, domMutationObservable, configuration)
+  const action = startActionManagement(lifeCycle, domMutationObservable)
 
   // New views trigger the discard of the current pending Action
   lifeCycle.subscribe(LifeCycleEventType.VIEW_CREATED, () => {
@@ -66,7 +70,7 @@ export function trackActions(
       if (!(event.target instanceof Element)) {
         return
       }
-      const name = getActionNameFromElement(event.target, configuration.actionNameAttribute)
+      const name = getActionNameFromElement(event.target, actionNameAttribute)
       if (!name) {
         return
       }
@@ -84,11 +88,7 @@ export function trackActions(
   }
 }
 
-function startActionManagement(
-  lifeCycle: LifeCycle,
-  domMutationObservable: DOMMutationObservable,
-  configuration: Configuration
-) {
+function startActionManagement(lifeCycle: LifeCycle, domMutationObservable: DOMMutationObservable) {
   let currentAction: PendingAutoAction | undefined
   let currentIdlePageActivitySubscription: { stop: () => void }
 
@@ -104,15 +104,15 @@ function startActionManagement(
       currentIdlePageActivitySubscription = waitIdlePageActivity(
         lifeCycle,
         domMutationObservable,
-        configuration,
         (params) => {
           if (params.hadActivity) {
             pendingAutoAction.complete(params.endTime)
           } else {
             pendingAutoAction.discard()
           }
           currentAction = undefined
-        }
+        },
+        AUTO_ACTION_MAX_DURATION
       )
     },
     discardCurrent: () => {

packages/rum-core/src/domain/rumEventsCollection/view/trackViewMetrics.spec.ts

@@ -4,17 +4,11 @@ import { TestSetupBuilder, setup, setupViewTest, ViewTest } from '../../../../te
 import { RumPerformanceNavigationTiming } from '../../../browser/performanceCollection'
 import { RumEventType } from '../../../rawRumEvent.types'
 import { LifeCycle } from '../../lifeCycle'
-import {
-  PAGE_ACTIVITY_END_DELAY,
-  PAGE_ACTIVITY_MAX_DURATION,
-  PAGE_ACTIVITY_VALIDATION_DELAY,
-} from '../../trackPageActivities'
+import { PAGE_ACTIVITY_END_DELAY, PAGE_ACTIVITY_VALIDATION_DELAY } from '../../trackPageActivities'
 import { THROTTLE_VIEW_UPDATE_PERIOD } from './trackViews'
 
 const BEFORE_PAGE_ACTIVITY_VALIDATION_DELAY = (PAGE_ACTIVITY_VALIDATION_DELAY * 0.8) as Duration
 
-const AFTER_PAGE_ACTIVITY_MAX_DURATION = PAGE_ACTIVITY_MAX_DURATION * 1.1
-
 const AFTER_PAGE_ACTIVITY_END_DELAY = PAGE_ACTIVITY_END_DELAY * 1.1
 
 const FAKE_NAVIGATION_ENTRY: RumPerformanceNavigationTiming = {
@@ -68,7 +62,6 @@ describe('rum track view metrics', () => {
       const { getViewUpdate, getViewUpdateCount, startView } = viewTest
 
       startView()
-      clock.tick(AFTER_PAGE_ACTIVITY_MAX_DURATION)
       clock.tick(THROTTLE_VIEW_UPDATE_PERIOD)
 
       expect(getViewUpdateCount()).toEqual(3)

packages/rum-core/src/domain/rumEventsCollection/view/trackViewMetrics.ts

@@ -1,13 +1,4 @@
-import {
-  Duration,
-  noop,
-  elapsed,
-  round,
-  timeStampNow,
-  Configuration,
-  RelativeTime,
-  ONE_SECOND,
-} from '@datadog/browser-core'
+import { Duration, noop, elapsed, round, timeStampNow, RelativeTime, ONE_SECOND } from '@datadog/browser-core'
 import { RumLayoutShiftTiming, supportPerformanceTimingEvent } from '../../../browser/performanceCollection'
 import { ViewLoadingType } from '../../../rawRumEvent.types'
 import { LifeCycle, LifeCycleEventType } from '../../lifeCycle'
@@ -25,8 +16,7 @@ export function trackViewMetrics(
   lifeCycle: LifeCycle,
   domMutationObservable: DOMMutationObservable,
   scheduleViewUpdate: () => void,
-  loadingType: ViewLoadingType,
-  configuration: Configuration
+  loadingType: ViewLoadingType
 ) {
   const viewMetrics: ViewMetrics = {
     eventCounts: {
@@ -49,7 +39,6 @@ export function trackViewMetrics(
   const { stop: stopActivityLoadingTimeTracking } = trackActivityLoadingTime(
     lifeCycle,
     domMutationObservable,
-    configuration,
     setActivityLoadingTime
   )
 
@@ -108,22 +97,16 @@ function trackLoadingTime(loadType: ViewLoadingType, callback: (loadingTime: Dur
 function trackActivityLoadingTime(
   lifeCycle: LifeCycle,
   domMutationObservable: DOMMutationObservable,
-  configuration: Configuration,
   callback: (loadingTimeValue: Duration | undefined) => void
 ) {
   const startTime = timeStampNow()
-  const { stop: stopWaitIdlePageActivity } = waitIdlePageActivity(
-    lifeCycle,
-    domMutationObservable,
-    configuration,
-    (params) => {
-      if (params.hadActivity) {
-        callback(elapsed(startTime, params.endTime))
-      } else {
-        callback(undefined)
-      }
+  const { stop: stopWaitIdlePageActivity } = waitIdlePageActivity(lifeCycle, domMutationObservable, (params) => {
+    if (params.hadActivity) {
+      callback(elapsed(startTime, params.endTime))
+    } else {
+      callback(undefined)
     }
-  )
+  })
 
   return { stop: stopWaitIdlePageActivity }
 }

packages/rum-core/src/domain/rumEventsCollection/view/trackViews.ts

@@ -11,7 +11,6 @@ import {
   timeStampNow,
   TimeStamp,
   display,
-  Configuration,
 } from '@datadog/browser-core'
 import { DOMMutationObservable } from '../../../browser/domMutationObservable'
 import { ViewLoadingType, ViewCustomTimings } from '../../../rawRumEvent.types'
@@ -59,7 +58,6 @@ export function trackViews(
   lifeCycle: LifeCycle,
   domMutationObservable: DOMMutationObservable,
   areViewsTrackedAutomatically: boolean,
-  configuration: Configuration,
   initialViewName?: string
 ) {
   const { stop: stopInitialViewTracking, initialView } = trackInitialView(initialViewName)
@@ -77,7 +75,6 @@ export function trackViews(
       location,
       ViewLoadingType.INITIAL_LOAD,
       document.referrer,
-      configuration,
       clocksOrigin(),
       name
     )
@@ -95,7 +92,6 @@ export function trackViews(
       location,
       ViewLoadingType.ROUTE_CHANGE,
       currentView.url,
-      configuration,
       startClocks,
       name
     )
@@ -176,7 +172,6 @@ function newView(
   initialLocation: Location,
   loadingType: ViewLoadingType,
   referrer: string,
-  configuration: Configuration,
   startClocks: ClocksState = clocksNow(),
   name?: string
 ) {
@@ -203,8 +198,7 @@ function newView(
     lifeCycle,
     domMutationObservable,
     scheduleViewUpdate,
-    loadingType,
-    configuration
+    loadingType
   )
 
   // Initial view update

packages/rum-core/src/domain/rumEventsCollection/view/viewCollection.ts

@@ -29,14 +29,7 @@ export function startViewCollection(
     )
   )
 
-  return trackViews(
-    location,
-    lifeCycle,
-    domMutationObservable,
-    !configuration.trackViewsManually,
-    configuration,
-    initialViewName
-  )
+  return trackViews(location, lifeCycle, domMutationObservable, !configuration.trackViewsManually, initialViewName)
 }
 
 function processViewUpdate(