pass missing required API param for chat code insertion (#4572)

Author: Will-ShaoHua

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt

@@ -167,7 +167,7 @@ interface CodeWhispererClientAdaptor : Disposable {
     fun sendChatUserModificationTelemetry(
         sessionId: String,
         requestId: String,
-        language: String?,
+        language: CodeWhispererProgrammingLanguage,
         modificationPercentage: Double
     ): SendTelemetryEventResponse
 
@@ -504,14 +504,16 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
     override fun sendChatUserModificationTelemetry(
         sessionId: String,
         requestId: String,
-        language: String?,
+        language: CodeWhispererProgrammingLanguage,
         modificationPercentage: Double
     ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder ->
         requestBuilder.telemetryEvent { telemetryEventBuilder ->
             telemetryEventBuilder.chatUserModificationEvent {
                 it.conversationId(sessionId)
                 it.messageId(requestId)
-                it.programmingLanguage { langBuilder -> langBuilder.languageName(language) }
+                it.programmingLanguage { langBuilder ->
+                    langBuilder.languageName(language.toCodeWhispererRuntimeLanguage().languageId)
+                }
                 it.modificationPercentage(modificationPercentage)
             }
         }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererUnknownLanguage.kt

@@ -11,6 +11,8 @@ class CodeWhispererUnknownLanguage private constructor() : CodeWhispererProgramm
 
     override fun toTelemetryType(): CodewhispererLanguage = CodewhispererLanguage.Unknown
 
+    override fun toCodeWhispererRuntimeLanguage(): CodeWhispererProgrammingLanguage = CodeWhispererPlainText.INSTANCE
+
     companion object {
         const val ID = "unknown"
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt

@@ -13,7 +13,6 @@ import com.intellij.openapi.vfs.VirtualFile
 import kotlinx.coroutines.launch
 import org.apache.commons.collections4.queue.CircularFifoQueue
 import org.jetbrains.annotations.TestOnly
-import software.amazon.awssdk.services.codewhispererruntime.model.CodeAnalysisScope
 import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
@@ -370,12 +369,21 @@ class CodeWhispererTelemetryService {
         selectedIndex: Int,
         completionType: CodewhispererCompletionType
     ) {
-        val codewhispererLanguage = requestContext.fileContextInfo.programmingLanguage.toTelemetryType()
+        val codewhispererLanguage = requestContext.fileContextInfo.programmingLanguage
         CodeWhispererUserModificationTracker.getInstance(requestContext.project).enqueue(
             AcceptedSuggestionEntry(
-                time, vFile, range, suggestion, responseContext.sessionId, requestId, selectedIndex,
-                requestContext.triggerTypeInfo.triggerType, completionType,
-                codewhispererLanguage, null, null,
+                time,
+                vFile,
+                range,
+                suggestion,
+                responseContext.sessionId,
+                requestId,
+                selectedIndex,
+                requestContext.triggerTypeInfo.triggerType,
+                completionType,
+                codewhispererLanguage,
+                null,
+                null,
                 requestContext.connection
             )
         )

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererUserModificationTracker.kt

@@ -19,14 +19,16 @@ import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererUserGroupSettings
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getConnectionStartUrl
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.InsertedCodeModificationEntry
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
 import software.aws.toolkits.jetbrains.settings.AwsSettings
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.CodewhispererCompletionType
-import software.aws.toolkits.telemetry.CodewhispererLanguage
 import software.aws.toolkits.telemetry.CodewhispererRuntime
 import software.aws.toolkits.telemetry.CodewhispererTelemetry
 import software.aws.toolkits.telemetry.CodewhispererTriggerType
@@ -50,7 +52,7 @@ data class AcceptedSuggestionEntry(
     val index: Int,
     val triggerType: CodewhispererTriggerType,
     val completionType: CodewhispererCompletionType,
-    val codewhispererLanguage: CodewhispererLanguage,
+    val codewhispererLanguage: CodeWhispererProgrammingLanguage,
     val codewhispererRuntime: CodewhispererRuntime?,
     val codewhispererRuntimeSource: String?,
     val connection: ToolkitConnection?
@@ -183,7 +185,7 @@ class CodeWhispererUserModificationTracker(private val project: Project) : Dispo
         CodewhispererTelemetry.userModification(
             project = project,
             codewhispererCompletionType = suggestion.completionType,
-            codewhispererLanguage = suggestion.codewhispererLanguage,
+            codewhispererLanguage = suggestion.codewhispererLanguage.toTelemetryType(),
             codewhispererModificationPercentage = percentage,
             codewhispererRequestId = suggestion.requestId,
             codewhispererRuntime = suggestion.codewhispererRuntime,
@@ -203,7 +205,11 @@ class CodeWhispererUserModificationTracker(private val project: Project) : Dispo
             cwsprChatModificationPercentage = percentage,
             credentialStartUrl = getStartUrl(project)
         )
-        CodeWhispererClientAdaptor.getInstance(project).sendChatUserModificationTelemetry(insertedCode.conversationId, insertedCode.messageId, null, percentage)
+        val lang = insertedCode.vFile?.programmingLanguage() ?: CodeWhispererUnknownLanguage.INSTANCE
+
+        CodeWhispererClientAdaptor.getInstance(
+            project
+        ).sendChatUserModificationTelemetry(insertedCode.conversationId, insertedCode.messageId, lang, percentage)
     }
 
 // temp disable user modfication event for further discussion on metric calculation

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryTest.kt

@@ -57,6 +57,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.P
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.Resume
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.nodes.PauseCodeWhispererNode
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.nodes.ResumeCodeWhispererNode
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJava
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererPython
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
@@ -70,7 +71,6 @@ import software.aws.toolkits.jetbrains.services.telemetry.NoOpPublisher
 import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import software.aws.toolkits.jetbrains.settings.AwsSettings
 import software.aws.toolkits.telemetry.CodewhispererCompletionType
-import software.aws.toolkits.telemetry.CodewhispererLanguage
 import software.aws.toolkits.telemetry.CodewhispererRuntime
 import software.aws.toolkits.telemetry.CodewhispererSuggestionState
 import software.aws.toolkits.telemetry.CodewhispererTriggerType
@@ -144,7 +144,7 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() {
                 0,
                 CodewhispererTriggerType.OnDemand,
                 CodewhispererCompletionType.Line,
-                CodewhispererLanguage.Java,
+                CodeWhispererJava.INSTANCE,
                 CodewhispererRuntime.Java11,
                 "",
                 null