telemetry(amazonq): Adding cwsprChatProgrammingLanguage parameter to insertAtCursor and CopyAtClipboard events

gradle/libs.versions.toml

@@ -25,7 +25,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.10"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.262"
+telemetryGenerator = "1.0.272"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt

@@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.onStart
 import software.amazon.awssdk.awscore.exception.AwsServiceException
 import software.amazon.awssdk.services.codewhispererstreaming.model.CodeWhispererStreamingException
 import software.aws.toolkits.core.utils.convertMarkdownToHTML
+import software.aws.toolkits.core.utils.extractCodeBlockLanguage
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.exceptions.ChatApiException
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatResponseEvent
@@ -33,6 +34,8 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
     private val codeReferences = mutableListOf<CodeReference>()
     private var requestId: String = ""
     private var statusCode: Int = 0
+    private val defaultTestGenResponseLanguage: String = "plaintext"
+    private var codeBlockLanguage: String = defaultTestGenResponseLanguage
 
     companion object {
         private val CODE_BLOCK_PATTERN = Regex("<pre>\\s*<code")
@@ -209,6 +212,10 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
             } else {
                 responseText.toString()
             }
+            if (codeBlockLanguage == defaultTestGenResponseLanguage) {
+                // To get the language of generated code in Q chat.
+                codeBlockLanguage = extractCodeBlockLanguage(message)
+            }
             ChatMessage(
                 tabId = tabId,
                 triggerId = triggerId,
@@ -217,6 +224,7 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                 message = message,
                 codeReference = codeReferences,
                 userIntent = data.userIntent,
+                codeBlockLanguage = codeBlockLanguage,
             )
         } else {
             null

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

@@ -219,7 +219,8 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
                     credentialStartUrl = getStartUrl(context.project),
                     cwsprChatCodeBlockIndex = message.codeBlockIndex?.toLong(),
                     cwsprChatTotalCodeBlocks = message.totalCodeBlocks?.toLong(),
-                    cwsprChatHasProjectContext = getMessageHasProjectContext(message.messageId)
+                    cwsprChatHasProjectContext = getMessageHasProjectContext(message.messageId),
+                    cwsprChatProgrammingLanguage = message.codeBlockLanguage,
                 )
                 ChatInteractWithMessageEvent.builder().apply {
                     conversationId(getConversationId(message.tabId).orEmpty())
@@ -244,7 +245,8 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
                     credentialStartUrl = getStartUrl(context.project),
                     cwsprChatCodeBlockIndex = message.codeBlockIndex?.toLong(),
                     cwsprChatTotalCodeBlocks = message.totalCodeBlocks?.toLong(),
-                    cwsprChatHasProjectContext = getMessageHasProjectContext(message.messageId)
+                    cwsprChatHasProjectContext = getMessageHasProjectContext(message.messageId),
+                    cwsprChatProgrammingLanguage = message.codeBlockLanguage,
                 )
                 ChatInteractWithMessageEvent.builder().apply {
                     conversationId(getConversationId(message.tabId).orEmpty())

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt

@@ -72,6 +72,7 @@ sealed interface IncomingCwcMessage : CwcMessage {
         val eventId: String?,
         val codeBlockIndex: Int?,
         val totalCodeBlocks: Int?,
+        val codeBlockLanguage: String?,
     ) : IncomingCwcMessage
 
     data class InsertCodeAtCursorPosition(
@@ -84,6 +85,7 @@ sealed interface IncomingCwcMessage : CwcMessage {
         val eventId: String?,
         val codeBlockIndex: Int?,
         val totalCodeBlocks: Int?,
+        val codeBlockLanguage: String?,
     ) : IncomingCwcMessage
 
     data class TriggerTabIdReceived(
@@ -214,6 +216,7 @@ data class ChatMessage(
     val relatedSuggestions: List<Suggestion>? = null,
     val codeReference: List<CodeReference>? = null,
     val userIntent: UserIntent? = null,
+    val codeBlockLanguage: String? = "plaintext",
 ) : UiMessage(
     tabId = tabId,
     type = "chatMessage",

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt

@@ -420,7 +420,8 @@ class TelemetryHelperTest {
                 "insertionTargetType",
                 "eventId",
                 codeBlockIndex,
-                totalCodeBlocks
+                totalCodeBlocks,
+                lang
             )
         )
 
@@ -484,7 +485,8 @@ class TelemetryHelperTest {
                 emptyList(),
                 eventId,
                 codeBlockIndex,
-                totalCodeBlocks
+                totalCodeBlocks,
+                lang
             )
         )
 

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/cwChatConnector.ts

@@ -101,6 +101,7 @@ export class Connector {
         codeBlockIndex?: number,
         totalCodeBlocks?: number,
         userIntent?: string,
+        codeBlockLanguage?: string,
     ): void => {
         this.sendMessageToExtension({
             tabID: tabID,
@@ -113,7 +114,8 @@ export class Connector {
             eventId,
             codeBlockIndex,
             totalCodeBlocks,
-            userIntent
+            userIntent,
+            codeBlockLanguage
         })
     }
 
@@ -127,6 +129,7 @@ export class Connector {
         codeBlockIndex?: number,
         totalCodeBlocks?: number,
         userIntent?: string,
+        codeBlockLanguage?: string,
     ): void => {
         this.sendMessageToExtension({
             tabID: tabID,
@@ -139,7 +142,8 @@ export class Connector {
             eventId,
             codeBlockIndex,
             totalCodeBlocks,
-            userIntent
+            userIntent,
+            codeBlockLanguage
         })
     }
 
@@ -271,6 +275,7 @@ export class Connector {
                 canBeVoted: true,
                 codeReference: messageData.codeReference,
                 userIntent: messageData.userIntent,
+                codeBlockLanguage: messageData.codeBlockLanguage,
             }
 
             // If it is not there we will not set it
@@ -304,6 +309,7 @@ export class Connector {
                 messageId: messageData.messageId,
                 codeReference: messageData.codeReference,
                 userIntent: messageData.userIntent,
+                codeBlockLanguage: messageData.codeBlockLanguage,
                 followUp:
                     messageData.followUps !== undefined && messageData.followUps.length > 0
                         ? {

plugins/amazonq/mynah-ui/src/mynah-ui/ui/connector.ts

@@ -31,7 +31,8 @@ export interface ChatPayload {
 }
 
 export interface CWCChatItem extends ChatItem {
-    userIntent?: string
+    userIntent?: string,
+    codeBlockLanguage?: string,
 }
 
 export interface ConnectorProps {
@@ -235,7 +236,8 @@ export class Connector {
         eventId?: string,
         codeBlockIndex?: number,
         totalCodeBlocks?: number,
-        userIntent?: string
+        userIntent?: string,
+        codeBlockLanguage?: string
     ): void => {
         switch (this.tabsStorage.getTab(tabID)?.type) {
             case 'cwc':
@@ -248,7 +250,8 @@ export class Connector {
                     eventId,
                     codeBlockIndex,
                     totalCodeBlocks,
-                    userIntent
+                    userIntent,
+                    codeBlockLanguage
                 )
                 break
             case 'featuredev':
@@ -266,7 +269,8 @@ export class Connector {
         eventId?: string,
         codeBlockIndex?: number,
         totalCodeBlocks?: number,
-        userIntent?: string
+        userIntent?: string,
+        codeBlockLanguage?: string
     ): void => {
         switch (this.tabsStorage.getTab(tabID)?.type) {
             case 'cwc':
@@ -279,7 +283,8 @@ export class Connector {
                     eventId,
                     codeBlockIndex,
                     totalCodeBlocks,
-                    userIntent
+                    userIntent,
+                    codeBlockLanguage
                 )
                 break
             case 'featuredev':

plugins/amazonq/mynah-ui/src/mynah-ui/ui/main.ts

@@ -24,7 +24,7 @@ export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, codeT
     let mynahUI: MynahUI
     // eslint-disable-next-line prefer-const
     let connector: Connector
-    const messageUserIntentMap = new Map<string, string>()
+    const responseMetadata = new Map<string, string[]>()
 
     const tabsStorage = new TabsStorage({
         onTabTimeout: tabID => {
@@ -254,8 +254,8 @@ export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, codeT
                         ? { type: ChatItemType.CODE_RESULT, fileList: item.fileList }
                         : {}),
                 })
-                if (item.messageId !== undefined && item.userIntent !== undefined) {
-                    messageUserIntentMap.set(item.messageId, item.userIntent)
+                if (item.messageId !== undefined && item.userIntent !== undefined && item.codeBlockLanguage !== undefined) {
+                    responseMetadata.set(item.messageId, [item.userIntent, item.codeBlockLanguage])
                 }
                 return
             }
@@ -466,7 +466,8 @@ export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, codeT
                         eventId,
                         codeBlockIndex,
                         totalCodeBlocks,
-                        messageUserIntentMap.get(messageId) ?? undefined
+                        responseMetadata.get(messageId)?.[0] ?? undefined,
+                        responseMetadata.get(messageId)?.[1] ?? undefined
                     )
                     break
                 case 'copy':
@@ -479,7 +480,8 @@ export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, codeT
                         eventId,
                         codeBlockIndex,
                         totalCodeBlocks,
-                        messageUserIntentMap.get(messageId) ?? undefined
+                        responseMetadata.get(messageId)?.[0] ?? undefined,
+                        responseMetadata.get(messageId)?.[1] ?? undefined
                     )
                     mynahUI.notify({
                         type: NotificationType.SUCCESS,

plugins/core/core/src/software/aws/toolkits/core/utils/TextUtils.kt

@@ -17,6 +17,25 @@
     return htmlRenderer.render(document)
 }
 
+fun extractCodeBlockLanguage(message: String): String {
+    // This fulfills both the cases of unit test generation(java, python) and general use case(Non java and Non python) languages.
+    val defaultTestGenResponseLanguage: String = "plaintext"
+    val indexStart: Int = 3
+    val codeBlockStart = message.indexOf("```")
+    if (codeBlockStart == -1) {
+        return defaultTestGenResponseLanguage
+    }
+
+    val languageStart = codeBlockStart + indexStart
+    val languageEnd = message.indexOf('\n', languageStart)
+
+    if (languageEnd == -1) {
+        return defaultTestGenResponseLanguage
+    }
+
+    return message.substring(languageStart, languageEnd).trim().ifEmpty { defaultTestGenResponseLanguage }
+}
+
 class CodeBlockRenderer(private val html: HtmlWriter) : NodeRenderer {
     override fun getNodeTypes(): Set<Class<out Node>> = setOf(FencedCodeBlock::class.java)
     override fun render(node: Node?) {

plugins/core/jetbrains-community/resources/telemetryOverride.json

@@ -99,11 +99,6 @@
             "type": "int",
             "description": "Cpu usage of LSP server"
         },
-        {
-            "name": "cwsprChatProgrammingLanguage",
-            "type": "string",
-            "description": "Programming language associated with the message"
-        },
         {
             "name": "cwsprChatConversationType",
             "type": "string",
@@ -644,57 +639,6 @@
                 }
             ]
         },
-        {
-            "name": "amazonq_interactWithMessage",
-            "description": "When a user interacts with a message in the conversation",
-            "metadata": [
-                {
-                    "type": "cwsprChatConversationId"
-                },
-                {
-                    "type": "cwsprChatMessageId"
-                },
-                {
-                    "type": "cwsprChatUserIntent",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatInteractionType"
-                },
-                {
-                    "type": "cwsprChatInteractionTarget",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatCodeBlockIndex",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatTotalCodeBlocks",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatAcceptedCharactersLength",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatAcceptedNumberOfLines",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatHasReference",
-                    "required": false
-                },
-                {
-                    "type": "credentialStartUrl",
-                    "required": false
-                },
-                {
-                    "type": "cwsprChatHasProjectContext",
-                    "required": false
-                }
-            ]
-        },
         {
             "name": "amazonq_modifyCode",
             "description": "Percentage of code modified by the user after copying/inserting code from a message",