Merge master into feature/web

Author: aws-toolkit-automation

src/codewhisperer/commands/invokeRecommendation.ts

@@ -12,7 +12,6 @@ import { RecommendationHandler } from '../service/recommendationHandler'
 import { isInlineCompletionEnabled } from '../util/commonUtil'
 import { InlineCompletionService } from '../service/inlineCompletionService'
 import { AuthUtil } from '../util/authUtil'
-import { TelemetryHelper } from '../util/telemetryHelper'
 import { ClassifierTrigger } from '../service/classifierTrigger'
 import { isIamConnection } from '../../auth/connection'
 import { session } from '../util/codeWhispererSession'
@@ -100,7 +99,6 @@ export async function invokeRecommendation(
             RecommendationHandler.instance.isGenerateRecommendationInProgress = false
         }
     } else if (isInlineCompletionEnabled()) {
-        TelemetryHelper.instance.setInvokeSuggestionStartTime()
         ClassifierTrigger.instance.recordClassifierResultForManualTrigger(editor)
         await InlineCompletionService.instance.getPaginatedRecommendation(client, editor, 'OnDemand', config)
     }

src/codewhisperer/service/inlineCompletionItemProvider.ts

@@ -164,7 +164,6 @@ export class CWInlineCompletionItemProvider implements vscode.InlineCompletionIt
             ImportAdderProvider.instance.onShowRecommendation(document, this.startPos.line, r)
             this.nextMove = 0
             TelemetryHelper.instance.setFirstSuggestionShowTime()
-            TelemetryHelper.instance.tryRecordClientComponentLatency()
             this._onDidShow.fire()
             if (matchedCount >= 2 || this.nextToken !== '') {
                 const result = [item]

src/codewhisperer/service/inlineCompletionService.ts

@@ -94,7 +94,7 @@ export class InlineCompletionService {
 
         // Call report user decisions once to report recommendations leftover from last invocation.
         RecommendationHandler.instance.reportUserDecisions(-1)
-
+        TelemetryHelper.instance.setInvokeSuggestionStartTime()
         ClassifierTrigger.instance.recordClassifierResultForAutoTrigger(editor, autoTriggerType, event)
 
         const triggerChar = event?.contentChanges[0]?.text

src/codewhisperer/service/keyStrokeHandler.ts

@@ -14,7 +14,6 @@ import { CodewhispererAutomatedTriggerType } from '../../shared/telemetry/teleme
 import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
 import { isInlineCompletionEnabled } from '../util/commonUtil'
 import { InlineCompletionService } from './inlineCompletionService'
-import { TelemetryHelper } from '../util/telemetryHelper'
 import { AuthUtil } from '../util/authUtil'
 import { ClassifierTrigger } from './classifierTrigger'
 import { isIamConnection } from '../../auth/connection'
@@ -210,7 +209,6 @@ export class KeyStrokeHandler {
                 RecommendationHandler.instance.isGenerateRecommendationInProgress = false
             }
         } else if (isInlineCompletionEnabled()) {
-            TelemetryHelper.instance.setInvokeSuggestionStartTime()
             await InlineCompletionService.instance.getPaginatedRecommendation(
                 client,
                 editor,

src/codewhisperer/service/recommendationHandler.ts

@@ -439,6 +439,7 @@ export class RecommendationHandler {
      * Clear recommendation state
      */
     clearRecommendations() {
+        session.requestIdList = []
         session.recommendations = []
         session.suggestionStates = new Map<number, string>()
         session.completionTypes = new Map<number, CodewhispererCompletionType>()

src/test/codewhisperer/commands/onInlineAcceptance.test.ts

@@ -61,6 +61,7 @@ describe('onInlineAcceptance', function () {
             const testStartUrl = 'testStartUrl'
             sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
             const mockEditor = createMockTextEditor()
+            session.requestIdList = ['test']
             RecommendationHandler.instance.requestId = 'test'
             session.sessionId = 'test'
             session.startPos = new vscode.Position(1, 0)