♻️ Simplify trackLoadingTime (#1336)

* ♻️ Simplify trackLoadingTime * 👌 namings
DataDog · Feb 15, 2022 · f4a4758 · f4a4758
1 parent 48f5747
commit f4a4758
Showing 1 changed file with 26 additions and 34 deletions.
diff --git a/packages/rum-core/src/domain/rumEventsCollection/view/trackViewMetrics.ts b/packages/rum-core/src/domain/rumEventsCollection/view/trackViewMetrics.ts
@@ -35,16 +35,15 @@ export function trackViewMetrics(
     scheduleViewUpdate()
   })
 
-  const { setActivityLoadingTime, setLoadEvent } = trackLoadingTime(loadingType, (newLoadingTime) => {
-    viewMetrics.loadingTime = newLoadingTime
-    scheduleViewUpdate()
-  })
-
-  const { stop: stopActivityLoadingTimeTracking } = trackActivityLoadingTime(
+  const { stop: stopLoadingTimeTracking, setLoadEvent } = trackLoadingTime(
     lifeCycle,
     domMutationObservable,
-    setActivityLoadingTime,
-    viewStart
+    loadingType,
+    viewStart,
+    (newLoadingTime) => {
+      viewMetrics.loadingTime = newLoadingTime
+      scheduleViewUpdate()
+    }
   )
 
   let stopCLSTracking: () => void
@@ -60,15 +59,21 @@ export function trackViewMetrics(
   return {
     stop: () => {
       stopEventCountsTracking()
-      stopActivityLoadingTimeTracking()
+      stopLoadingTimeTracking()
       stopCLSTracking()
     },
     setLoadEvent,
     viewMetrics,
   }
 }
 
-function trackLoadingTime(loadType: ViewLoadingType, callback: (loadingTime: Duration) => void) {
+function trackLoadingTime(
+  lifeCycle: LifeCycle,
+  domMutationObservable: Observable<void>,
+  loadType: ViewLoadingType,
+  viewStart: ClocksState,
+  callback: (loadingTime: Duration) => void
+) {
   let isWaitingForLoadEvent = loadType === ViewLoadingType.INITIAL_LOAD
   let isWaitingForActivityLoadingTime = true
   const loadingTimeCandidates: Duration[] = []
@@ -79,41 +84,28 @@ function trackLoadingTime(loadType: ViewLoadingType, callback: (loadingTime: Dur
     }
   }
 
+  const { stop } = waitIdlePage(lifeCycle, domMutationObservable, (event) => {
+    if (isWaitingForActivityLoadingTime) {
+      isWaitingForActivityLoadingTime = false
+      if (event.hadActivity) {
+        loadingTimeCandidates.push(elapsed(viewStart.timeStamp, event.end))
+      }
+      invokeCallbackIfAllCandidatesAreReceived()
+    }
+  })
+
   return {
+    stop,
     setLoadEvent: (loadEvent: Duration) => {
       if (isWaitingForLoadEvent) {
         isWaitingForLoadEvent = false
         loadingTimeCandidates.push(loadEvent)
         invokeCallbackIfAllCandidatesAreReceived()
       }
     },
-    setActivityLoadingTime: (activityLoadingTime: Duration | undefined) => {
-      if (isWaitingForActivityLoadingTime) {
-        isWaitingForActivityLoadingTime = false
-        if (activityLoadingTime !== undefined) {
-          loadingTimeCandidates.push(activityLoadingTime)
-        }
-        invokeCallbackIfAllCandidatesAreReceived()
-      }
-    },
   }
 }
 
-function trackActivityLoadingTime(
-  lifeCycle: LifeCycle,
-  domMutationObservable: Observable<void>,
-  callback: (loadingTimeValue: Duration | undefined) => void,
-  viewStart: ClocksState
-) {
-  return waitIdlePage(lifeCycle, domMutationObservable, (event) => {
-    if (event.hadActivity) {
-      callback(elapsed(viewStart.timeStamp, event.end))
-    } else {
-      callback(undefined)
-    }
-  })
-}
-
 /**
  * Track the cumulative layout shifts (CLS).
  * Layout shifts are grouped into session windows.