fix perceivedLatency being calculated incorrectly

1. perceivedLatency was previously calculated at
the time of sending STE, but the timeOfLastCharTyped value
is no longer accurate, so calculate the perceivedLatency value
at suggestion showing time to get the most accurate timeOfLastCharTyped

Author: andrewyuq

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

@@ -316,9 +316,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                     it.sessionId(responseContext.sessionId)
                     it.recommendationLatencyMilliseconds(e2eLatency)
                     it.triggerToResponseLatencyMilliseconds(requestContext.latencyContext.paginationFirstCompletionTime)
-                    it.perceivedLatencyMilliseconds(
-                        requestContext.latencyContext.getPerceivedLatency(requestContext.triggerTypeInfo.triggerType)
-                    )
+                    it.perceivedLatencyMilliseconds(requestContext.latencyContext.perceivedLatency)
                     it.suggestionState(suggestionState.toCodeWhispererSdkType())
                     it.timestamp(Instant.now())
                     it.suggestionReferenceCount(suggestionReferenceCount)
@@ -364,6 +362,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                     it.sessionId(responseContext.sessionId)
                     it.recommendationLatencyMilliseconds(e2eLatency)
                     it.triggerToResponseLatencyMilliseconds(sessionContext.latencyContext.paginationFirstCompletionTime)
+                    it.perceivedLatencyMilliseconds(sessionContext.latencyContext.perceivedLatency)
                     it.suggestionState(suggestionState.toCodeWhispererSdkType())
                     it.timestamp(Instant.now())
                     it.suggestionReferenceCount(suggestionReferenceCount)

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt

