telemetry change

Author: zixlin7

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

@@ -155,13 +155,12 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
         numSuggestionAddLines: Int?,
         numSuggestionDelChars: Int?,
         numSuggestionDelLines: Int?,
-        charactersAdded: Int?,
-        charactersRemoved: Int?,
+        programmingLanguage: String?,
     ) {
         CodeWhispererClientAdaptor.getInstance(project).sendInlineChatTelemetry(
             requestId, inputLength, numSelectedLines, codeIntent, userDecision,
             responseStartLatency, responseEndLatency, numSuggestionAddChars, numSuggestionAddLines, numSuggestionDelChars, numSuggestionDelLines,
-            charactersAdded, charactersRemoved
+            programmingLanguage
         )
     }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatController.kt

@@ -113,8 +113,7 @@ class InlineChatController(
         var numSuggestionAddLines: Int? = null,
         var numSuggestionDelChars: Int? = null,
         var numSuggestionDelLines: Int? = null,
-        var charactersAdded: Int? = null,
-        var charactersRemoved: Int? = null,
+        var programmingLanguage: String? = null,
     )
 
     private val popupSubmitHandler: suspend (String, String, Int, Editor) -> String = {
@@ -141,10 +140,6 @@ class InlineChatController(
     private fun recordInlineChatTelemetry(decision: InlineChatUserDecision) {
         if (metrics == null) return
         metrics?.userDecision = decision
-        if (decision == InlineChatUserDecision.ACCEPT) {
-            metrics?.charactersAdded = metrics?.numSuggestionAddChars
-            metrics?.charactersRemoved = metrics?.numSuggestionDelChars
-        }
         if (metrics?.requestId?.isNotEmpty() == true) {
             telemetryHelper.recordInlineChatTelemetry(
                 metrics?.requestId!!,
@@ -158,8 +153,7 @@ class InlineChatController(
                 metrics?.numSuggestionAddLines,
                 metrics?.numSuggestionDelChars,
                 metrics?.numSuggestionDelLines,
-                metrics?.charactersAdded,
-                metrics?.charactersRemoved
+                metrics?.programmingLanguage
             )
         }
         metrics = null
@@ -698,7 +692,8 @@ class InlineChatController(
         requestId?.let {
             metrics = InlineChatMetrics(
                 requestId = it, inputLength = message.length, numSelectedLines = selectedCode.split("\n").size,
-                codeIntent = true, responseStartLatency = firstResponseLatency, responseEndLatency = lastResponseLatency
+                codeIntent = true, responseStartLatency = firstResponseLatency, responseEndLatency = lastResponseLatency,
+                programmingLanguage = fileContext.fileContext?.fileLanguage
             )
         }
         if (finalMessage != null) {

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt

@@ -200,8 +200,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         numSuggestionAddLines: Int?,
         numSuggestionDelChars: Int?,
         numSuggestionDelLines: Int?,
-        charactersAdded: Int?,
-        charactersRemoved: Int?,
+        programmingLanguage: String?,
     ): SendTelemetryEventResponse
 
     companion object {
@@ -617,8 +616,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         numSuggestionAddLines: Int?,
         numSuggestionDelChars: Int?,
         numSuggestionDelLines: Int?,
-        charactersAdded: Int?,
-        charactersRemoved: Int?,
+        programmingLanguage: String?,
     ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder ->
         requestBuilder.telemetryEvent { telemetryEventBuilder ->
             telemetryEventBuilder.inlineChatEvent {
@@ -633,8 +631,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 it.numSuggestionAddLines(numSuggestionAddLines)
                 it.numSuggestionDelChars(numSuggestionDelChars)
                 it.numSuggestionDelLines(numSuggestionDelLines)
-                it.charactersRemoved(charactersRemoved)
-                it.charactersAdded(charactersAdded)
+                if (programmingLanguage != null) it.programmingLanguage { langBuilder -> langBuilder.languageName(programmingLanguage) }
                 it.timestamp(Instant.now())
             }
         }

plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json

@@ -1113,8 +1113,7 @@
                 "userDecision": { "shape": "InlineChatUserDecision" },
                 "responseStartLatency": { "shape": "Double" },
                 "responseEndLatency": { "shape": "Double" },
-                "charactersRemoved": { "shape": "PrimitiveInteger" },
-                "charactersAdded": { "shape": "PrimitiveInteger"}
+                "programmingLanguage": { "shape": "ProgrammingLanguage" }
             }
         },
         "InlineChatUserDecision": {