Add accetpedCharCount into UserTriggerDecision STE (aws#5008)

* Add accetpedCharCount into UserTriggerDecision STE

* detekt

* test fix

Author: andrewyuq

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

@@ -96,6 +96,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         suggestionReferenceCount: Int,
         lineCount: Int,
         numberOfRecommendations: Int,
+        acceptedCharCount: Int,
     ): SendTelemetryEventResponse
 
     fun sendUserTriggerDecisionTelemetry(
@@ -107,6 +108,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         suggestionReferenceCount: Int,
         lineCount: Int,
         numberOfRecommendations: Int,
+        acceptedCharCount: Int,
     ): SendTelemetryEventResponse
 
     fun sendCodePercentageTelemetry(
@@ -291,6 +293,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         suggestionReferenceCount: Int,
         lineCount: Int,
         numberOfRecommendations: Int,
+        acceptedCharCount: Int,
     ): SendTelemetryEventResponse {
         val fileContext = requestContext.fileContextInfo
         val programmingLanguage = fileContext.programmingLanguage
@@ -322,6 +325,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                     it.generatedLine(lineCount)
                     it.customizationArn(requestContext.customizationArn)
                     it.numberOfRecommendations(numberOfRecommendations)
+                    it.acceptedCharacterCount(acceptedCharCount)
                 }
             }
             requestBuilder.optOutPreference(getTelemetryOptOutPreference())
@@ -338,6 +342,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         suggestionReferenceCount: Int,
         lineCount: Int,
         numberOfRecommendations: Int,
+        acceptedCharCount: Int,
     ): SendTelemetryEventResponse {
         val fileContext = requestContext.fileContextInfo
         val programmingLanguage = fileContext.programmingLanguage
@@ -365,6 +370,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                     it.generatedLine(lineCount)
                     it.customizationArn(requestContext.customizationArn)
                     it.numberOfRecommendations(numberOfRecommendations)
+                    it.acceptedCharacterCount(acceptedCharCount)
                 }
             }
             requestBuilder.optOutPreference(getTelemetryOptOutPreference())

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

@@ -228,7 +228,8 @@ class CodeWhispererTelemetryService {
                             suggestionState,
                             suggestionReferenceCount,
                             generatedLineCount,
-                            recommendationContext.details.size
+                            recommendationContext.details.size,
+                            acceptedCharCount
                         )
                     LOG.debug {
                         "Successfully sent user trigger decision telemetry. RequestId: ${response.responseMetadata().requestId()}"

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

@@ -230,7 +230,8 @@ class CodeWhispererTelemetryServiceNew {
                             suggestionState,
                             suggestionReferenceCount,
                             generatedLineCount,
-                            recommendationContext.details.size
+                            recommendationContext.details.size,
+                            acceptedCharCount
                         )
                     LOG.debug {
                         "Successfully sent user trigger decision telemetry. RequestId: ${response.responseMetadata().requestId()}"

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

@@ -262,7 +262,8 @@ class CodeWhispererClientAdaptorTest {
             CodewhispererSuggestionState.Accept,
             3,
             1,
-            2
+            2,
+            10
         )
 
         argumentCaptor<SendTelemetryEventRequest>().apply {
@@ -275,6 +276,7 @@ class CodeWhispererClientAdaptorTest {
                 assertThat(it.generatedLine()).isEqualTo(1)
                 assertThat(it.recommendationLatencyMilliseconds()).isEqualTo(20.0)
                 assertThat(it.numberOfRecommendations()).isEqualTo(2)
+                assertThat(it.acceptedCharacterCount()).isEqualTo(10)
             }
         }
     }
@@ -380,7 +382,8 @@ class CodeWhispererClientAdaptorTest {
                 aSuggestionState(),
                 0,
                 1,
-                2
+                2,
+                10
             )
         }
     }

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

@@ -86,7 +86,7 @@ class CodeWhispererTelemetryServiceTest {
         mockClient = spy(CodeWhispererClientAdaptor.getInstance(projectRule.project))
         mockClient.stub {
             onGeneric {
-                sendUserTriggerDecisionTelemetry(any(), any(), any(), any(), any(), any(), any())
+                sendUserTriggerDecisionTelemetry(any(), any(), any(), any(), any(), any(), any(), any())
             }.doAnswer {
                 mock<SendTelemetryEventResponse>()
             }
@@ -468,6 +468,7 @@ class CodeWhispererTelemetryServiceTest {
                 eq(expectedSuggestionReferenceCount),
                 eq(expectedGeneratedLineCount),
                 eq(expectedRecommendationContext.details.size),
+                eq(expectedCharCount)
             )
         } else {
             verifyNoInteractions(mockClient)