add LOC submitted data point

David Hasani · David Hasani · commit e99c9b71d3fa · 2024-11-05T18:44:09.000-08:00
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
@@ -39,6 +39,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadFai
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.ParseZipFailureReason
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.UnzipFailureReason
+import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilArtifactDir
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isValidCodeTransformConnection
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.openTroubleshootingGuideNotificationAction
@@ -70,6 +71,8 @@ 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)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt
@@ -226,7 +226,7 @@ class GumbyClient(private val project: Project) {
                     }
                     it.linesOfCodeChanged(metrics.linesOfCodeChanged)
                     it.charsOfCodeChanged(metrics.charsOfCodeChanged)
-                    it.linesOfCodeSubmitted(0) // TODO: figure out how to get lines of code submitted from plan stage
+                    it.linesOfCodeSubmitted(metrics.linesOfCodeSubmitted)
                 }
             }
             requestBuilder.optOutPreference(getTelemetryOptOutPreference())
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerMetrics.kt b/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)
+data class CodeModernizerMetrics(val linesOfCodeChanged: Int, val charsOfCodeChanged: Int, var linesOfCodeSubmitted: Int?)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/plan/CodeModernizerPlanEditor.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/plan/CodeModernizerPlanEditor.kt
@@ -26,7 +26,9 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.PlanTable
 import software.aws.toolkits.jetbrains.services.codemodernizer.plan.CodeModernizerPlanEditorProvider.Companion.MIGRATION_PLAN_KEY
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getAuthType
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getBillingText
+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.codewhisperer.layout.CodeWhispererLayoutConfig.addHorizontalGlue
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CredentialSourceId
@@ -59,12 +61,7 @@ import javax.swing.table.DefaultTableModel
 
 class CodeModernizerPlanEditor(val project: Project, private val virtualFile: VirtualFile) : UserDataHolderBase(), FileEditor {
     val plan = virtualFile.getUserData(MIGRATION_PLAN_KEY) ?: throw RuntimeException("Migration plan not found")
-    private val tableMapping =
-        if (!plan.transformationSteps()[0].progressUpdates().isNullOrEmpty()) {
-            getTableMapping(plan.transformationSteps()[0].progressUpdates())
-        } else {
-            throw RuntimeException("GetPlan response missing step 0 progress updates with table data")
-        }
+    private val tableMapping = getTableMapping(plan.transformationSteps()[0].progressUpdates())
     private val mapper = jacksonObjectMapper()
 
     // to-do: convert to UI DSL
@@ -79,8 +76,8 @@ class CodeModernizerPlanEditor(val project: Project, private val virtualFile: Vi
                     // key "0" reserved for job statistics table
                     // comes from "name" field of each progressUpdate in step zero of plan
                     if (JOB_STATISTICS_TABLE_KEY in tableMapping) {
-                        val planTable = mapper.readValue(tableMapping[JOB_STATISTICS_TABLE_KEY], PlanTable::class.java)
-                        val linesOfCode = planTable.rows.find { it.name == "linesOfCode" }?.value?.toInt()
+                        val planTable = parseTableMapping(tableMapping)
+                        val linesOfCode = getLinesOfCodeSubmitted(planTable)
                         if (linesOfCode != null && linesOfCode > LOC_THRESHOLD && getAuthType(project) == CredentialSourceId.IamIdentityCenter) {
                             val billingText = getBillingText(linesOfCode)
                             val billingTextComponent =
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerSessionState.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerSessionState.kt
@@ -12,6 +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.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
@@ -55,4 +58,11 @@ class CodeModernizerSessionState {
     }
 
     fun getJobHistory(): Array<JobHistoryItem> = previousJobHistory.values.toTypedArray()
+
+    // used to emit a TransformEvent metric at end of transformation
+    fun getLinesOfCodeSubmitted(): Int? {
+        val tableMapping = transformationPlan?.transformationSteps()?.get(0)?.let { getTableMapping(it.progressUpdates()) }
+        val planTable = tableMapping?.let { parseTableMapping(it) }
+        return planTable?.let { getLinesOfCodeSubmitted(it) }
+    }
 }
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt
@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.codemodernizer.utils
 
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.intellij.openapi.project.Project
 import com.intellij.serviceContainer.AlreadyDisposedException
 import kotlinx.coroutines.delay
@@ -23,7 +24,9 @@ import software.aws.toolkits.core.utils.Waiters.waitUntil
 import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTelemetryManager
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.BILLING_RATE
+import software.aws.toolkits.jetbrains.services.codemodernizer.constants.JOB_STATISTICS_TABLE_KEY
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.PlanTable
 import software.aws.toolkits.resources.message
 import java.time.Duration
 import java.util.Locale
@@ -128,11 +131,23 @@ suspend fun JobId.pollTransformationStatusAndPlan(
 }
 
 // "name" holds the ID of the corresponding plan step (where table will go) and "description" holds the plan data
-fun getTableMapping(stepZeroProgressUpdates: List<TransformationProgressUpdate>) = stepZeroProgressUpdates.associate {
-    it.name() to it.description()
+fun getTableMapping(stepZeroProgressUpdates: List<TransformationProgressUpdate>): Map<String, String> {
+    if (stepZeroProgressUpdates.isNotEmpty()) {
+        return stepZeroProgressUpdates.associate {
+            it.name() to it.description()
+        }
+    } else {
+        throw RuntimeException("GetPlan response missing step 0 progress updates with table data")
+    }
 }
 
+fun parseTableMapping(tableMapping: Map<String, String>): PlanTable =
+    jacksonObjectMapper().readValue(tableMapping[JOB_STATISTICS_TABLE_KEY], PlanTable::class.java)
+
 fun getBillingText(linesOfCode: Int): String {
     val estimatedCost = String.format(Locale.US, "%.2f", linesOfCode.times(BILLING_RATE))
     return message("codemodernizer.migration_plan.header.billing_text", linesOfCode, BILLING_RATE, estimatedCost)
 }
+
+fun getLinesOfCodeSubmitted(planTable: PlanTable) =
+    planTable.rows.find { it.name == "linesOfCode" }?.value?.toInt()
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt
@@ -52,6 +52,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenPr
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerManifest
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerMetrics
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerSessionContext
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformFailureBuildLog
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CustomerSelection
@@ -105,13 +106,15 @@ open class CodeWhispererCodeModernizerTestBase(
     internal val validZipSummaryPath = "summary/"
     internal val validZipManifestPath = "manifest.json"
     internal val validZipPatchFilePath = "patch/diff.patch"
+    internal val validZipMetricsPath = "metrics/"
     internal val validZipManifestVersion = 1.0F
     internal val validManifest =
         CodeModernizerManifest(
             validZipManifestVersion,
             validZipPatchDirPath,
             validZipArtifactsPath,
             validZipSummaryPath,
+            validZipMetricsPath
         )
     internal val validTransformationSummary =
         TransformationSummary(
@@ -128,6 +131,12 @@ open class CodeWhispererCodeModernizerTestBase(
             """.trimIndent(),
         )
 
+    internal val validMetrics =
+        CodeModernizerMetrics(
+            charsOfCodeChanged = 1234,
+            linesOfCodeChanged = 567
+        )
+
     internal val exampleCreateUploadUrlResponse =
         CreateUploadUrlResponse.builder()
             .uploadUrl("https://smth.com")
@@ -280,6 +289,7 @@ open class CodeWhispererCodeModernizerTestBase(
                     listOf(examplePatchVirtualFile),
                     validTransformationSummary,
                     summaryFileMock,
+                    validMetrics
                 ),
             )
         testTransformFailureBuildLog =

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ class GumbyClient(private val project: Project) {`
`226`	`226`	`}`
`227`	`227`	`it.linesOfCodeChanged(metrics.linesOfCodeChanged)`
`228`	`228`	`it.charsOfCodeChanged(metrics.charsOfCodeChanged)`
`229`		`- it.linesOfCodeSubmitted(0) // TODO: figure out how to get lines of code submitted from plan stage`
	`229`	`+ it.linesOfCodeSubmitted(metrics.linesOfCodeSubmitted)`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`requestBuilder.optOutPreference(getTelemetryOptOutPreference())`