emit metric only after initial download

Author: David Hasani

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

@@ -71,9 +71,6 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
             is DownloadArtifactResult.Success -> {
                 if (result.artifact !is CodeModernizerArtifact) return notifyUnableToApplyPatch("")
                 displayDiffUsingPatch(result.artifact.patch, job, source)
-                val linesOfCodeSubmitted = CodeModernizerSessionState.getInstance(project).getLinesOfCodeSubmitted()
-                result.artifact.metrics.linesOfCodeSubmitted = linesOfCodeSubmitted
-                clientAdaptor.sendTransformTelemetryEvent(job, result.artifact.metrics)
             }
             is DownloadArtifactResult.ParseZipFailure -> notifyUnableToApplyPatch(result.failureReason.errorMessage)
             is DownloadArtifactResult.UnzipFailure -> notifyUnableToApplyPatch(result.failureReason.errorMessage)
@@ -203,6 +200,11 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
                     downloadedBuildLogPath[job] = path
                 } else {
                     downloadedArtifacts[job] = path
+                    if (output.artifact is CodeModernizerArtifact) {
+                        output.artifact.metrics.linesOfCodeSubmitted = CodeModernizerSessionState.getInstance(project).getLinesOfCodeSubmitted()
+                        output.artifact.metrics.programmingLanguage = CodeModernizerSessionState.getInstance(project).getTransformationLanguage()
+                        clientAdaptor.sendTransformTelemetryEvent(job, output.artifact.metrics)
+                    }
                 }
                 output
             } catch (e: RuntimeException) {

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

@@ -222,11 +222,11 @@ class GumbyClient(private val project: Project) {
                     it.timestamp(Instant.now())
                     it.ideCategory(IdeCategory.JETBRAINS)
                     it.programmingLanguage { language ->
-                        language.languageName("JAVA") // TODO: figure out when/how to make this SQL
+                        language.languageName(metrics.programmingLanguage)
                     }
                     it.linesOfCodeChanged(metrics.linesOfCodeChanged)
-                    it.charsOfCodeChanged(metrics.charsOfCodeChanged)
-                    it.linesOfCodeSubmitted(metrics.linesOfCodeSubmitted)
+                    it.charsOfCodeChanged(metrics.charactersOfCodeChanged)
+                    it.linesOfCodeSubmitted(metrics.linesOfCodeSubmitted) // currently unavailable for SQL conversions
                 }
             }
             requestBuilder.optOutPreference(getTelemetryOptOutPreference())

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

@@ -62,7 +62,7 @@ open class CodeModernizerArtifact(
                 val patches = extractPatches(manifest)
                 val summary = extractSummary(manifest)
                 val summaryMarkdownFile = getSummaryFile(manifest)
-                val metrics = loadMetrics()
+                val metrics = loadMetrics(manifest)
                 if (patches.size != 1) throw RuntimeException("Expected 1 patch, but found ${patches.size}")
                 return CodeModernizerArtifact(zipPath, manifest, patches, summary, summaryMarkdownFile, metrics)
             }
@@ -100,10 +100,10 @@ open class CodeModernizerArtifact(
             }
         }
 
-        private fun loadMetrics(): CodeModernizerMetrics {
+        private fun loadMetrics(manifest: CodeModernizerManifest): CodeModernizerMetrics {
             try {
                 val metricsFile =
-                    tempDir.listFiles()
+                    tempDir.resolve(manifest.metricsRoot).listFiles()
                         ?.firstOrNull { it.name.endsWith(METRICS_FILE_NAME) }
                 return MAPPER.readValue(metricsFile, CodeModernizerMetrics::class.java)
             } catch (exception: JsonProcessingException) {

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

@@ -6,4 +6,4 @@ package software.aws.toolkits.jetbrains.services.codemodernizer.model
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-data class CodeModernizerMetrics(val linesOfCodeChanged: Int, val charsOfCodeChanged: Int, var linesOfCodeSubmitted: Int?)
+data class CodeModernizerMetrics(val linesOfCodeChanged: Int?, val charactersOfCodeChanged: Int?, var linesOfCodeSubmitted: Int?, var programmingLanguage: String?)

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

@@ -12,9 +12,9 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModerni
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerSessionContext
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobHistoryItem
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
+import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getLinesOfCodeSubmitted
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getTableMapping
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.parseTableMapping
-import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getLinesOfCodeSubmitted
 import java.time.Duration
 import java.time.Instant
 import kotlin.io.path.Path
@@ -59,10 +59,13 @@ class CodeModernizerSessionState {
 
     fun getJobHistory(): Array<JobHistoryItem> = previousJobHistory.values.toTypedArray()
 
-    // used to emit a TransformEvent metric at end of transformation
+    // LOC submitted only available for Java upgrades
     fun getLinesOfCodeSubmitted(): Int? {
         val tableMapping = transformationPlan?.transformationSteps()?.get(0)?.let { getTableMapping(it.progressUpdates()) }
         val planTable = tableMapping?.let { parseTableMapping(it) }
         return planTable?.let { getLinesOfCodeSubmitted(it) }
     }
+
+    // we only create a transformationPlan for Java upgrades
+    fun getTransformationLanguage(): String = if (transformationPlan != null) "JAVA" else "SQL"
 }

plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt

@@ -133,8 +133,10 @@ open class CodeWhispererCodeModernizerTestBase(
 
     internal val validMetrics =
         CodeModernizerMetrics(
-            charsOfCodeChanged = 1234,
-            linesOfCodeChanged = 567
+            charactersOfCodeChanged = 1234,
+            linesOfCodeChanged = 567,
+            linesOfCodeSubmitted = 8910,
+            programmingLanguage = "JAVA",
         )
 
     internal val exampleCreateUploadUrlResponse =