wip

Author: mormubis

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

@@ -136,6 +136,14 @@ export function startRumAssembly(
         if (rawRumEvent.type === 'stream') {
           const streamEvent = {
             ...(serverRumEvent as RumViewEvent),
+            _dd: {
+              ...serverRumEvent._dd,
+              document_version: serverRumEvent.stream?.document_version,
+            },
+            stream: {
+              ...serverRumEvent.stream,
+              time_spent: undefined,
+            },
             view: {
               ...serverRumEvent.view,
               id: serverRumEvent.stream?.id,
@@ -148,6 +156,7 @@ export function startRumAssembly(
               resource: {
                 count: 0,
               },
+              time_spent: serverRumEvent.stream?.time_spent,
             },
             type: 'view',
           }

packages/rum-core/src/domain/stream/metric.ts

@@ -5,7 +5,6 @@ export function createWeightAverageMetric() {
 
   return {
     get value() {
-      console.log('>>>', value)
       return value
     },
     update(newLastUpdate: number, newValue: number) {

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

@@ -1,4 +1,4 @@
-import { clocksNow, generateUUID } from '@datadog/browser-core'
+import { clocksNow, generateUUID, ONE_SECOND } from '@datadog/browser-core'
 import type { StartRumResult } from '../..'
 import { createLastMetric, createWeightAverageMetric } from './metric'
 import { createTimer } from './timer'
@@ -26,8 +26,8 @@ export function createStream(api: API) {
     bitrate: createWeightAverageMetric(),
     fps: createWeightAverageMetric(),
     timestamp: createLastMetric(),
-    watchTime: createLastMetric(),
   }
+  let documentVersion = 0
 
   function sendStreamEvent() {
     const now = clocksNow()
@@ -41,15 +41,19 @@ export function createStream(api: API) {
           id,
           bitrate: metrics.bitrate.value,
           duration: meta.duration,
+          document_version: documentVersion,
           format: meta.format,
           fps: metrics.fps.value,
           resolution: meta.resolution,
           timestamp: metrics.timestamp.value,
-          watch_time: metrics.watchTime.value,
+          time_spent: (now.relative - origin.relative) * ONE_SECOND,
+          watch_time: timer.value * ONE_SECOND,
         },
       },
       {}
     )
+
+    documentVersion += 1
   }
 
   return {

packages/rum-core/src/rawRumEvent.types.ts

@@ -387,10 +387,12 @@ export interface RawRumStreamEvent {
   stream: {
     id: string
     bitrate?: number
+    document_version: number
     duration?: number
     format?: string
     fps?: number
     resolution?: string
+    time_spent: number
     timestamp?: number
     watch_time?: number
   }