telemetry(amazonq): combine metrics

Author: David Hasani

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt

@@ -312,8 +312,7 @@ class ArtifactHandler(
             dialog.isModal = true
 
             if (dialog.showAndGet()) {
-                telemetry.submitSelection("Submit-${diffDescription?.name}")
-                telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Submit", source)
+                telemetry.submitSelection("Submit-${diffDescription?.name}", jobId.toString())
                 if (diffDescription == null) {
                     val resultContent = CodeTransformChatMessageContent(
                         type = CodeTransformChatMessageType.PendingAnswer,
@@ -352,7 +351,7 @@ class ArtifactHandler(
                     }
                 }
             } else {
-                telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Cancel", source)
+                telemetry.submitSelection("Cancel", jobId.toString())
             }
         }
     }

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt

@@ -26,6 +26,7 @@ import software.aws.toolkits.telemetry.CodeTransformJavaTargetVersionsAllowed
 import software.aws.toolkits.telemetry.CodeTransformPreValidationError
 import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents
 import software.aws.toolkits.telemetry.CodetransformTelemetry
+import software.aws.toolkits.telemetry.MetricResult
 import software.aws.toolkits.telemetry.Result
 import java.time.Instant
 import java.util.Base64
@@ -65,13 +66,14 @@ class CodeTransformTelemetryManager(private val project: Project) {
         )
     }
 
-    fun submitSelection(userChoice: String, customerSelection: CustomerSelection? = null, telemetryErrorMessage: String? = null) {
+    fun submitSelection(userChoice: String, jobId: String? = null, customerSelection: CustomerSelection? = null, telemetryErrorMessage: String? = null) {
         CodetransformTelemetry.submitSelection(
             // TODO: remove below 2 lines (JavaSource / JavaTarget) once BI is updated to use source / target
             codeTransformJavaSourceVersionsAllowed = CodeTransformJavaSourceVersionsAllowed.from(customerSelection?.sourceJavaVersion?.name.orEmpty()),
             codeTransformJavaTargetVersionsAllowed = CodeTransformJavaTargetVersionsAllowed.from(customerSelection?.targetJavaVersion?.name.orEmpty()),
             codeTransformSessionId = sessionId,
             codeTransformProjectId = customerSelection?.let { getProjectHash(it) },
+            codeTransformJobId = jobId,
             source = if (userChoice == "Confirm-Java") customerSelection?.sourceJavaVersion?.name.orEmpty() else customerSelection?.sourceVendor.orEmpty(),
             target = if (userChoice == "Confirm-Java") customerSelection?.targetJavaVersion?.name.orEmpty() else customerSelection?.targetVendor.orEmpty(),
             userChoice = userChoice,
@@ -128,25 +130,6 @@ class CodeTransformTelemetryManager(private val project: Project) {
         )
     }
 
-    fun viewArtifact(
-        artifactType: CodeTransformArtifactType,
-        jobId: JobId,
-        userChoice: String,
-        source: CodeTransformVCSViewerSrcComponents,
-        telemetryErrorMessage: String? = null,
-    ) {
-        CodetransformTelemetry.viewArtifact(
-            codeTransformArtifactType = artifactType,
-            codeTransformVCSViewerSrcComponents = source,
-            codeTransformSessionId = sessionId,
-            codeTransformJobId = jobId.id,
-            codeTransformStatus = currentJobStatus,
-            userChoice = userChoice,
-            result = if (telemetryErrorMessage.isNullOrEmpty()) Result.Succeeded else Result.Failed,
-            reason = telemetryErrorMessage,
-        )
-    }
-
     fun getProjectHash(customerSelection: CustomerSelection) = Base64.getEncoder().encodeToString(
         DigestUtils.sha256(customerSelection.configurationFile?.toNioPath()?.toAbsolutePath().toString())
     )
@@ -196,12 +179,12 @@ class CodeTransformTelemetryManager(private val project: Project) {
 
     fun logHil(jobId: String, metaData: HilTelemetryMetaData, success: Boolean, reason: String) {
         CodetransformTelemetry.humanInTheLoop(
-            project,
-            jobId,
-            metaData.toString(),
-            sessionId,
-            reason,
-            success,
+            project = project,
+            codeTransformJobId = jobId,
+            codeTransformMetadata = metaData.toString(),
+            codeTransformSessionId = sessionId,
+            reason = reason,
+            result = if (success) MetricResult.Succeeded else MetricResult.Failed,
         )
     }