@@ -155,7 +155,6 @@ data class SessionContextNew(
     var popup: JBPopup? = null,
     var selectedIndex: Int = -1,
     val seen: MutableSet<Int> = mutableSetOf(),
-    var isFirstTimeShowingPopup: Boolean = true,
     var toBeRemovedHighlighter: RangeHighlighter? = null,
     var insertEndOffset: Int = -1,
     var popupOffset: Int = -1,
@@ -278,6 +277,7 @@ data class LatencyContext(
     var codewhispererPreprocessingEnd: Long = 0L,
 
     var paginationFirstCompletionTime: Double = 0.0,
+    var perceivedLatency: Double = 0.0,
 
     var codewhispererPostprocessingStart: Long = 0L,
     var codewhispererPostprocessingEnd: Long = 0L,
@@ -316,10 +316,9 @@ data class LatencyContext(
         if (triggerType == CodewhispererTriggerType.OnDemand) {
             getCodeWhispererEndToEndLatency()
         } else {
-            (
-                TimeUnit.NANOSECONDS.toMillis(codewhispererEndToEndEnd) -
-                    CodeWhispererAutoTriggerService.getInstance().timeAtLastCharTyped.toEpochMilli()
-                ).toDouble()
+            TimeUnit.NANOSECONDS.toMillis(
+                codewhispererEndToEndEnd - CodeWhispererAutoTriggerService.getInstance().timeAtLastCharTyped
+            ).toDouble()
         }
 }
 

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt

@@ -235,12 +235,14 @@ class CodeWhispererPopupManager {
         // emit any events.
         // 4. User navigating through the completions or typing as the completion shows. We should not update the latency
         // end time and should not emit any events in this case.
+        if (!CodeWhispererInvocationStatus.getInstance().isPopupActive()) {
+            states.requestContext.latencyContext.codewhispererPostprocessingEnd = System.nanoTime()
+            states.requestContext.latencyContext.codewhispererEndToEndEnd = System.nanoTime()
+            states.requestContext.latencyContext.perceivedLatency =
+                states.requestContext.latencyContext.getPerceivedLatency(states.requestContext.triggerTypeInfo.triggerType)
+        }
         if (!isRecommendationAdded) {
             showPopup(states, sessionContext, states.popup, caretPoint, overlappingLinesCount)
-            if (!isScrolling) {
-                states.requestContext.latencyContext.codewhispererPostprocessingEnd = System.nanoTime()
-                states.requestContext.latencyContext.codewhispererEndToEndEnd = System.nanoTime()
-            }
         }
         if (isScrolling ||
             CodeWhispererInvocationStatus.getInstance().hasExistingServiceInvocation() ||

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManagerNew.kt

@@ -122,7 +122,6 @@ class CodeWhispererPopupManagerNew {
         val selectedIndex = findNewSelectedIndex(isReverse, sessionContext.selectedIndex + indexChange)
 
         sessionContext.selectedIndex = selectedIndex
-        sessionContext.isFirstTimeShowingPopup = false
 
         ApplicationManager.getApplication().messageBus.syncPublisher(CODEWHISPERER_POPUP_STATE_CHANGED).stateChanged(
             sessionContext
@@ -137,7 +136,6 @@ class CodeWhispererPopupManagerNew {
     ) {
         if (!updateTypeahead(typeaheadChange, typeaheadAdded)) return
         if (!updateSessionSelectedIndex(sessionContext)) return
-        sessionContext.isFirstTimeShowingPopup = false
 
         ApplicationManager.getApplication().messageBus.syncPublisher(CODEWHISPERER_POPUP_STATE_CHANGED).stateChanged(
             sessionContext
@@ -146,7 +144,6 @@ class CodeWhispererPopupManagerNew {
 
     @RequiresEdt
     fun changeStatesForShowing(sessionContext: SessionContextNew, states: InvocationContextNew, recommendationAdded: Boolean = false) {
-        sessionContext.isFirstTimeShowingPopup = !recommendationAdded
         if (recommendationAdded) {
             ApplicationManager.getApplication().messageBus.syncPublisher(CODEWHISPERER_POPUP_STATE_CHANGED)
                 .recommendationAdded(states, sessionContext)
@@ -210,7 +207,7 @@ class CodeWhispererPopupManagerNew {
         updateCodeReferencePanel(sessionContext.project, previews[selectedIndex].detail.recommendation.references())
     }
 
-    fun render(sessionContext: SessionContextNew, isRecommendationAdded: Boolean, isScrolling: Boolean) {
+    fun render(sessionContext: SessionContextNew, isRecommendationAdded: Boolean) {
         updatePopupPanel(sessionContext)
 
         // There are four cases that render() is called:
@@ -222,11 +219,16 @@ class CodeWhispererPopupManagerNew {
         // emit any events.
         // 4. User navigating through the completions or typing as the completion shows. We should not update the latency
         // end time and should not emit any events in this case.
+        if (!CodeWhispererInvocationStatusNew.getInstance().isDisplaySessionActive()) {
+            sessionContext.latencyContext.codewhispererPostprocessingEnd = System.nanoTime()
+            sessionContext.latencyContext.codewhispererEndToEndEnd = System.nanoTime()
+            val triggerTypeOfLastTrigger = CodeWhispererServiceNew.getInstance().getAllPaginationSessions()
+                .values.filterNotNull().last().requestContext.triggerTypeInfo.triggerType
+            sessionContext.latencyContext.perceivedLatency =
+                sessionContext.latencyContext.getPerceivedLatency(triggerTypeOfLastTrigger)
+        }
         if (isRecommendationAdded) return
         showPopup(sessionContext)
-        if (isScrolling) return
-        sessionContext.latencyContext.codewhispererPostprocessingEnd = System.nanoTime()
-        sessionContext.latencyContext.codewhispererEndToEndEnd = System.nanoTime()
     }
 
     fun dontClosePopupAndRun(runnable: () -> Unit) {

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererUIChangeListenerNew.kt

@@ -94,18 +94,15 @@ class CodeWhispererUIChangeListenerNew : CodeWhispererPopupStateChangeListener {
         CodeWhispererInlayManagerNew.getInstance().updateInlays(sessionContext, inlayChunks)
         CodeWhispererPopupManagerNew.getInstance().render(
             sessionContext,
-            isRecommendationAdded = false,
-            isScrolling = false
+            isRecommendationAdded = false
         )
     }
 
     override fun scrolled(sessionContext: SessionContextNew) {
-        sessionContext.isFirstTimeShowingPopup = false
-        CodeWhispererPopupManagerNew.getInstance().render(sessionContext, isRecommendationAdded = false, isScrolling = true)
+        CodeWhispererPopupManagerNew.getInstance().render(sessionContext, isRecommendationAdded = false)
     }
 
     override fun recommendationAdded(states: InvocationContextNew, sessionContext: SessionContextNew) {
-        sessionContext.isFirstTimeShowingPopup = false
-        CodeWhispererPopupManagerNew.getInstance().render(sessionContext, isRecommendationAdded = true, isScrolling = false)
+        CodeWhispererPopupManagerNew.getInstance().render(sessionContext, isRecommendationAdded = true)
     }
 }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutoTriggerService.kt

@@ -40,7 +40,7 @@ class CodeWhispererAutoTriggerService : CodeWhispererAutoTriggerHandler, Disposa
 
     private var lastInvocationTime: Instant? = null
     private var lastInvocationLineNum: Int? = null
-    var timeAtLastCharTyped: Instant = Instant.now()
+    var timeAtLastCharTyped: Long = System.nanoTime()
         private set
 
     init {
@@ -54,7 +54,7 @@ class CodeWhispererAutoTriggerService : CodeWhispererAutoTriggerHandler, Disposa
     // a util wrapper
     fun tryInvokeAutoTrigger(editor: Editor, triggerType: CodeWhispererAutomatedTriggerType): Job? {
         // only needed for Classifier group, thus calculate it lazily
-        timeAtLastCharTyped = Instant.now()
+        timeAtLastCharTyped = System.nanoTime()
         val classifierResult: ClassifierResult by lazy { shouldTriggerClassifier(editor, triggerType.telemetryType) }
 
         // we need classifier result for any type of triggering for classifier group for supported languages