feat(amazonq): emit telemetry events for explainIssue and applyFix commands

Author: blakelaz-amazon

gradle/libs.versions.toml

@@ -28,7 +28,7 @@ mockitoKotlin = "5.4.1-SNAPSHOT"
 mockk = "1.13.17"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.322"
+telemetryGenerator = "1.0.329"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt

@@ -10,14 +10,15 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.DataKey
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.DumbAware
-import com.intellij.ui.dsl.stringToInt
 import kotlinx.coroutines.runBlocking
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.FlareUiMessage
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatPrompt
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_TO_PROMPT
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendToPromptParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TriggerType
+import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.TelemetryHelper
+import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
 
 class HandleIssueCommandAction : AnAction(), DumbAware {
     override fun getActionUpdateThread() = ActionUpdateThread.BGT
@@ -26,14 +27,12 @@ class HandleIssueCommandAction : AnAction(), DumbAware {
         e.presentation.isEnabledAndVisible = e.project != null
     }
     fun createLineRangeText(issueContext: MutableMap<String, String>): String {
-        val startLineString = issueContext["startLine"]
-        val endLineString = issueContext["endLine"]
-        val startLineInteger = stringToInt(startLineString ?: return "")
-        val endLineInteger = stringToInt(endLineString ?: return "")
-        return if (startLineInteger == endLineInteger) {
-            "[$startLineInteger]"
+        val startLine = issueContext["startLine"]
+        val endLine = issueContext["endLine"]
+        return if (startLine.equals(endLine)) {
+            "[$startLine]"
         } else {
-            "[$startLineInteger, $endLineInteger]"
+            "[$startLine, $endLine]"
         }
     }
 
@@ -43,6 +42,18 @@ class HandleIssueCommandAction : AnAction(), DumbAware {
         val actionDataKey = DataKey.create<String>("amazonq.codescan.handleIssueCommandAction")
         val context = e.getData(contextDataKey) ?: return
         val action = e.getData(actionDataKey) ?: return
+
+        // Emit telemetry event
+        TelemetryHelper.recordTelemetryIssueCommandAction(
+            context["findingId"].orEmpty(),
+            context["detectorId"].orEmpty(),
+            context["ruleId"].orEmpty(),
+            context["autoDetected"].orEmpty(),
+            getStartUrl(project).orEmpty(),
+            action, // The action name (explainIssue or applyFix)
+            "Succeeded"
+        )
+
         ActionManager.getInstance().getAction("q.openchat").actionPerformed(e)
 
         ApplicationManager.getApplication().executeOnPooledThread {
@@ -54,7 +65,7 @@ class HandleIssueCommandAction : AnAction(), DumbAware {
                 val prompt = "$actionString ${context["title"]} issue in ${context["fileName"]} at ${createLineRangeText(context)}"
 
                 val modelPrompt = "$actionString ${context["title"]} issue in ${context["fileName"]} at ${createLineRangeText(context)}" +
-                    "Issue: \"${context["issue"]}\" \n"
+                    "Issue: \"${context}\" \n"
 
                 val params = SendToPromptParams(
                     selection = codeSelection,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

@@ -441,6 +441,26 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
                     .credentialStartUrl(startUrl)
             }
         }
+
+        fun recordTelemetryIssueCommandAction(
+            findingId: String,
+            detectorId: String,
+            ruleId: String,
+            autoDetected: String,
+            startUrl: String,
+            metricName: String,
+            result: String,
+        ) {
+            Telemetry.amazonq.codeReviewTool.use {
+                it.reason(metricName)
+                    .setAttribute("findingId", findingId)
+                    .setAttribute("detectorId", detectorId)
+                    .setAttribute("ruleId", ruleId)
+                    .setAttribute("credentialStartUrl", startUrl)
+                    .setAttribute("autoDetected", autoDetected)
+                    .setAttribute("result", result)
+            }
+        }
     }
 }
 

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

@@ -252,7 +252,11 @@ private fun handleIssueCommand(issue: CodeWhispererCodeScanIssue, action: IssueC
         "endLine" to issue.endLine.toString(),
         "recommendation" to jacksonObjectMapper().writeValueAsString(issue.recommendation),
         "suggestedFixes" to jacksonObjectMapper().writeValueAsString(issue.suggestedFixes),
-        "codeSnippet" to jacksonObjectMapper().writeValueAsString(issue.codeSnippet)
+        "codeSnippet" to jacksonObjectMapper().writeValueAsString(issue.codeSnippet),
+        "findingId" to issue.findingId,
+        "ruleId" to issue.ruleId.orEmpty(),
+        "detectorId" to issue.detectorId,
+        "autoDetected" to issue.autoDetected.toString(),
     )
     val actionEvent = AnActionEvent.createFromInputEvent(
         null,