Merge #2734 fix(codewhisperer): telemetry

Author: justinmk3

src/codewhisperer/commands/invokeRecommendation.ts

@@ -54,6 +54,7 @@ export async function invokeRecommendation(
             vsCodeState.isIntelliSenseActive = false
             RecommendationHandler.instance.isGenerateRecommendationInProgress = true
             try {
+                RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
                 RecommendationHandler.instance.clearRecommendations()
                 await RecommendationHandler.instance.getRecommendations(
                     client,

src/codewhisperer/service/inlineCompletion.ts

@@ -322,6 +322,7 @@ export class InlineCompletion {
         config: ConfigurationEntry,
         autoTriggerType?: telemetry.CodewhispererAutomatedTriggerType
     ) {
+        RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
         RecommendationHandler.instance.clearRecommendations()
         this.setCodeWhispererStatusBarLoading()
         const isManualTrigger = triggerType === 'OnDemand'
@@ -347,6 +348,7 @@ export class InlineCompletion {
                 )
                 this.setCompletionItems(editor)
                 if (RecommendationHandler.instance.checkAndResetCancellationTokens()) {
+                    RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
                     RecommendationHandler.instance.clearRecommendations()
                     break
                 }

src/codewhisperer/service/keyStrokeHandler.ts

@@ -178,6 +178,7 @@ export class KeyStrokeHandler {
                 vsCodeState.isIntelliSenseActive = false
                 RecommendationHandler.instance.isGenerateRecommendationInProgress = true
                 try {
+                    RecommendationHandler.instance.reportUserDecisionOfCurrentRecommendation(editor, -1)
                     RecommendationHandler.instance.clearRecommendations()
                     await RecommendationHandler.instance.getRecommendations(
                         client,

src/codewhisperer/service/recommendationHandler.ts

@@ -121,6 +121,7 @@ export class RecommendationHandler {
         let nextToken = ''
         let errorCode = ''
         let req: codewhispererClient.ListRecommendationsRequest | codewhispererClient.GenerateRecommendationsRequest
+        let shouldRecordServiceInvocation = false
 
         if (pagination) {
             req = EditorContext.buildListRecommendationRequest(editor as vscode.TextEditor, this.nextToken)
@@ -141,6 +142,7 @@ export class RecommendationHandler {
                 const codewhispererPromise = pagination
                     ? client.listRecommendations(req)
                     : client.generateRecommendations(req)
+                shouldRecordServiceInvocation = true
                 const resp = await this.getServerResponse(
                     triggerType,
                     config.isManualTriggerEnabled,
@@ -217,24 +219,25 @@ export class RecommendationHandler {
             recommendation.forEach((item, index) => {
                 getLogger().verbose(`[${index}]\n${item.content.trimRight()}`)
             })
-
-            telemetry.recordCodewhispererServiceInvocation({
-                codewhispererRequestId: requestId ? requestId : undefined,
-                codewhispererSessionId: sessionId ? sessionId : undefined,
-                codewhispererLastSuggestionIndex: this.recommendations.length - 1,
-                codewhispererTriggerType: triggerType,
-                codewhispererAutomatedTriggerType: autoTriggerType,
-                codewhispererCompletionType:
-                    invocationResult == 'Succeeded' ? TelemetryHelper.instance.completionType : undefined,
-                result: invocationResult,
-                duration: latency ? latency : 0,
-                codewhispererLineNumber: this.startPos.line ? this.startPos.line : 0,
-                codewhispererCursorOffset: TelemetryHelper.instance.cursorOffset
-                    ? TelemetryHelper.instance.cursorOffset
-                    : 0,
-                codewhispererLanguage: languageContext.language,
-                reason: reason ? reason.substring(0, 200) : undefined,
-            })
+            if (shouldRecordServiceInvocation) {
+                telemetry.recordCodewhispererServiceInvocation({
+                    codewhispererRequestId: requestId ? requestId : undefined,
+                    codewhispererSessionId: sessionId ? sessionId : undefined,
+                    codewhispererLastSuggestionIndex: this.recommendations.length - 1,
+                    codewhispererTriggerType: triggerType,
+                    codewhispererAutomatedTriggerType: autoTriggerType,
+                    codewhispererCompletionType:
+                        invocationResult == 'Succeeded' ? TelemetryHelper.instance.completionType : undefined,
+                    result: invocationResult,
+                    duration: latency ? latency : 0,
+                    codewhispererLineNumber: this.startPos.line ? this.startPos.line : 0,
+                    codewhispererCursorOffset: TelemetryHelper.instance.cursorOffset
+                        ? TelemetryHelper.instance.cursorOffset
+                        : 0,
+                    codewhispererLanguage: languageContext.language,
+                    reason: reason ? reason.substring(0, 200) : undefined,
+                })
+            }
             recommendation = recommendation.filter(r => r.content.length > 0)
 
             if (config.isIncludeSuggestionsWithCodeReferencesEnabled === false) {