fix: improvements to convertToRum

Author: bbrzoska

src/v3/convertToRum.ts

@@ -112,28 +112,33 @@ export function convertTraceToRUM<
       nonEmbeddedSpans.add(getSpanKey(spanAndAnnotation.span))
     }
   }
-  const embeddedSpans: {
-    [typeAndName: string]: EmbeddedEntry
-  } = {}
+  const embeddedSpans = new Map<string, EmbeddedEntry>()
 
   for (const spanAndAnnotation of embeddedEntries) {
     const { span } = spanAndAnnotation
     const typeAndName = getSpanKey(span)
-    const existingEmbeddedEntry = embeddedSpans[typeAndName]
+    const existingEmbeddedEntry = embeddedSpans.get(typeAndName)
 
     if (existingEmbeddedEntry) {
-      embeddedSpans[typeAndName] = updateEmbeddedEntry(
-        existingEmbeddedEntry,
-        spanAndAnnotation,
+      embeddedSpans.set(
+        typeAndName,
+        updateEmbeddedEntry(existingEmbeddedEntry, spanAndAnnotation),
       )
     } else {
-      embeddedSpans[typeAndName] = createEmbeddedEntry(spanAndAnnotation)
+      embeddedSpans.set(typeAndName, createEmbeddedEntry(spanAndAnnotation))
+    }
+  }
+
+  // Filter out entries with zero duration
+  for (const [key, value] of embeddedSpans) {
+    if (value.totalDuration === 0) {
+      embeddedSpans.delete(key)
     }
   }
 
   return {
     ...otherTraceRecordingAttributes,
-    embeddedSpans,
+    embeddedSpans: Object.fromEntries(embeddedSpans),
     nonEmbeddedSpans: [...nonEmbeddedSpans],
   }
 }

src/v3/recordingComputeUtils.ts

@@ -197,7 +197,7 @@ function getComputedRenderBeaconSpans<
     string,
     {
       firstStart: number
-      lastEnd: number | undefined
+      firstContentfulRenderEnd: number | undefined
       firstLoadingEnd: number | undefined
       firstContentStart: number | undefined
       renderCount: number
@@ -227,15 +227,19 @@ function getComputedRenderBeaconSpans<
     )
     if (!scopeMatch) continue
     const start = startTime.now
-    const contentEnd =
-      renderedOutput === 'content' ? start + duration : undefined
+    const contentfulRenderEnd =
+      entry.span.type === 'component-render' && renderedOutput === 'content'
+        ? start + duration
+        : undefined
 
     const spanTimes = renderSpansByBeacon.get(name)
 
+    // TODO: make sure that sumOfRenderDurations takes into account that mismatch between render-start and full render - might be discarded and re-render - should extend the first render duration from the first render start to the first end
+
     if (!spanTimes) {
       renderSpansByBeacon.set(name, {
         firstStart: start,
-        lastEnd: contentEnd,
+        firstContentfulRenderEnd: contentfulRenderEnd,
         renderCount: entry.span.type === 'component-render' ? 1 : 0,
         sumOfDurations: duration,
         firstContentStart: renderedOutput === 'content' ? start : undefined,
@@ -246,10 +250,10 @@ function getComputedRenderBeaconSpans<
       })
     } else {
       spanTimes.firstStart = Math.min(spanTimes.firstStart, start)
-      spanTimes.lastEnd =
-        contentEnd && spanTimes.lastEnd
-          ? Math.max(spanTimes.lastEnd, contentEnd)
-          : contentEnd ?? spanTimes.lastEnd
+      spanTimes.firstContentfulRenderEnd =
+        contentfulRenderEnd && spanTimes.firstContentfulRenderEnd
+          ? Math.min(spanTimes.firstContentfulRenderEnd, contentfulRenderEnd)
+          : contentfulRenderEnd ?? spanTimes.firstContentfulRenderEnd
       if (entry.span.type === 'component-render') {
         spanTimes.renderCount += 1
       }
@@ -277,18 +281,19 @@ function getComputedRenderBeaconSpans<
 
   // Calculate duration and startOffset for each beacon
   for (const [beaconName, spanTimes] of renderSpansByBeacon) {
-    if (!spanTimes.lastEnd) continue
+    if (!spanTimes.firstContentfulRenderEnd) continue
     computedRenderBeaconSpans[beaconName] = {
       startOffset: spanTimes.firstStart - input.startTime.now,
-      timeToContent: spanTimes.lastEnd - spanTimes.firstStart,
-      timeToLoading: spanTimes.firstLoadingEnd
+      firstRenderTillContent:
+        spanTimes.firstContentfulRenderEnd - spanTimes.firstStart,
+      firstRenderTillLoading: spanTimes.firstLoadingEnd
         ? spanTimes.firstLoadingEnd - spanTimes.firstStart
         : 0,
-      timeToData: spanTimes.firstContentStart
+      firstRenderTillData: spanTimes.firstContentStart
         ? spanTimes.firstContentStart - spanTimes.firstStart
         : 0,
       renderCount: spanTimes.renderCount,
-      sumOfDurations: spanTimes.sumOfDurations,
+      sumOfRenderDurations: spanTimes.sumOfDurations,
     }
   }
 

src/v3/traceRecordingTypes.ts

@@ -19,15 +19,15 @@ export interface ComputedSpan {
 export interface ComputedRenderSpan {
   /** time relative to beginning of the trace */
   startOffset: number
-  /** time from startOffset to the first moment we are able to start rendering the data */
-  timeToData: number
   /** time from startOffset to the first loading state rendered */
-  timeToLoading: number
-  /** time from startOffset to fully displaying the content */
-  timeToContent: number
+  firstRenderTillLoading: number
+  /** time from startOffset to the first moment we are able to start rendering the data */
+  firstRenderTillData: number
+  /** time from startOffset to first displaying the complete content */
+  firstRenderTillContent: number
   renderCount: number
   /** the sum of all render durations */
-  sumOfDurations: number
+  sumOfRenderDurations: number
 }
 
 export interface TraceRecordingBase<TracerScopeT> {