add telemetry

Author: David Hasani

gradle/libs.versions.toml

@@ -25,7 +25,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.10"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.272"
+telemetryGenerator = "1.0.274"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

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

@@ -67,10 +67,13 @@ class CodeTransformTelemetryManager(private val project: Project) {
 
     fun submitSelection(userChoice: String, 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) },
+            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,
             result = if (telemetryErrorMessage.isNullOrEmpty()) Result.Succeeded else Result.Failed,
             reason = telemetryErrorMessage,

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

@@ -58,7 +58,7 @@ private val confirmUserSelectionSQLConversionModuleSchemaButton = Button(
 )
 
 private val confirmUserSelectionSQLConversionMetadataButton = Button(
-    keepCardAfterClick = true, // TODO: make this false if you can't figure out how to disable the Select button after its been clicked once
+    keepCardAfterClick = true,
     waitMandatoryFormItems = true,
     text = message("codemodernizer.chat.message.button.select"),
     id = CodeTransformButtonId.SelectSQLMetadata.id,

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

@@ -286,7 +286,7 @@ class CodeTransformChatController(
         codeModernizerManager.createCodeModernizerSession(selection, context.project)
 
         // Publish metric to capture user selection before local build starts
-        telemetry.submitSelection("Confirm", selection)
+        telemetry.submitSelection("Confirm-Java", selection)
 
         codeTransformChatHelper.run {
             addNewMessage(buildUserInputSkipTestsFlagChatIntroContent())
@@ -349,6 +349,7 @@ class CodeTransformChatController(
                     sqlMetadataZip = extractedZip,
                 )
                 codeModernizerManager.createCodeModernizerSession(selection, context.project)
+                telemetry.submitSelection("Confirm-SQL", selection)
             }
         }
     }

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/BuildProgressSplitterPanelManager.kt

@@ -125,7 +125,11 @@ class BuildProgressSplitterPanelManager(private val project: Project) :
 
         fun maybeAdd(stepId: ProgressStepId, string: String) {
             // don't show building or generate plan message for SQL conversions since we don't build or generate plan
-            if (transformType == CodeTransformType.SQL_CONVERSION && (string == message("codemodernizer.toolwindow.progress.building") || string == message("codemodernizer.toolwindow.progress.planning"))) {
+            if (transformType == CodeTransformType.SQL_CONVERSION && (
+                    string == message("codemodernizer.toolwindow.progress.building") ||
+                        string == message("codemodernizer.toolwindow.progress.planning")
+                    )
+            ) {
                 return
             }
             if (currentState.none { it.id == stepId }) {
@@ -362,6 +366,7 @@ class BuildProgressSplitterPanelManager(private val project: Project) :
             .toKotlinDuration().inWholeSeconds.seconds.toString() to formatter.format(Date.from(endTime))
     }
 
+    // will be False for SQL conversions, which is what we want so that the (nonexistent) progressUpdates do not render
     private fun haveProgressUpdates(plan: TransformationPlan): Boolean = plan.transformationSteps().any { it.progressUpdates().size > 0 }
 
     private fun isValidStepClick(stepId: ProgressStepId): Boolean = when (stepId) {