Merge pull request #3792 from andrewyuq/master

Enable SendTelemetryEvent for all SSO users

Author: andrewyuq

src/codewhisperer/activation.ts

@@ -177,7 +177,6 @@ export async function activate(context: ExtContext): Promise<void> {
                 return
             }
             RecommendationHandler.instance.reportUserDecisionOfRecommendation(vscode.window.activeTextEditor, -1)
-            RecommendationHandler.instance.clearRecommendations()
         }),
 
         vscode.languages.registerHoverProvider(
@@ -251,13 +250,13 @@ export async function activate(context: ExtContext): Promise<void> {
          */
         context.extensionContext.subscriptions.push(
             vscode.window.onDidChangeActiveTextEditor(async editor => {
-                await InlineCompletionService.instance.onEditorChange()
+                await RecommendationHandler.instance.onEditorChange()
             }),
             vscode.window.onDidChangeWindowState(async e => {
-                await InlineCompletionService.instance.onFocusChange()
+                await RecommendationHandler.instance.onFocusChange()
             }),
             vscode.window.onDidChangeTextEditorSelection(async e => {
-                await InlineCompletionService.instance.onCursorChange(e)
+                await RecommendationHandler.instance.onCursorChange(e)
             }),
             vscode.workspace.onDidChangeTextDocument(async e => {
                 /**
@@ -266,6 +265,9 @@ export async function activate(context: ExtContext): Promise<void> {
                 if (e.document === vscode.window.activeTextEditor?.document) {
                     disposeSecurityDiagnostic(e)
                 }
+
+                CodeWhispererCodeCoverageTracker.getTracker(e.document.languageId)?.countTotalTokens(e)
+
                 /**
                  * Handle this keystroke event only when
                  * 1. It is in current non plaintext active editor
@@ -292,7 +294,7 @@ export async function activate(context: ExtContext): Promise<void> {
                      * Then this event can be processed by our code.
                      */
                     await sleep(CodeWhispererConstants.vsCodeCursorUpdateDelay)
-                    if (!InlineCompletionService.instance.isSuggestionVisible()) {
+                    if (!RecommendationHandler.instance.isSuggestionVisible()) {
                         await KeyStrokeHandler.instance.processKeyStroke(
                             e,
                             vscode.window.activeTextEditor,
@@ -387,13 +389,7 @@ export async function activate(context: ExtContext): Promise<void> {
 }
 
 export async function shutdown() {
-    if (isCloud9()) {
-        RecommendationHandler.instance.reportUserDecisionOfRecommendation(vscode.window.activeTextEditor, -1)
-        RecommendationHandler.instance.clearRecommendations()
-    }
-    if (isInlineCompletionEnabled()) {
-        await InlineCompletionService.instance.clearInlineCompletionStates(vscode.window.activeTextEditor)
-    }
+    RecommendationHandler.instance.reportUserDecisionOfRecommendation(vscode.window.activeTextEditor, -1)
     CodeWhispererTracker.getTracker().shutdown()
 }
 

src/codewhisperer/client/codewhisperer.ts

@@ -15,8 +15,10 @@ import { CodeWhispererSettings } from '../util/codewhispererSettings'
 import { PromiseResult } from 'aws-sdk/lib/request'
 import { Credentials } from 'aws-sdk'
 import { AuthUtil } from '../util/authUtil'
-import { TelemetryHelper } from '../util/telemetryHelper'
 import { isSsoConnection } from '../../auth/connection'
+import { session } from '../util/codeWhispererSession'
+import { SendTelemetryEventRequest } from './codewhispereruserclient'
+import { getLogger } from '../../shared/logger'
 
 export type ProgrammingLanguage = Readonly<
     CodeWhispererClient.ProgrammingLanguage | CodeWhispererUserClient.ProgrammingLanguage
@@ -103,9 +105,9 @@ export class DefaultCodeWhispererClient {
 
     async createUserSdkClient(): Promise<CodeWhispererUserClient> {
         const isOptedOut = CodeWhispererSettings.instance.isOptoutEnabled()
-        TelemetryHelper.instance.setFetchCredentialStartTime()
+        session.setFetchCredentialStart()
         const bearerToken = await AuthUtil.instance.getBearerToken()
-        TelemetryHelper.instance.setSdkApiCallStartTime()
+        session.setSdkApiCallStart()
         return (await globals.sdkClientBuilder.createAwsService(
             Service,
             {
@@ -189,6 +191,16 @@ export class DefaultCodeWhispererClient {
             .listCodeScanFindings(request as CodeWhispererClient.ListCodeScanFindingsRequest)
             .promise()
     }
+
+    public async sendTelemetryEvent(request: SendTelemetryEventRequest) {
+        if (!AuthUtil.instance.isValidEnterpriseSsoInUse()) {
+            return
+        }
+        const response = await (await this.createUserSdkClient()).sendTelemetryEvent(request).promise()
+        getLogger().debug(`codewhisperer: sendTelemetryEvent requestID: ${response.$response.requestId}`)
+    }
 }
 
+export const codeWhispererClient = new DefaultCodeWhispererClient()
+
 export class CognitoCredentialsError extends Error {}