changeCodePercentage

Author: zixlin7

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

@@ -49,7 +49,7 @@ abstract class CodeWhispererCodeCoverageTracker(
     private val myServiceInvocationCount: AtomicInteger
 ) : Disposable {
     val percentage: Long?
-        get() = if (totalTokensSize != 0L) calculatePercentage(acceptedTokensSize, totalTokensSize) else null
+        get() = if (totalTokensSize != 0L) calculatePercentage(rawAcceptedTokenSize, totalTokensSize) else null
     val acceptedTokensSize: Long
         get() = fileToTokens.map {
             it.value.acceptedTokens.get()
@@ -62,6 +62,12 @@ abstract class CodeWhispererCodeCoverageTracker(
         }.fold(0) { acc, next ->
             acc + next
         }
+    val rawAcceptedTokenSize: Long
+        get() = fileToTokens.map {
+            it.value.rawAcceptedTokens.get()
+        }.fold(0) { acc, next ->
+            acc + next
+        }
     val acceptedRecommendationsCount: Int
         get() = rangeMarkers.size
     val serviceInvocationCount: Int
@@ -177,6 +183,15 @@ abstract class CodeWhispererCodeCoverageTracker(
         tokens.acceptedTokens.addAndGet(delta)
     }
 
+    private fun incrementRawAcceptedTokens(document: Document, delta: Int) {
+        var tokens = fileToTokens[document]
+        if (tokens == null) {
+            tokens = CodeCoverageTokens()
+            fileToTokens[document] = tokens
+        }
+        tokens.rawAcceptedTokens.addAndGet(delta)
+    }
+
     private fun incrementTotalTokens(document: Document, delta: Int) {
         var tokens = fileToTokens[document]
         if (tokens == null) {
@@ -201,8 +216,6 @@ abstract class CodeWhispererCodeCoverageTracker(
         if (percentage == null) return
         if (myServiceInvocationCount.get() <= 0) return
 
-        // accepted char count without considering modification
-        var rawAcceptedCharacterCount = 0L
         rangeMarkers.forEach { rangeMarker ->
             if (!rangeMarker.isValid) return@forEach
             // if users add more code upon the recommendation generated from CodeWhisperer, we consider those added part as userToken but not CwsprTokens
@@ -216,9 +229,9 @@ abstract class CodeWhispererCodeCoverageTracker(
                 }
                 return@forEach
             }
-            rawAcceptedCharacterCount += originalRecommendation.length
             val delta = getAcceptedTokensDelta(originalRecommendation, modifiedRecommendation)
             runReadAction {
+                incrementRawAcceptedTokens(rangeMarker.document, originalRecommendation.length)
                 incrementAcceptedTokens(rangeMarker.document, delta)
             }
         }
@@ -230,7 +243,7 @@ abstract class CodeWhispererCodeCoverageTracker(
                 val response = CodeWhispererClientAdaptor.getInstance(project).sendCodePercentageTelemetry(
                     language,
                     customizationArn,
-                    rawAcceptedCharacterCount,
+                    rawAcceptedTokenSize,
                     totalTokensSize,
                     acceptedTokensSize
                 )
@@ -248,7 +261,7 @@ abstract class CodeWhispererCodeCoverageTracker(
             CodewhispererTelemetry.codePercentage(
                 project = null,
                 codewhispererAcceptedTokens = acceptedTokensSize,
-                codewhispererSuggestedTokens = rawAcceptedCharacterCount,
+                codewhispererSuggestedTokens = rawAcceptedTokenSize,
                 codewhispererLanguage = language.toTelemetryType(),
                 codewhispererPercentage = percentage,
                 codewhispererTotalTokens = totalTokensSize,
@@ -282,7 +295,7 @@ abstract class CodeWhispererCodeCoverageTracker(
         private val LOG = getLogger<CodeWhispererCodeCoverageTracker>()
         private val instances: MutableMap<CodeWhispererProgrammingLanguage, CodeWhispererCodeCoverageTracker> = mutableMapOf()
 
-        fun calculatePercentage(acceptedTokens: Long, totalTokens: Long): Long = ((acceptedTokens.toDouble() * 100) / totalTokens).roundToLong()
+        fun calculatePercentage(rawAcceptedTokenSize: Long, totalTokens: Long): Long = ((rawAcceptedTokenSize.toDouble() * 100) / totalTokens).roundToLong()
         fun getInstance(project: Project, language: CodeWhispererProgrammingLanguage): CodeWhispererCodeCoverageTracker =
             when (val instance = instances[language]) {
                 null -> {
@@ -310,12 +323,14 @@ class DefaultCodeWhispererCodeCoverageTracker(project: Project, language: CodeWh
     AtomicInteger(0)
 )
 
-class CodeCoverageTokens(totalTokens: Int = 0, acceptedTokens: Int = 0) {
+class CodeCoverageTokens(totalTokens: Int = 0, acceptedTokens: Int = 0, rawAcceptedTokens: Int = 0) {
     val totalTokens: AtomicInteger
     val acceptedTokens: AtomicInteger
+    val rawAcceptedTokens: AtomicInteger
 
     init {
         this.totalTokens = AtomicInteger(totalTokens)
         this.acceptedTokens = AtomicInteger(acceptedTokens)
+        this.rawAcceptedTokens = AtomicInteger(rawAcceptedTokens)
     }
 }

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

@@ -141,6 +141,7 @@ internal abstract class CodeWhispererCodeCoverageTrackerTestBase(myProjectRule:
         const val CWSPR_Language = "codewhispererLanguage"
         const val CWSPR_ACCEPTED_TOKENS = "codewhispererAcceptedTokens"
         const val CWSPR_TOTAL_TOKENS = "codewhispererTotalTokens"
+        const val CWSPR_RAW_ACCEPTED_TOKENS = "codewhispererSuggestedTokens"
     }
 }
 
@@ -429,7 +430,7 @@ internal class CodeWhispererCodeCoverageTrackerTestPython : CodeWhispererCodeCov
                 TOTAL_SECONDS_IN_MINUTE,
                 CodeWhispererPython.INSTANCE,
                 mutableListOf(rangeMarkerMock1),
-                mutableMapOf(fixture.editor.document to CodeCoverageTokens(totalTokens = 100, acceptedTokens = 0)),
+                mutableMapOf(fixture.editor.document to CodeCoverageTokens(totalTokens = 100, acceptedTokens = 0, rawAcceptedTokens = 0)),
                 1
             )
         ) {
@@ -444,8 +445,9 @@ internal class CodeWhispererCodeCoverageTrackerTestPython : CodeWhispererCodeCov
             metricCaptor.allValues,
             CODE_PERCENTAGE,
             1,
-            CWSPR_PERCENTAGE to "1",
+            CWSPR_PERCENTAGE to "3",
             CWSPR_ACCEPTED_TOKENS to "1",
+            CWSPR_RAW_ACCEPTED_TOKENS to "3",
             CWSPR_TOTAL_TOKENS to "100",
         )
     }

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

@@ -514,7 +514,7 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() {
             "codewhispererAcceptedTokens" to acceptedTokensSize.toString(),
             "codewhispererTotalTokens" to totalTokensSize.toString(),
             "codewhispererSuggestedTokens" to rawAcceptedTokenSize.toString(),
-            "codewhispererPercentage" to CodeWhispererCodeCoverageTracker.calculatePercentage(acceptedTokensSize, totalTokensSize).toString(),
+            "codewhispererPercentage" to CodeWhispererCodeCoverageTracker.calculatePercentage(rawAcceptedTokenSize, totalTokensSize).toString(),
         )
     }