fix: Add programming language to ChatInteractWithMessageEvent

server/aws-lsp-codewhisperer/src/language-server/chat/telemetry/chatTelemetryController.ts

@@ -63,6 +63,7 @@ export class ChatTelemetryController {
     #tabTelemetryInfoByTabId: { [tabId: string]: ConversationTriggerInfo }
     #currentTriggerByTabId: { [tabId: string]: TriggerType } = {}
     #customizationInfoByTabAndMessageId: { [tabId: string]: { [messageId: string]: string } }
+    #programmingLanguageByTabId: { [tabId: string]: CodewhispererLanguage } = {}
     #credentialsProvider: CredentialsProvider
     #telemetry: Telemetry
     #logging: Logging
@@ -73,6 +74,7 @@ export class ChatTelemetryController {
         this.#tabTelemetryInfoByTabId = {}
         this.#currentTriggerByTabId = {}
         this.#customizationInfoByTabAndMessageId = {}
+        this.#programmingLanguageByTabId = {}
         this.#telemetry = features.telemetry
         this.#logging = features.logging
         this.#credentialsProvider = features.credentialsProvider
@@ -103,6 +105,10 @@ export class ChatTelemetryController {
         return tabId && messageId && this.#customizationInfoByTabAndMessageId[tabId]?.[messageId]
     }
 
+    public getProgrammingLanguage(tabId: string) {
+        return this.#programmingLanguageByTabId[tabId]
+    }
+
     public removeConversation(tabId: string) {
         delete this.#tabTelemetryInfoByTabId[tabId]
         delete this.#customizationInfoByTabAndMessageId[tabId]
@@ -309,6 +315,10 @@ export class ChatTelemetryController {
                 [metric.cwsprChatMessageId]: metric.codewhispererCustomizationArn,
             }
         }
+        // Store the programming language for this tab
+        if (metric.cwsprChatProgrammingLanguage) {
+            this.#programmingLanguageByTabId[tabId] = metric.cwsprChatProgrammingLanguage as CodewhispererLanguage
+        }
         return this.#telemetryService.emitChatAddMessage(
             {
                 conversationId: conversationId,
@@ -555,6 +565,7 @@ export class ChatTelemetryController {
                         }
                         await this.#telemetryService.emitChatInteractWithMessage(voteData, {
                             conversationId: this.getConversationId(params.tabId),
+                            programmingLanguage: this.getProgrammingLanguage(params.tabId),
                         })
                         break
                     case ChatUIEventName.InsertToCursorPosition:
@@ -581,6 +592,7 @@ export class ChatTelemetryController {
                                 params.name === ChatUIEventName.InsertToCursorPosition
                                     ? params.code?.split('\n').length
                                     : undefined,
+                            programmingLanguage: this.getProgrammingLanguage(params.tabId),
                         })
                         break
                     case ChatUIEventName.LinkClick:

server/aws-lsp-codewhisperer/src/shared/telemetry/telemetryService.test.ts

@@ -527,6 +527,29 @@
                 },
             })
         })
+
+        it('should send InteractWithMessage with programming language when provided', () => {
+            const metric = {
+                cwsprChatMessageId: 'message123',
+                cwsprChatInteractionType: ChatInteractionType.InsertAtCursor,
+                cwsprChatAcceptedCharactersLength: 100,
+            }
+            telemetryService.emitChatInteractWithMessage(metric, {
+                conversationId: 'conv123',
+                programmingLanguage: 'typescript',
+            })
+
+            sinon.assert.calledOnce(codeWhisperServiceStub.sendTelemetryEvent)
+            const call = codeWhisperServiceStub.sendTelemetryEvent.getCall(0)
+            const event = call?.args[0]?.telemetryEvent?.chatInteractWithMessageEvent
+
+            // Verify programming language is set correctly
+            if (event) {
+                sinon.assert.match(event.programmingLanguage, {
+                    languageName: 'typescript',
+                })
+            }
+        })
     })
 
     it('should emit CodeCoverageEvent event to STE and to the destination', () => {

server/aws-lsp-codewhisperer/src/shared/telemetry/telemetryService.ts

@@ -322,6 +322,7 @@
         options?: {
             conversationId?: string
             acceptedLineCount?: number
+            programmingLanguage?: CodewhispererLanguage
         }
     ) {
         if (options?.conversationId === undefined) {
@@ -351,6 +352,11 @@
         if (metric.codewhispererCustomizationArn) {
             event.customizationArn = metric.codewhispererCustomizationArn
         }
+        if (options.programmingLanguage) {
+            event.programmingLanguage = {
+                languageName: getRuntimeLanguage(options.programmingLanguage),
+            }
+        }
         return this.invokeSendTelemetryEvent({
             chatInteractWithMessageEvent: event,
         })

server/aws-lsp-codewhisperer/src/shared/telemetry/types.ts

@@ -459,6 +459,7 @@ export type InteractWithMessageEvent = {
     cwsprChatCodeBlockIndex?: number
     cwsprChatTotalCodeBlocks?: number
     codewhispererCustomizationArn?: string
+    cwsprChatProgrammingLanguage?: string
 }
 
 export type StartConversationEvent = {