telemetry(amazonq): add raw accepted token count to code percentage e… (#4808)

* telemetry(amazonq): add raw accepted token count to code percentage event

* use .first() instead

Author: zixlin7

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererCodeCoverageTracker.kt

@@ -249,6 +249,7 @@ abstract class CodeWhispererCodeCoverageTracker(
             CodewhispererTelemetry.codePercentage(
                 project = null,
                 codewhispererAcceptedTokens = acceptedTokensSize,
+                codewhispererSuggestedTokens = rawAcceptedCharacterCount,
                 codewhispererLanguage = language.toTelemetryType(),
                 codewhispererPercentage = percentage,
                 codewhispererTotalTokens = totalTokensSize,

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryTest.kt

@@ -531,8 +531,9 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() {
 
         CodeWhispererCodeCoverageTracker.getInstance(project, CodeWhispererPython.INSTANCE).dispose()
 
-        val acceptedTokensSize = pythonResponse.completions()[0].content().length - deletedTokenByUser
-        val totalTokensSize = keystrokeInput.length + pythonResponse.completions()[0].content().length
+        val rawAcceptedTokenSize = pythonResponse.completions().first().content().length
+        val acceptedTokensSize = rawAcceptedTokenSize - deletedTokenByUser
+        val totalTokensSize = keystrokeInput.length + rawAcceptedTokenSize
 
         val metricCaptor = argumentCaptor<MetricEvent>()
         verify(batcher, atLeastOnce()).enqueue(metricCaptor.capture())
@@ -542,6 +543,7 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() {
             1,
             "codewhispererAcceptedTokens" to acceptedTokensSize.toString(),
             "codewhispererTotalTokens" to totalTokensSize.toString(),
+            "codewhispererSuggestedTokens" to rawAcceptedTokenSize.toString(),
             "codewhispererPercentage" to CodeWhispererCodeCoverageTracker.calculatePercentage(acceptedTokensSize, totalTokensSize).toString(),
             "codewhispererUserGroup" to userGroup.name,
         )
@@ -578,18 +580,19 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() {
             CodeWhispererCodeCoverageTracker.getInstance(project, CodeWhispererPython.INSTANCE).dispose()
         }
 
-        val acceptedTokensSize = pythonResponse.completions()[0].content().length
-        val totalTokensSize = keystrokeInput.length + pythonResponse.completions()[0].content().length + 1
+        val rawAcceptedTokenSize = pythonResponse.completions().first().content().length
+        val totalTokensSize = keystrokeInput.length + rawAcceptedTokenSize + 1
 
         val metricCaptor = argumentCaptor<MetricEvent>()
         verify(batcher, atLeastOnce()).enqueue(metricCaptor.capture())
         assertEventsContainsFieldsAndCount(
             metricCaptor.allValues,
             codePercentage,
             1,
-            "codewhispererAcceptedTokens" to acceptedTokensSize.toString(),
+            "codewhispererAcceptedTokens" to rawAcceptedTokenSize.toString(),
+            "codewhispererSuggestedTokens" to rawAcceptedTokenSize.toString(),
             "codewhispererTotalTokens" to totalTokensSize.toString(),
-            "codewhispererPercentage" to CodeWhispererCodeCoverageTracker.calculatePercentage(acceptedTokensSize, totalTokensSize).toString(),
+            "codewhispererPercentage" to CodeWhispererCodeCoverageTracker.calculatePercentage(rawAcceptedTokenSize, totalTokensSize).toString(),
             "codewhispererUserGroup" to userGroup.name,
         )
     }
@@ -631,12 +634,14 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() {
 
         val metricCaptor = argumentCaptor<MetricEvent>()
         verify(batcher, atLeastOnce()).enqueue(metricCaptor.capture())
+        val rawAcceptedTokenCount = pythonResponse.completions().first().content().length
         assertEventsContainsFieldsAndCount(
             metricCaptor.allValues,
             codePercentage,
             1,
-            "codewhispererAcceptedTokens" to pythonResponse.completions()[0].content().length.toString(),
-            "codewhispererTotalTokens" to (1 + pythonResponse.completions()[0].content().length).toString(),
+            "codewhispererAcceptedTokens" to rawAcceptedTokenCount.toString(),
+            "codewhispererSuggestedTokens" to rawAcceptedTokenCount.toString(),
+            "codewhispererTotalTokens" to (1 + rawAcceptedTokenCount).toString(),
             "codewhispererPercentage" to "96",
             "codewhispererUserGroup" to userGroup.name,
         )
@@ -676,7 +681,8 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() {
         }
         CodeWhispererCodeCoverageTracker.getInstance(project, CodeWhispererPython.INSTANCE).dispose()
 
-        val acceptedTokensSize = "x, y):\n    return x + y".length
+        val rawAcceptedTokenSize = "x, y):\n    return x + y".length
+        val acceptedTokensSize = rawAcceptedTokenSize
         val totalTokensSize = "()".length + acceptedTokensSize
         val metricCaptor = argumentCaptor<MetricEvent>()
         verify(batcher, atLeastOnce()).enqueue(metricCaptor.capture())
@@ -685,6 +691,7 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() {
             codePercentage,
             1,
             "codewhispererAcceptedTokens" to acceptedTokensSize.toString(),
+            "codewhispererSuggestedTokens" to rawAcceptedTokenSize.toString(),
             "codewhispererTotalTokens" to totalTokensSize.toString(),
             "codewhispererPercentage" to CodeWhispererCodeCoverageTracker.calculatePercentage(acceptedTokensSize, totalTokensSize).toString(),
             "codewhispererUserGroup" to userGroup.name,