telemetry(amazonq): emit metrics per finding

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt

@@ -39,6 +39,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWh
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CodeScanResponseContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CreateUploadUrlServiceInvocationContext
+import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_POLLING_INTERVAL_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCANS_THROTTLING_MESSAGE
@@ -219,6 +220,11 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
             }
             currentCoroutineContext.ensureActive()
             val issues = mapToCodeScanIssues(documents, sessionContext.project, jobId).filter { it.isVisible }
+            issues.forEach { issue ->
+                if (!issue.autoDetected) {
+                    CodeWhispererTelemetryService.getInstance().sendCodeScanIssueGenerated(issue)
+                }
+            }
             codeScanResponseContext = codeScanResponseContext.copy(codeScanTotalIssues = issues.count())
             codeScanResponseContext = codeScanResponseContext.copy(codeScanIssuesWithFixes = issues.count { it.suggestedFixes.isNotEmpty() })
             codeScanResponseContext = codeScanResponseContext.copy(reason = "Succeeded")

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt

@@ -421,6 +421,18 @@ class CodeWhispererTelemetryService {
         )
     }
 
+    fun sendCodeScanIssueGenerated(issue: CodeWhispererCodeScanIssue) {
+        CodewhispererTelemetry.codeScanIssueDetected(
+            autoDetected = issue.autoDetected,
+            codewhispererCodeScanJobId = issue.scanJobId,
+            detectorId = issue.detectorId,
+            findingId = issue.findingId,
+            includesFix = issue.suggestedFixes.isNotEmpty(),
+            ruleId = issue.ruleId,
+            result = MetricResult.Succeeded
+        )
+    }
+
     fun enqueueAcceptedSuggestionEntry(
         requestId: String,
         requestContext: RequestContext,

plugins/core/jetbrains-community/resources/telemetryOverride.json

@@ -563,6 +563,34 @@
                     "required": true
                 }
             ]
+        },
+        {
+            "name": "codewhisperer_codeScanIssueDetected",
+            "description": "Called when a code scan issue is returned from the service",
+            "metadata": [
+                {
+                    "type": "autoDetected",
+                    "required": false
+                },
+                {
+                    "type": "codewhispererCodeScanJobId",
+                    "required": false
+                },
+                {
+                    "type": "detectorId"
+                },
+                {
+                    "type": "findingId"
+                },
+                {
+                    "type": "includesFix",
+                    "required": false
+                },
+                {
+                    "type": "ruleId",
+                    "required": false
+                }
+            ]
         }
     ]
 }