Skip to content

Changed tracked action to accept ClocksState #4177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BeltranBulbarellaDD merged 1 commit into from
Feb 13, 2026
Merged

Changed tracked action to accept ClocksState #4177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions packages/rum-core/src/domain/action/trackAction.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RelativeTime, TimeStamp } from '@datadog/browser-core'
import type { Duration, RelativeTime, TimeStamp } from '@datadog/browser-core'
import { registerCleanupTask } from '@datadog/browser-core/test'
import { LifeCycle, LifeCycleEventType } from '../lifeCycle'
import { RumEventType } from '../../rawRumEvent.types'
Expand Down Expand Up @@ -34,6 +34,16 @@ describe('trackAction', () => {

expect(action1.id).not.toBe(action2.id)
})

it('should compute duration from timestamps, not relative times', () => {
const startClocks = { relative: 100 as RelativeTime, timeStamp: 1000 as TimeStamp }
const trackedAction = actionTracker.createTrackedAction(startClocks)

const endClocks = { relative: 300 as RelativeTime, timeStamp: 1050 as TimeStamp }
trackedAction.stop(endClocks)

expect(trackedAction.duration).toBe(50 as Duration)
})
})

describe('event counting', () => {
Expand Down Expand Up @@ -65,7 +75,7 @@ describe('trackAction', () => {
})

it('should stop counting events after action is stopped', () => {
trackedAction.stop(200 as RelativeTime)
trackedAction.stop({ relative: 200 as RelativeTime, timeStamp: 1100 as TimeStamp })

lifeCycle.notify(LifeCycleEventType.RUM_EVENT_COLLECTED, {
type: RumEventType.ERROR,
Expand Down Expand Up @@ -93,7 +103,7 @@ describe('trackAction', () => {
const startClocks = { relative: 100 as RelativeTime, timeStamp: 1000 as TimeStamp }
const trackedAction = actionTracker.createTrackedAction(startClocks)

trackedAction.stop(200 as RelativeTime)
trackedAction.stop({ relative: 200 as RelativeTime, timeStamp: 1100 as TimeStamp })

expect(actionTracker.findActionId()).toBeUndefined()
})
Expand All @@ -102,7 +112,7 @@ describe('trackAction', () => {
const startClocks = { relative: 100 as RelativeTime, timeStamp: 1000 as TimeStamp }
const trackedAction = actionTracker.createTrackedAction(startClocks)

trackedAction.stop(200 as RelativeTime)
trackedAction.stop({ relative: 200 as RelativeTime, timeStamp: 1100 as TimeStamp })

expect(actionTracker.findActionId(150 as RelativeTime)).toEqual([trackedAction.id])
})
Expand All @@ -111,7 +121,7 @@ describe('trackAction', () => {
const startClocks = { relative: 100 as RelativeTime, timeStamp: 1000 as TimeStamp }
const trackedAction = actionTracker.createTrackedAction(startClocks)

trackedAction.stop(200 as RelativeTime)
trackedAction.stop({ relative: 200 as RelativeTime, timeStamp: 1100 as TimeStamp })

expect(actionTracker.findActionId(250 as RelativeTime)).toBeUndefined()
})
Expand Down
8 changes: 4 additions & 4 deletions packages/rum-core/src/domain/action/trackAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface TrackedAction {
startClocks: ClocksState
duration: Duration | undefined
counts: ActionCounts
stop: (endTime: RelativeTime) => void
stop: (endClocks: ClocksState) => void
discard: () => void
}

Expand Down Expand Up @@ -65,9 +65,9 @@ export function startActionTracker(lifeCycle: LifeCycle): ActionTracker {
get counts() {
return eventCountsSubscription.eventCounts
},
stop(endTime: RelativeTime) {
historyEntry.close(endTime)
duration = elapsed(startClocks.relative, endTime)
stop(endClocks: ClocksState) {
historyEntry.close(endClocks.relative)
duration = elapsed(startClocks.timeStamp, endClocks.timeStamp)
cleanup()
},
discard() {
Expand Down
4 changes: 2 additions & 2 deletions packages/rum-core/src/domain/action/trackClickActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Duration, ClocksState, TimeStamp } from '@datadog/browser-core'
import { timeStampNow, Observable, getRelativeTime, relativeToClocks } from '@datadog/browser-core'
import { timeStampNow, Observable, timeStampToClocks, relativeToClocks } from '@datadog/browser-core'
import { isNodeShadowHost } from '../../browser/htmlDomUtils'
import type { FrustrationType } from '../../rawRumEvent.types'
import { ActionType } from '../../rawRumEvent.types'
Expand Down Expand Up @@ -297,7 +297,7 @@ function newClick(
activityEndTime = newActivityEndTime
status = ClickStatus.STOPPED
if (activityEndTime) {
trackedAction.stop(getRelativeTime(activityEndTime))
trackedAction.stop(timeStampToClocks(activityEndTime))
} else {
trackedAction.discard()
}
Expand Down
2 changes: 1 addition & 1 deletion packages/rum-core/src/domain/action/trackManualActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export function trackManualActions(
return
}

activeAction.trackedAction.stop(stopClocks.relative)
activeAction.trackedAction.stop(stopClocks)

const frustrationTypes: FrustrationType[] = []
if (activeAction.trackedAction.counts.errorCount > 0) {
Expand Down