telemetry: add rule id to security scan metrics (#4069)

Author: ctlai95

jetbrains-core/resources/telemetryOverride.json

@@ -34,16 +34,6 @@
             "type": "string",
             "description": "Workflow step name"
         },
-        {
-            "name": "findingId",
-            "type": "string",
-            "description": "The id of a security finding from a code scan"
-        },
-        {
-            "name": "detectorId",
-            "type": "string",
-            "description": "The id of the detector which produced the code scan issue"
-        },
         {
             "name": "cwsprChatTriggerInteraction",
             "type": "string",
@@ -287,25 +277,6 @@
                 { "type": "codecatalyst_devEnvironmentWorkflowError", "required": false }
             ]
         },
-        {
-            "name": "codewhisperer_codeScanIssueHover",
-            "description": "Called when a code scan issue is hovered over",
-            "metadata": [
-                { "type":  "findingId" },
-                { "type":  "detectorId" }
-            ]
-        },
-        {
-            "name": "codewhisperer_codeScanIssueApplyFix",
-            "description": "Called when a code scan issue suggested fix is applied",
-            "metadata": [
-                { "type":  "findingId" },
-                { "type":  "detectorId" },
-                { "type":  "component" },
-                { "type":  "result" },
-                { "type":  "reason", "required": false }
-            ]
-        },
         {
             "name": "amazonq_openChat",
             "description": "When user opens CWSPR chat panel"

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

@@ -494,6 +494,7 @@ data class CodeWhispererCodeScanIssue(
     val detectorId: String,
     val detectorName: String,
     val findingId: String,
+    val ruleId: String?,
     val relatedVulnerabilities: List<String>,
     val severity: String,
     val recommendation: Recommendation,

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt

@@ -321,6 +321,7 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
                             detectorId = it.detectorId,
                             detectorName = it.detectorName,
                             findingId = it.findingId,
+                            ruleId = it.ruleId,
                             relatedVulnerabilities = it.relatedVulnerabilities,
                             severity = it.severity,
                             recommendation = it.remediation.recommendation,
@@ -381,6 +382,7 @@ internal data class CodeScanRecommendation(
     val detectorId: String,
     val detectorName: String,
     val findingId: String,
+    val ruleId: String?,
     val relatedVulnerabilities: List<String>,
     val severity: String,
     val remediation: Remediation

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt

@@ -328,14 +328,16 @@ class CodeWhispererTelemetryService {
     fun sendCodeScanIssueHoverEvent(issue: CodeWhispererCodeScanIssue) {
         CodewhispererTelemetry.codeScanIssueHover(
             findingId = issue.findingId,
-            detectorId = issue.detectorId
+            detectorId = issue.detectorId,
+            ruleId = issue.ruleId
         )
     }
 
     fun sendCodeScanIssueApplyFixEvent(issue: CodeWhispererCodeScanIssue, result: Result, reason: String? = null) {
         CodewhispererTelemetry.codeScanIssueApplyFix(
             findingId = issue.findingId,
             detectorId = issue.detectorId,
+            ruleId = issue.ruleId,
             component = Component.Hover,
             result = result,
             reason = reason