fix: align transform user click telemetry behavior with VSCode implem… (#4080)

* fix: align transform user click telemetry behavior with VSCode implementation

* telemetry: Change UserInitiatedStop to JobCanceled

* remove logs that might contain PII

Author: tincheng

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt

@@ -205,35 +205,38 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
 
     fun validateAndStart(srcStartComponent: CodeTransformStartSrcComponents = CodeTransformStartSrcComponents.DevToolsStartButton) =
         projectCoroutineScope(project).launch {
+            sendUserClickedTelemetry(srcStartComponent)
             if (isModernizationInProgress.getAndSet(true)) return@launch
             val validationResult = validate(project)
             runInEdt {
                 if (validationResult.valid) {
                     runModernize(validationResult.validatedBuildFiles) ?: isModernizationInProgress.set(false)
                 } else {
                     warnUnsupportedProject(validationResult.invalidReason)
+                    sendValidationResultTelemetry(validationResult)
                     isModernizationInProgress.set(false)
                 }
             }
-            sendValidationResultTelemetry(validationResult, srcStartComponent)
         }
 
-    private fun sendValidationResultTelemetry(validationResult: ValidationResult, srcStartComponent: CodeTransformStartSrcComponents) {
+    private fun sendUserClickedTelemetry(srcStartComponent: CodeTransformStartSrcComponents) {
         CodeTransformTelemetryState.instance.setSessionId()
         CodeTransformTelemetryState.instance.setStartTime()
-        if (validationResult.valid) {
-            CodetransformTelemetry.isDoubleClickedToTriggerUserModal(
-                codeTransformStartSrcComponents = srcStartComponent,
+        CodetransformTelemetry.isDoubleClickedToTriggerUserModal(
+            codeTransformStartSrcComponents = srcStartComponent,
+            codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
+        )
+    }
+
+    private fun sendValidationResultTelemetry(validationResult: ValidationResult) {
+        if (!validationResult.valid) {
+            CodetransformTelemetry.isDoubleClickedToTriggerInvalidProject(
+                codeTransformPreValidationError = validationResult.invalidTelemetryReason.category ?: CodeTransformPreValidationError.Unknown,
                 codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
+                result = Result.Failed,
+                reason = validationResult.invalidTelemetryReason.additonalInfo
             )
-            return
         }
-        CodetransformTelemetry.isDoubleClickedToTriggerInvalidProject(
-            codeTransformPreValidationError = validationResult.invalidTelemetryReason.category ?: CodeTransformPreValidationError.Unknown,
-            codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
-            result = Result.Failed,
-            reason = validationResult.invalidTelemetryReason.additonalInfo
-        )
     }
 
     fun stopModernize() {
@@ -603,7 +606,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                     // Code successfully stopped toast will display when post job is run after this
                     CodetransformTelemetry.totalRunTime(
                         codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
-                        codeTransformResultStatusMessage = "User initiated stop",
+                        codeTransformResultStatusMessage = "JobCanceled",
                         codeTransformRunTimeLatency = calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime(), Instant.now())
                     )
                 }
@@ -612,7 +615,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                 notifyTransformationFailedToStop(e.localizedMessage)
                 CodetransformTelemetry.totalRunTime(
                     codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
-                    codeTransformResultStatusMessage = "User initiated stop",
+                    codeTransformResultStatusMessage = "JobCanceled",
                     codeTransformRunTimeLatency = calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime(), Instant.now())
                 )
             }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt

@@ -14,7 +14,6 @@ import software.amazon.awssdk.services.codewhispererruntime.model.Transformation
 import software.amazon.awssdk.services.codewhispererruntime.model.TransformationLanguage
 import software.amazon.awssdk.services.codewhispererruntime.model.TransformationPlan
 import software.amazon.awssdk.services.codewhispererruntime.model.TransformationStatus
-import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.AwsClientManager
@@ -94,9 +93,9 @@ class CodeModernizerSession(
                 codeTransformRunTimeLatency = calculateTotalLatency(startTime, Instant.now())
             )
         } catch (e: Exception) {
-            LOG.error(e) { e.message.toString() }
+            val errorMessage = "Failed to upload archive"
             CodetransformTelemetry.logGeneralError(
-                codeTransformApiErrorMessage = e.message.toString(),
+                codeTransformApiErrorMessage = errorMessage,
                 codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
             )
             state.currentJobStatus = TransformationStatus.FAILED
@@ -124,11 +123,11 @@ class CodeModernizerSession(
             LOG.warn { e.localizedMessage }
             return CodeModernizerStartJobResult.Disposed
         } catch (e: Exception) {
-            LOG.warn { e.message.toString() }
+            val errorMessage = "Failed to start job"
             state.putJobHistory(sessionContext, "FAILED TO START")
             state.currentJobStatus = TransformationStatus.FAILED
             CodetransformTelemetry.logGeneralError(
-                codeTransformApiErrorMessage = e.message.toString(),
+                codeTransformApiErrorMessage = errorMessage,
                 codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
             )
             CodeModernizerStartJobResult.UnableToStartJob(e.message.toString())

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt

@@ -138,10 +138,10 @@ data class CodeModernizerSessionContext(
                 }.toFile()
                 if (depDirectory != null) ZipCreationResult.Succeeded(outputFile) else ZipCreationResult.Missing1P(outputFile)
             } catch (e: NoSuchFileException) {
-                throw CodeModernizerException("Source folder not found: ${root.path}")
+                throw CodeModernizerException("Source folder not found")
             } catch (e: Exception) {
                 LOG.error(e) { e.message.toString() }
-                throw CodeModernizerException("Unknown exception occurred ${root.path}")
+                throw CodeModernizerException("Unknown exception occurred")
             } finally {
                 depDirectory?.deleteRecursively()
             }