Addressing comments and adding cwsprChatProgrammingLanguage to commons package

Author: laileni-aws

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.271"
 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

@@ -33,7 +33,8 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
     private val codeReferences = mutableListOf<CodeReference>()
     private var requestId: String = ""
     private var statusCode: Int = 0
-    private var codeBlockLanguage: String = "plaintext"
+    private val defaultTestGenResponseLanguage: String = "plaintext"
+    private var codeBlockLanguage: String = defaultTestGenResponseLanguage
 
     companion object {
         private val CODE_BLOCK_PATTERN = Regex("<pre>\\s*<code")
@@ -148,18 +149,18 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
         // This fulfills both the cases of unit test generation(java, python) and general use case(Non java and Non python) languages.
         val codeBlockStart = message.indexOf("```")
         if (codeBlockStart == -1) {
-            return "plaintext"
+            return defaultTestGenResponseLanguage
         }
 
         val languageStart = codeBlockStart + 3
         val languageEnd = message.indexOf('\n', languageStart)
 
         if (languageEnd == -1) {
-            return "plaintext"
+            return defaultTestGenResponseLanguage
         }
 
         val language = message.substring(languageStart, languageEnd).trim()
-        return if (language.isNotEmpty()) language else "plaintext"
+        return if (language.isNotEmpty()) language else defaultTestGenResponseLanguage
     }
 
     private fun processChatEvent(
@@ -228,7 +229,7 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
             } else {
                 responseText.toString()
             }
-            if (codeBlockLanguage == "plaintext") {
+            if (codeBlockLanguage == defaultTestGenResponseLanguage) {
                 // To get the language of generated code in Q chat.
                 codeBlockLanguage = extractCodeBlockLanguage(message)
             }

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

@@ -692,10 +692,6 @@
                 {
                     "type": "cwsprChatHasProjectContext",
                     "required": false
-                },
-                {
-                    "type": "cwsprChatProgrammingLanguage",
-                    "required": false
                 }
             ]
         },