Adding agent version client Platform to OpenTelemetryService

sourcegraph · Dec 21, 2024 · b48ac6d · b48ac6d
1 parent 7e359e3
commit b48ac6d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/vscode/src/services/open-telemetry/CodyTraceExport.ts b/vscode/src/services/open-telemetry/CodyTraceExport.ts
@@ -1,18 +1,29 @@
 import type { ExportResult } from '@opentelemetry/core'
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'
 import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'
+import type { CodyIDE } from '@sourcegraph/cody-shared'
 
 const MAX_TRACE_RETAIN_MS = 60 * 1000
 
 export class CodyTraceExporter extends OTLPTraceExporter {
     private isTracingEnabled = false
     private queuedSpans: Map<string, { span: ReadableSpan; enqueuedAt: number }> = new Map()
+    private clientPlatform: CodyIDE
+    private agentVersion?: string
 
     constructor({
         traceUrl,
         accessToken,
         isTracingEnabled,
-    }: { traceUrl: string; accessToken: string | null; isTracingEnabled: boolean }) {
+        clientPlatform,
+        agentVersion,
+    }: {
+        traceUrl: string
+        accessToken: string | null
+        isTracingEnabled: boolean
+        clientPlatform: CodyIDE
+        agentVersion?: string
+    }) {
         super({
             url: traceUrl,
             httpAgentOptions: { rejectUnauthorized: false },
@@ -21,6 +32,8 @@ export class CodyTraceExporter extends OTLPTraceExporter {
             },
         })
         this.isTracingEnabled = isTracingEnabled
+        this.clientPlatform = clientPlatform
+        this.agentVersion = agentVersion
     }
 
     export(spans: ReadableSpan[], resultCallback: (result: ExportResult) => void): void {
@@ -44,6 +57,8 @@ export class CodyTraceExporter extends OTLPTraceExporter {
         const spanMap = new Map<string, ReadableSpan>()
         for (const span of spans) {
             spanMap.set(span.spanContext().spanId, span)
+            span.attributes.clientPlatform = this.clientPlatform
+            span.attributes.agentVersion = this.agentVersion
         }
 
         const spansToExport: ReadableSpan[] = []

diff --git a/vscode/src/services/open-telemetry/OpenTelemetryService.node.ts b/vscode/src/services/open-telemetry/OpenTelemetryService.node.ts
@@ -5,6 +5,7 @@ import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
 
 import {
+    type CodyIDE,
     FeatureFlag,
     type ResolvedConfiguration,
     type Unsubscribable,
@@ -80,6 +81,8 @@ export class OpenTelemetryService {
                     traceUrl,
                     isTracingEnabled: this.isTracingEnabled,
                     accessToken: auth.accessToken,
+                    clientPlatform: configuration.agentIDE ?? ('defaultIDE' as CodyIDE),
+                    agentVersion: configuration.agentExtensionVersion,
                 })
             )
         )