fix(codewhisperer): remove hardcoded telemetry metric #4098

Author: ctlai95

src/codewhisperer/commands/startSecurityScan.ts

@@ -183,7 +183,7 @@ export async function startSecurityScan(
         codeScanTelemetryEntry.codewhispererCodeScanTotalIssues = total
         codeScanTelemetryEntry.codewhispererCodeScanIssuesWithFixes = withFixes
         throwIfCancelled()
-        getLogger().verbose(`Security scan totally found ${total} issues.`)
+        getLogger().verbose(`Security scan totally found ${total} issues. ${withFixes} of them have fixes.`)
         if (isCloud9()) {
             securityPanelViewProvider.addLines(securityRecommendationCollection, editor)
             vscode.commands.executeCommand('workbench.view.extension.aws-codewhisperer-security-panel')
@@ -235,8 +235,7 @@ export async function emitCodeScanTelemetry(editor: vscode.TextEditor, codeScanT
         )
         codeScanTelemetryEntry.codewhispererCodeScanProjectBytes = projectSize
     }
-    // TODO: should be removed. Added this to pass tests
-    telemetry.codewhisperer_securityScan.emit({ ...codeScanTelemetryEntry, codewhispererCodeScanIssuesWithFixes: 1 })
+    telemetry.codewhisperer_securityScan.emit(codeScanTelemetryEntry)
 }
 
 export function errorPromptHelper(error: Error) {

src/test/codewhisperer/commands/startSecurityScan.test.ts

@@ -14,7 +14,7 @@ import { FakeExtensionContext } from '../../fakeExtensionContext'
 import * as diagnosticsProvider from '../../../codewhisperer/service/diagnosticsProvider'
 import { getTestWorkspaceFolder } from '../../../testInteg/integrationTestsUtilities'
 import { join } from 'path'
-import { closeAllEditors } from '../../testUtil'
+import { assertTelemetry, closeAllEditors } from '../../testUtil'
 import { stub } from '../../utilities/stubber'
 import { HttpResponse } from 'aws-sdk'
 import { getTestWindow } from '../../shared/vscode/window'
@@ -27,6 +27,7 @@ import {
     stopScanMessage,
 } from '../../../codewhisperer/models/constants'
 import * as model from '../../../codewhisperer/models/model'
+import { CodewhispererSecurityScan } from '../../../shared/telemetry/telemetry.gen'
 
 const mockCreateCodeScanResponse = {
     $response: {
@@ -265,5 +266,11 @@ describe('startSecurityScan', function () {
             extensionContext
         )
         assert.ok(commandSpy.calledWith(codeScanLogsOutputChannelId))
+        assertTelemetry('codewhisperer_securityScan', {
+            codewhispererLanguage: 'python',
+            codewhispererCodeScanTotalIssues: 1,
+            codewhispererCodeScanIssuesWithFixes: 0,
+            codewhispererCodeScanLines: 188,
+        } as CodewhispererSecurityScan)
     })
 })