Fixing repetivie calls to span expiry

sourcegraph · Nov 20, 2024 · d46b975 · d46b975
1 parent 0de24aa
commit d46b975
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/vscode/src/services/open-telemetry/CodyTraceExportWeb.ts b/vscode/src/services/open-telemetry/CodyTraceExportWeb.ts
@@ -13,6 +13,8 @@ export class CodyTraceExporterWeb extends OTLPTraceExporter {
     private queuedSpans: Map<string, { span: ReadableSpan; enqueuedAt: number }> = new Map()
     private agentIDE: CodyIDE
     private extensionAgentVersion?: string
+    private lastExpiryCheck: number = 0;
+
     constructor({
         isTracingEnabled,
         agentIDE,
@@ -31,18 +33,25 @@ export class CodyTraceExporterWeb extends OTLPTraceExporter {
         this.extensionAgentVersion = extensionAgentVersion
     }
 
-    export(spans: ReadableSpan[], resultCallback: (result: ExportResult) => void): void {
-        if (!this.isTracingEnabled) {
-            return
-        }
-
-        const now = Date.now()
+    private removeExpiredSpans(now: number): void {
         for (const [spanId, { enqueuedAt }] of this.queuedSpans.entries()) {
             if (now - enqueuedAt > MAX_TRACE_RETAIN_MS) {
                 this.queuedSpans.delete(spanId)
                 logDebug('[CodyTraceExporterWeb] Removed expired span from queue:', spanId)
             }
         }
+    }
+
+    export(spans: ReadableSpan[], resultCallback: (result: ExportResult) => void): void {
+        if (!this.isTracingEnabled) {
+            return
+        }
+
+        const now = performance.now()
+        if (now - this.lastExpiryCheck > MAX_TRACE_RETAIN_MS) {
+            this.removeExpiredSpans(now)
+            this.lastExpiryCheck = now
+        }
 
         // Include queued spans for re-evaluation
         const allSpans = [...spans, ...Array.from(this.queuedSpans.values()).map(q => q.span)]
@@ -140,7 +149,7 @@ export class CodyTraceExporterWeb extends OTLPTraceExporter {
                             })) ?? [],
                     },
                 })),
-                timestamp: Date.now(),
+                timestamp: performance.now(),
             }
 
             // Send the validated and cleaned data

diff --git a/vscode/webviews/chat/Transcript.tsx b/vscode/webviews/chat/Transcript.tsx
@@ -375,7 +375,6 @@ const TranscriptInteraction: FC<TranscriptInteractionProps> = memo(props => {
     const spanManager = new SpanManager('cody-webview')
     const renderSpan = useRef<Span>()
     const timeToFirstTokenSpan = useRef<Span>()
-    const renderStartTime = useRef<number>()
     const hasRecordedFirstToken = useRef(false)
 
     // State to track loading status