♻️ move long task contexts to profiler

packages/rum-core/src/boot/rumPublicApi.spec.ts

@@ -23,7 +23,6 @@ const noopStartRum = (): ReturnType<StartRum> => ({
   getInternalContext: () => undefined,
   lifeCycle: {} as any,
   viewHistory: {} as any,
-  longTaskContexts: {} as any,
   session: {} as any,
   stopSession: () => undefined,
   startDurationVital: () => ({}) as DurationVitalReference,

packages/rum-core/src/boot/rumPublicApi.ts

@@ -52,7 +52,6 @@ import { createCustomVitalsState } from '../domain/vital/vitalCollection'
 import { callPluginsMethod } from '../domain/plugins'
 import type { Hooks } from '../domain/hooks'
 import type { SdkName } from '../domain/contexts/defaultContext'
-import type { LongTaskContexts } from '../domain/longTask/longTaskCollection'
 import { createPreStartStrategy } from './preStartRum'
 import type { StartRum, StartRumResult } from './startRum'
 
@@ -485,7 +484,6 @@ export interface ProfilerApi {
     configuration: RumConfiguration,
     sessionManager: RumSessionManager,
     viewHistory: ViewHistory,
-    longTaskContexts: LongTaskContexts,
     createEncoder: (streamId: DeflateEncoderStreamId) => Encoder
   ) => void
 }
@@ -578,7 +576,6 @@ export function makeRumPublicApi(
         configuration,
         startRumResult.session,
         startRumResult.viewHistory,
-        startRumResult.longTaskContexts,
         createEncoder
       )
 

packages/rum-core/src/boot/startRum.ts

@@ -239,7 +239,7 @@ export function startRumEventCollection(
   const { stop: stopResourceCollection } = startResourceCollection(lifeCycle, configuration, pageStateHistory)
   cleanupTasks.push(stopResourceCollection)
 
-  const { stop: stopLongTaskCollection, longTaskContexts } = startLongTaskCollection(lifeCycle, configuration)
+  const { stop: stopLongTaskCollection } = startLongTaskCollection(lifeCycle, configuration)
   cleanupTasks.push(stopLongTaskCollection)
 
   const { addError } = startErrorCollection(lifeCycle, configuration, bufferedDataObservable)
@@ -276,7 +276,6 @@ export function startRumEventCollection(
     globalContext,
     userContext,
     accountContext,
-    longTaskContexts,
     stop: () => cleanupTasks.forEach((task) => task()),
   }
 }

packages/rum-core/src/domain/action/actionCollection.spec.ts

@@ -64,7 +64,7 @@ describe('actionCollection', () => {
       events: [event],
     })
 
-    expect(rawRumEvents[0].startTime).toBe(1234 as RelativeTime)
+    expect(rawRumEvents[0].startClocks.relative).toBe(1234 as RelativeTime)
     expect(rawRumEvents[0].rawRumEvent).toEqual({
       action: {
         error: {
@@ -116,7 +116,7 @@ describe('actionCollection', () => {
       context: { foo: 'bar' },
     })
 
-    expect(rawRumEvents[0].startTime).toBe(1234 as RelativeTime)
+    expect(rawRumEvents[0].startClocks.relative).toBe(1234 as RelativeTime)
     expect(rawRumEvents[0].rawRumEvent).toEqual({
       action: {
         id: jasmine.any(String),

packages/rum-core/src/domain/action/actionCollection.ts

@@ -146,7 +146,7 @@ function processAction(action: AutoAction | CustomAction): RawRumEventCollectedD
   return {
     rawRumEvent: actionEvent,
     duration,
-    startTime: action.startClocks.relative,
+    startClocks: action.startClocks,
     domainContext,
   }
 }

packages/rum-core/src/domain/assembly.spec.ts

@@ -1,5 +1,12 @@
 import type { ClocksState, RelativeTime, TimeStamp } from '@datadog/browser-core'
-import { ErrorSource, HookNames, ONE_MINUTE, display, startGlobalContext } from '@datadog/browser-core'
+import {
+  ErrorSource,
+  HookNames,
+  ONE_MINUTE,
+  display,
+  relativeToClocks,
+  startGlobalContext,
+} from '@datadog/browser-core'
 import type { Clock } from '@datadog/browser-core/test'
 import { registerCleanupTask, mockClock } from '@datadog/browser-core/test'
 import {
@@ -461,7 +468,7 @@ describe('rum assembly', () => {
 
       notifyRawRumEvent(lifeCycle, {
         rawRumEvent: createRawRumEvent(RumEventType.ACTION),
-        startTime: 123 as RelativeTime,
+        startClocks: relativeToClocks(123 as RelativeTime),
       })
 
       expect(sessionManager.findTrackedSession).toHaveBeenCalledWith(123 as RelativeTime)
@@ -567,11 +574,11 @@ describe('rum assembly', () => {
 
 function notifyRawRumEvent<E extends RawRumEvent>(
   lifeCycle: LifeCycle,
-  partialData: Omit<RawRumEventCollectedData<E>, 'startTime' | 'domainContext'> &
-    Partial<Pick<RawRumEventCollectedData<E>, 'startTime' | 'domainContext'>>
+  partialData: Omit<RawRumEventCollectedData<E>, 'startClocks' | 'domainContext'> &
+    Partial<Pick<RawRumEventCollectedData<E>, 'startClocks' | 'domainContext'>>
 ) {
   const fullData = {
-    startTime: 0 as RelativeTime,
+    startClocks: relativeToClocks(0 as RelativeTime),
     domainContext: {} as RumEventDomainContext,
     ...partialData,
   }

packages/rum-core/src/domain/assembly.ts

@@ -92,12 +92,12 @@ export function startRumAssembly(
 
   lifeCycle.subscribe(
     LifeCycleEventType.RAW_RUM_EVENT_COLLECTED,
-    ({ startTime, duration, rawRumEvent, domainContext }) => {
+    ({ startClocks, duration, rawRumEvent, domainContext }) => {
       const defaultRumEventAttributes = hooks.triggerHook(HookNames.Assemble, {
         eventType: rawRumEvent.type,
         rawRumEvent,
         domainContext,
-        startTime,
+        startTime: startClocks.relative,
         duration,
       } as AssembleHookParams)!
 

packages/rum-core/src/domain/error/errorCollection.spec.ts

@@ -65,10 +65,11 @@ describe('error collection', () => {
       it(`notifies a raw rum error event from ${testCase}`, () => {
         setupErrorCollection()
 
+        const startClocks = { relative: 1234 as RelativeTime, timeStamp: 123456789 as TimeStamp }
         addError({
           error,
           handlingStack: 'Error: handling foo',
-          startClocks: { relative: 1234 as RelativeTime, timeStamp: 123456789 as TimeStamp },
+          startClocks,
         })
 
         expect(rawRumEvents.length).toBe(1)
@@ -92,7 +93,7 @@ describe('error collection', () => {
             type: RumEventType.ERROR,
             context: undefined,
           },
-          startTime: 1234 as RelativeTime,
+          startClocks,
           domainContext: {
             error,
             handlingStack: 'Error: handling foo',
@@ -239,7 +240,7 @@ describe('error collection', () => {
         },
       })
 
-      expect(rawRumEvents[0].startTime).toBe(1234 as RelativeTime)
+      expect(rawRumEvents[0].startClocks.relative).toBe(1234 as RelativeTime)
       expect(rawRumEvents[0].rawRumEvent).toEqual({
         date: jasmine.any(Number),
         error: {

packages/rum-core/src/domain/error/errorCollection.ts

@@ -98,7 +98,7 @@ function processError(error: RawError): RawRumEventCollectedData<RawRumErrorEven
 
   return {
     rawRumEvent,
-    startTime: error.startClocks.relative,
+    startClocks: error.startClocks,
     domainContext,
   }
 }

packages/rum-core/src/domain/event/eventCollection.spec.ts

@@ -33,7 +33,7 @@ describe('eventCollection', () => {
     eventCollection.addEvent(startTime, event, domainContext, duration)
 
     expect(notifySpy).toHaveBeenCalledWith(LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, {
-      startTime,
+      startClocks: { relative: startTime, timeStamp: jasmine.any(Number) },
       rawRumEvent: event,
       domainContext,
       duration,

packages/rum-core/src/domain/event/eventCollection.ts

@@ -1,3 +1,4 @@
+import { relativeToClocks } from '@datadog/browser-core'
 import type { Context, Duration, RelativeTime } from '@datadog/browser-core'
 import type { RumEventDomainContext } from '../../domainContext.types'
 import type { LifeCycle } from '../lifeCycle'
@@ -43,7 +44,7 @@ export function startEventCollection(lifeCycle: LifeCycle) {
       }
 
       lifeCycle.notify(LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, {
-        startTime,
+        startClocks: relativeToClocks(startTime),
         rawRumEvent: event,
         domainContext,
         duration,

packages/rum-core/src/domain/lifeCycle.ts

@@ -1,4 +1,4 @@
-import type { Context, Duration, PageMayExitEvent, RawError, RelativeTime } from '@datadog/browser-core'
+import type { ClocksState, Context, Duration, PageMayExitEvent, RawError } from '@datadog/browser-core'
 import { AbstractLifeCycle } from '@datadog/browser-core'
 import type { RumEventDomainContext } from '../domainContext.types'
 import type { RawRumEvent, AssembledRumEvent } from '../rawRumEvent.types'
@@ -92,7 +92,7 @@ export interface LifeCycleEventMap {
 }
 
 export interface RawRumEventCollectedData<E extends RawRumEvent = RawRumEvent> {
-  startTime: RelativeTime
+  startClocks: ClocksState
   duration?: Duration
   rawRumEvent: E
   domainContext: RumEventDomainContext<E['type']>

packages/rum-core/src/domain/longTask/longTaskCollection.spec.ts

@@ -1,4 +1,4 @@
-import type { Duration, RelativeTime, ServerDuration } from '@datadog/browser-core'
+import type { RelativeTime, ServerDuration } from '@datadog/browser-core'
 import { registerCleanupTask } from '@datadog/browser-core/test'
 import {
   collectAndValidateRawRumEvents,
@@ -8,7 +8,7 @@ import {
 } from '../../../test'
 import type { RumPerformanceEntry } from '../../browser/performanceObservable'
 import { RumPerformanceEntryType } from '../../browser/performanceObservable'
-import type { RawRumEvent, RawRumLongTaskEvent } from '../../rawRumEvent.types'
+import type { RawRumEvent } from '../../rawRumEvent.types'
 import { RumEventType, RumLongTaskEntryType } from '../../rawRumEvent.types'
 import type { RawRumEventCollectedData } from '../lifeCycle'
 import { LifeCycle } from '../lifeCycle'
@@ -49,7 +49,7 @@ describe('longTaskCollection', () => {
 
       notifyPerformanceEntries([performanceLongAnimationFrameTiming])
 
-      expect(rawRumEvents[0].startTime).toBe(1234 as RelativeTime)
+      expect(rawRumEvents[0].startClocks.relative).toBe(1234 as RelativeTime)
       expect(rawRumEvents[0].rawRumEvent).toEqual({
         date: jasmine.any(Number),
         long_task: {
@@ -98,21 +98,6 @@ describe('longTaskCollection', () => {
       expect(rawRumEvents.length).toBe(1)
     })
 
-    it('should track long animation frame contexts', () => {
-      const longTaskCollection = setupLongTaskCollection()
-      const entry = createPerformanceEntry(RumPerformanceEntryType.LONG_ANIMATION_FRAME)
-      notifyPerformanceEntries([entry])
-
-      const longTask = (rawRumEvents[0].rawRumEvent as RawRumLongTaskEvent).long_task
-      const longTasks = longTaskCollection.longTaskContexts.findLongTasks(1234 as RelativeTime, 100 as Duration)
-      expect(longTasks).toContain({
-        id: longTask.id,
-        startClocks: jasmine.objectContaining({ relative: entry.startTime }),
-        duration: entry.duration,
-        entryType: RumPerformanceEntryType.LONG_ANIMATION_FRAME,
-      })
-    })
-
     it('should not collect when trackLongTasks=false', () => {
       setupLongTaskCollection({ trackLongTasks: false })
 
@@ -127,7 +112,7 @@ describe('longTaskCollection', () => {
       setupLongTaskCollection({ supportedEntryType: RumPerformanceEntryType.LONG_TASK })
       notifyPerformanceEntries([createPerformanceEntry(RumPerformanceEntryType.LONG_TASK)])
 
-      expect(rawRumEvents[0].startTime).toBe(1234 as RelativeTime)
+      expect(rawRumEvents[0].startClocks.relative).toBe(1234 as RelativeTime)
       expect(rawRumEvents[0].rawRumEvent).toEqual({
         date: jasmine.any(Number),
         long_task: {
@@ -158,21 +143,6 @@ describe('longTaskCollection', () => {
       expect(rawRumEvents.length).toBe(1)
     })
 
-    it('should track long tasks contexts', () => {
-      const longTaskCollection = setupLongTaskCollection({ supportedEntryType: RumPerformanceEntryType.LONG_TASK })
-      const entry = createPerformanceEntry(RumPerformanceEntryType.LONG_TASK)
-      notifyPerformanceEntries([entry])
-
-      const longTask = (rawRumEvents[0].rawRumEvent as RawRumLongTaskEvent).long_task
-      const longTasks = longTaskCollection.longTaskContexts.findLongTasks(1234 as RelativeTime, 100 as Duration)
-      expect(longTasks).toContain({
-        id: longTask.id,
-        startClocks: jasmine.objectContaining({ relative: entry.startTime }),
-        duration: entry.duration,
-        entryType: RumPerformanceEntryType.LONG_TASK,
-      })
-    })
-
     it('should not collect when trackLongTasks=false', () => {
       setupLongTaskCollection({ supportedEntryType: RumPerformanceEntryType.LONG_TASK, trackLongTasks: false })
 

packages/rum-core/src/domain/longTask/longTaskCollection.ts

@@ -1,12 +1,5 @@
-import type { RelativeTime, ClocksState, Duration } from '@datadog/browser-core'
-import {
-  toServerDuration,
-  relativeToClocks,
-  generateUUID,
-  createValueHistory,
-  SESSION_TIME_OUT_DELAY,
-  addDuration,
-} from '@datadog/browser-core'
+import type { ClocksState } from '@datadog/browser-core'
+import { toServerDuration, relativeToClocks, generateUUID } from '@datadog/browser-core'
 import type { RawRumLongTaskEvent, RawRumLongAnimationFrameEvent } from '../../rawRumEvent.types'
 import { RumEventType, RumLongTaskEntryType } from '../../rawRumEvent.types'
 import type { LifeCycle } from '../lifeCycle'
@@ -23,23 +16,7 @@ import type {
 } from '../../browser/performanceObservable'
 import type { RumConfiguration } from '../configuration'
 
-export const LONG_TASK_ID_HISTORY_TIME_OUT_DELAY = SESSION_TIME_OUT_DELAY
-
-export interface LongTaskContext {
-  id: string
-  startClocks: ClocksState
-  duration: Duration
-  entryType: RumPerformanceEntryType.LONG_ANIMATION_FRAME | RumPerformanceEntryType.LONG_TASK
-}
-
-export interface LongTaskContexts {
-  findLongTasks: (startTime: RelativeTime, duration: Duration) => LongTaskContext[]
-}
-
 export function startLongTaskCollection(lifeCycle: LifeCycle, configuration: RumConfiguration) {
-  const history = createValueHistory<LongTaskContext>({
-    expireDelay: LONG_TASK_ID_HISTORY_TIME_OUT_DELAY,
-  })
   const entryType = supportPerformanceTimingEvent(RumPerformanceEntryType.LONG_ANIMATION_FRAME)
     ? RumPerformanceEntryType.LONG_ANIMATION_FRAME
     : RumPerformanceEntryType.LONG_TASK
@@ -54,39 +31,29 @@ export function startLongTaskCollection(lifeCycle: LifeCycle, configuration: Rum
       }
 
       const startClocks = relativeToClocks(entry.startTime)
-      const taskId = generateUUID()
-      const rawRumEvent = processEntry(entry, startClocks, taskId)
+      const rawRumEvent = processEntry(entry, startClocks)
 
       lifeCycle.notify(LifeCycleEventType.RAW_RUM_EVENT_COLLECTED, {
         rawRumEvent,
-        startTime: startClocks.relative,
+        startClocks,
         duration: entry.duration,
         domainContext: { performanceEntry: entry },
       })
-
-      history.add({ id: taskId, startClocks, duration: entry.duration, entryType }, startClocks.relative)
-      history.closeActive(addDuration(startClocks.relative, entry.duration))
     }
   })
 
-  const longTaskContexts: LongTaskContexts = {
-    findLongTasks: (startTime: RelativeTime, duration: Duration) => history.findAll(startTime, duration),
-  }
-
   return {
-    stop: () => {
-      subscription.unsubscribe()
-      history.stop()
-    },
-    longTaskContexts,
+    stop: () => subscription.unsubscribe(),
   }
 }
 
 function processEntry(
   entry: RumPerformanceLongTaskTiming | RumPerformanceLongAnimationFrameTiming,
-  startClocks: ClocksState,
-  taskId: string
+  startClocks: ClocksState
 ): RawRumLongTaskEvent | RawRumLongAnimationFrameEvent {
+  const id = generateUUID()
+  const duration = toServerDuration(entry.duration)
+
   const baseEvent = {
     date: startClocks.timeStamp,
     type: RumEventType.LONG_TASK,
@@ -97,19 +64,19 @@ function processEntry(
     return {
       ...baseEvent,
       long_task: {
-        id: taskId,
+        id,
         entry_type: RumLongTaskEntryType.LONG_TASK,
-        duration: toServerDuration(entry.duration),
+        duration,
       },
     }
   }
 
   return {
     ...baseEvent,
     long_task: {
-      id: taskId,
+      id,
       entry_type: RumLongTaskEntryType.LONG_ANIMATION_FRAME,
-      duration: toServerDuration(entry.duration),
+      duration,
       blocking_duration: toServerDuration(entry.blockingDuration),
       first_ui_event_timestamp: toServerDuration(entry.firstUIEventTimestamp),
       render_start: toServerDuration(entry.renderStart),