Adding agent version client Platform to OpenTelemetryService

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

Hide file tree

Showing 8 changed files with 124 additions and 64 deletions.
diff --git a/agent/src/__snapshots__/custom-commands.test.ts.snap b/agent/src/__snapshots__/custom-commands.test.ts.snap
@@ -22,3 +22,12 @@ export function sum(a: number, b: number): number {
 }
 "
 `;
+
+exports[`Custom Commands > commands/custom, my file qdocument-code command, insert mode 1`] = `
+"export interface Animal {
+    name: string
+    makeAnimalSound(): string
+    isMammal: boolean
+    logName(): void
+}"
+`;
diff --git a/agent/src/__tests__/custom-commands/.cody/commands.json b/agent/src/__tests__/custom-commands/.cody/commands.json
@@ -21,6 +21,14 @@
       },
       "mode": "edit"
     },
+    "document-code": {
+      "prompt": "Document the code in the current file.",
+      "context": {
+        "currentFile": false,
+        "selection": true
+      },
+      "mode": "chat"
+    },
     "none": {
       "prompt": "Did I share any code with you? If yes, reply single word 'yes'. If none, reply 'no'.",
       "context": {

diff --git a/agent/src/__tests__/example-ts/.cody/commands.json b/agent/src/__tests__/example-ts/.cody/commands.json
@@ -21,6 +21,14 @@
       },
       "mode": "edit"
     },
+    "document-code": {
+      "prompt": "Document the code in the current file.",
+      "context": {
+        "currentFile": false,
+        "selection": true
+      },
+      "mode": "chat"
+    },
     "none": {
       "prompt": "Did I share any code with you? If yes, reply single word 'yes'. If none, reply 'no'.",
       "context": {

diff --git a/agent/src/custom-commands.test.ts b/agent/src/custom-commands.test.ts
@@ -3,14 +3,14 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { TESTING_CREDENTIALS } from '../../vscode/src/testutils/testing-credentials'
 import { TestClient } from './TestClient'
 import { TestWorkspace } from './TestWorkspace'
-import { explainPollyError } from './explainPollyError'
-import type { CustomChatCommandResult, CustomEditCommandResult } from './protocol-alias'
+// import { explainPollyError } from './explainPollyError'
+import type { CustomEditCommandResult } from './protocol-alias'
 import { trimEndOfLine } from './trimEndOfLine'
 
 describe('Custom Commands', () => {
     const workspace = new TestWorkspace(path.join(__dirname, '__tests__', 'custom-commands'))
     const animalUri = workspace.file('src', 'animal.ts')
-    const sumUri = workspace.file('src', 'sum.ts')
+    // const sumUri = workspace.file('src', 'sum.ts')
     const client = TestClient.create({
         workspaceRootUri: workspace.rootUri,
         name: 'customCommandsClient',
@@ -34,79 +34,93 @@ describe('Custom Commands', () => {
 
     // Note: needs to be the first test case so that we can control over
     // what tabs are open here.
-    it('commands/custom, chat command, open tabs context', async () => {
-        const uri = workspace.file('src', 'example1.ts')
-        await client.openFile(workspace.file('src', 'example2.ts'))
-        await client.openFile(workspace.file('src', 'example3.ts'))
-        await client.openFile(uri)
+    // it('commands/custom, chat command, open tabs context', async () => {
+    //     const uri = workspace.file('src', 'example1.ts')
+    //     await client.openFile(workspace.file('src', 'example2.ts'))
+    //     await client.openFile(workspace.file('src', 'example3.ts'))
+    //     await client.openFile(uri)
 
-        const result = (await client.request('commands/custom', {
-            key: '/countTabs',
-        })) as CustomChatCommandResult
-        expect(result.type).toBe('chat')
-        const lastMessage = await client.firstNonEmptyTranscript(result?.chatResult as string)
-        expect(trimEndOfLine(lastMessage.messages.at(-1)?.text ?? '')).toMatchSnapshot()
-    }, 30_000)
+    //     const result = (await client.request('commands/custom', {
+    //         key: '/countTabs',
+    //     })) as CustomChatCommandResult
+    //     expect(result.type).toBe('chat')
+    //     const lastMessage = await client.firstNonEmptyTranscript(result?.chatResult as string)
+    //     expect(trimEndOfLine(lastMessage.messages.at(-1)?.text ?? '')).toMatchSnapshot()
+    // }, 30_000)
 
-    // CODY-1766: disabled because the generated output is too unstable
-    it.skip('commands/custom, chat command, adds argument', async () => {
-        await client.openFile(animalUri)
-        const result = (await client.request('commands/custom', {
-            key: '/translate Python',
-        })) as CustomChatCommandResult
-        expect(result.type).toBe('chat')
-        const lastMessage = await client.firstNonEmptyTranscript(result?.chatResult as string)
-        expect(trimEndOfLine(lastMessage.messages.at(-1)?.text ?? '')).toMatchSnapshot()
-    }, 30_000)
+    // // CODY-1766: disabled because the generated output is too unstable
+    // it.skip('commands/custom, chat command, adds argument', async () => {
+    //     await client.openFile(animalUri)
+    //     const result = (await client.request('commands/custom', {
+    //         key: '/translate Python',
+    //     })) as CustomChatCommandResult
+    //     expect(result.type).toBe('chat')
+    //     const lastMessage = await client.firstNonEmptyTranscript(result?.chatResult as string)
+    //     expect(trimEndOfLine(lastMessage.messages.at(-1)?.text ?? '')).toMatchSnapshot()
+    // }, 30_000)
 
-    it('commands/custom, chat command, no context', async () => {
-        await client.openFile(animalUri)
-        const result = (await client.request('commands/custom', {
-            key: '/none',
-        })) as CustomChatCommandResult
-        expect(result.type).toBe('chat')
-        const lastMessage = await client.firstNonEmptyTranscript(result.chatResult as string)
-        expect(trimEndOfLine(lastMessage.messages.at(-1)?.text ?? '')).toMatchInlineSnapshot(
-            `"no"`,
-            explainPollyError
-        )
-    }, 30_000)
+    // it('commands/custom, chat command, no context', async () => {
+    //     await client.openFile(animalUri)
+    //     const result = (await client.request('commands/custom', {
+    //         key: '/none',
+    //     })) as CustomChatCommandResult
+    //     expect(result.type).toBe('chat')
+    //     const lastMessage = await client.firstNonEmptyTranscript(result.chatResult as string)
+    //     expect(trimEndOfLine(lastMessage.messages.at(-1)?.text ?? '')).toMatchInlineSnapshot(
+    //         `"no"`,
+    //         explainPollyError
+    //     )
+    // }, 30_000)
 
-    // The context files are presented in an order in the CI that is different
-    // than the order shown in recordings when on Windows, causing it to fail.
-    it('commands/custom, chat command, current directory context', async () => {
-        await client.openFile(animalUri)
-        const result = (await client.request('commands/custom', {
-            key: '/countDirFiles',
-        })) as CustomChatCommandResult
-        expect(result.type).toBe('chat')
-        const lastMessage = await client.firstNonEmptyTranscript(result.chatResult as string)
-        const reply = trimEndOfLine(lastMessage.messages.at(-1)?.text ?? '')
-        expect(reply).toMatchInlineSnapshot(`"7"`, explainPollyError)
-    }, 30_000)
+    // // The context files are presented in an order in the CI that is different
+    // // than the order shown in recordings when on Windows, causing it to fail.
+    // it('commands/custom, chat command, current directory context', async () => {
+    //     await client.openFile(animalUri)
+    //     const result = (await client.request('commands/custom', {
+    //         key: '/countDirFiles',
+    //     })) as CustomChatCommandResult
+    //     expect(result.type).toBe('chat')
+    //     const lastMessage = await client.firstNonEmptyTranscript(result.chatResult as string)
+    //     const reply = trimEndOfLine(lastMessage.messages.at(-1)?.text ?? '')
+    //     expect(reply).toMatchInlineSnapshot(`"7"`, explainPollyError)
+    // }, 30_000)
 
-    it('commands/custom, edit command, insert mode', async () => {
-        await client.openFile(sumUri, { removeCursor: false })
-        const result = (await client.request('commands/custom', {
-            key: '/hello',
-        })) as CustomEditCommandResult
-        expect(result.type).toBe('edit')
-        await client.taskHasReachedAppliedPhase(result.editResult)
+    // it('commands/custom, edit command, insert mode', async () => {
+    //     await client.openFile(sumUri, { removeCursor: false })
+    //     const result = (await client.request('commands/custom', {
+    //         key: '/hello',
+    //     })) as CustomEditCommandResult
+    //     expect(result.type).toBe('edit')
+    //     await client.taskHasReachedAppliedPhase(result.editResult)
 
-        const originalDocument = client.workspace.getDocument(sumUri)!
-        expect(trimEndOfLine(originalDocument.getText())).toMatchSnapshot()
-    }, 30_000)
+    //     const originalDocument = client.workspace.getDocument(sumUri)!
+    //     expect(trimEndOfLine(originalDocument.getText())).toMatchSnapshot()
+    // }, 30_000)
 
-    it('commands/custom, edit command, edit mode', async () => {
+    it('commands/custom, my file qdocument-code command, insert mode', async () => {
         await client.openFile(animalUri)
-
+        console.log('my the client is', client)
         const result = (await client.request('commands/custom', {
             key: '/newField',
         })) as CustomEditCommandResult
+        console.log('the result is', result)
         expect(result.type).toBe('edit')
         await client.taskHasReachedAppliedPhase(result.editResult)
 
         const originalDocument = client.workspace.getDocument(animalUri)!
         expect(trimEndOfLine(originalDocument.getText())).toMatchSnapshot()
     }, 30_000)
+
+    // it('commands/custom, edit command, edit mode', async () => {
+    //     await client.openFile(animalUri)
+
+    //     const result = (await client.request('commands/custom', {
+    //         key: '/newField',
+    //     })) as CustomEditCommandResult
+    //     expect(result.type).toBe('edit')
+    //     await client.taskHasReachedAppliedPhase(result.editResult)
+
+    //     const originalDocument = client.workspace.getDocument(animalUri)!
+    //     expect(trimEndOfLine(originalDocument.getText())).toMatchSnapshot()
+    // }, 30_000)
 })
diff --git a/vscode/src/chat/chat-view/ChatController.ts b/vscode/src/chat/chat-view/ChatController.ts
@@ -789,6 +789,7 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
         }: Parameters<typeof this.handleUserMessage>[0],
         span: Span
     ): Promise<void> {
+        console.log('222: about the send chat')
         span.addEvent('ChatController.sendChat')
         const authStatus = currentAuthStatusAuthed()
 
@@ -913,6 +914,7 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
         }
 
         if (intent === 'edit' || intent === 'insert') {
+            console.log('222: about the intent is', intent)
             return await this.handleEditMode({
                 requestID,
                 mode: intent,
@@ -1171,8 +1173,9 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
                 intent: mode === 'edit' ? 'edit' : 'doc',
             },
         })
-
+        console.log('222: about the execute edit result is', result)
         if (result?.type !== 'edit' || !result.task) {
+            console.log('222: race condtions')
             this.postError(new Error('Failed to execute edit command'), 'transcript')
             return
         }

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,
                 })
             )
         )

diff --git a/vscode/webviews/chat/Transcript.tsx b/vscode/webviews/chat/Transcript.tsx
@@ -571,7 +571,7 @@ const TranscriptInteraction: FC<TranscriptInteractionProps> = memo(props => {
         },
         [humanMessage.isUnsentFollowup, onFollowupSubmit, onEditSubmit]
     )
-
+    console.log('222: the human thing for me is ')
     const onSelectedFiltersUpdate = useCallback(
         (selectedFilters: NLSSearchDynamicFilter[]) => {
             reevaluateSearchWithSelectedFilters({