more gradle

Author: David Hasani

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

@@ -205,14 +205,6 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
                 telemetryErrorMessage = "Unexpected error when downloading result ${e.localizedMessage}"
                 DownloadArtifactResult.ParseZipFailure(ParseZipFailureReason(artifactType, e.message.orEmpty()))
             } finally {
-                // TODO: Deprecated - remove once BI starts using new metric
-                telemetry.jobArtifactDownloadAndDeserializeTime(
-                    downloadStartTime,
-                    job,
-                    totalDownloadBytes,
-                    telemetryErrorMessage,
-                )
-
                 telemetry.downloadArtifact(mapArtifactTypes(artifactType), downloadStartTime, job, totalDownloadBytes, telemetryErrorMessage)
             }
         } catch (e: Exception) {
@@ -258,23 +250,15 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
             )
             dialog.isModal = true
 
-            // TODO: deprecated metric - remove after BI started using new metric
-            telemetry.vcsDiffViewerVisible(jobId) // download succeeded
             if (dialog.showAndGet()) {
                 telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Submit", source)
-
-                // TODO: deprecated metric - remove after BI started using new metric
-                telemetry.vcsViewerSubmitted(jobId)
             } else {
                 telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Cancel", source)
-
-                // TODO: deprecated metric - remove after BI started using new metric
-                telemetry.vscViewerCancelled(jobId)
             }
         }
     }
 
-    fun notifyUnableToDownload(error: DownloadFailureReason) {
+    private fun notifyUnableToDownload(error: DownloadFailureReason) {
         // Inform chat about failure
         LOG.error { "Unable to download artifact: $error" }
         CodeTransformMessageListener.instance.onDownloadFailure(error)
@@ -364,8 +348,6 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
     }
 
     fun displayDiffAction(jobId: JobId, source: CodeTransformVCSViewerSrcComponents) = runReadAction {
-        // TODO: deprecated metric - remove after BI started using new metric
-        telemetry.vcsViewerClicked(jobId)
         projectCoroutineScope(project).launch {
             displayDiff(jobId, source)
         }

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

@@ -182,8 +182,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                     true,
                     validatedBuildFiles = validatedBuildFiles,
                     validatedProjectJdkName = projectJdk?.description.orEmpty(),
-                    // TO-DO: maybe add back the other two fields of ValidationResult
-                    // probably not since user has not selected a project at this point
                 )
             } else {
                 ValidationResult(
@@ -193,8 +191,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                         supportedBuildFileNames.joinToString()
                     ),
                     invalidTelemetryReason = InvalidTelemetryReason(
-                        // TO-DO: make this NonMavenGradleProject?
-                        CodeTransformPreValidationError.NonMavenProject,
+                        CodeTransformPreValidationError.UnsupportedBuildSystem,
                         if (isGradleProject(project)) "Gradle build" else "other build"
                     ),
                 )
@@ -203,9 +200,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
 
         val result = validateCore(project)
 
-        // TODO: deprecated metric - remove after BI started using new metric
-        telemetry.sendValidationResult(result)
-
         telemetry.validateProject(result)
 
         return result
@@ -382,9 +376,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
     }
 
     fun runLocalBuild(project: Project, customerSelection: CustomerSelection) {
-        // TODO: deprecated metric - remove after BI started using new metric
-        telemetry.jobStartedCompleteFromPopupDialog(customerSelection)
-
         // Create and set a session
         codeTransformationSession = null
         val session = createCodeModernizerSession(customerSelection, project)

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

@@ -6,8 +6,10 @@ package software.aws.toolkits.jetbrains.services.codemodernizer
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import com.jetbrains.rd.generator.nova.PredefinedType
 import org.apache.commons.codec.digest.DigestUtils
 import software.amazon.awssdk.services.codewhispererruntime.model.TransformationStatus
+import software.aws.toolkits.core.ConnectionSettings
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CustomerSelection
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.ValidationResult
@@ -18,6 +20,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getAuthType
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getJavaVersionFromProjectSetting
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getMavenVersion
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.tryGetJdk
+import software.aws.toolkits.jetbrains.services.telemetry.MetricEventMetadata
 import software.aws.toolkits.telemetry.CodeTransformApiNames
 import software.aws.toolkits.telemetry.CodeTransformArtifactType
 import software.aws.toolkits.telemetry.CodeTransformBuildCommand
@@ -85,73 +88,6 @@ class CodeTransformTelemetryManager(private val project: Project) {
         codeTransformRunTimeLatency = calculateTotalLatency(startTime, Instant.now()),
     )
 
-    @Suppress("UNUSED_PARAMETER")
-    fun apiError(errorMessage: String, apiName: CodeTransformApiNames, jobId: String?) = CodetransformTelemetry.logApiError(
-        reason = errorMessage,
-        codeTransformSessionId = sessionId,
-        codeTransformJobId = jobId,
-    )
-
-    fun logApiLatency(
-        apiName: CodeTransformApiNames,
-        startTime: Instant,
-        codeTransformTotalByteSize: Int? = null,
-        codeTransformUploadId: String? = null,
-        codeTransformJobId: String? = null,
-        codeTransformRequestId: String? = null
-    ) = CodetransformTelemetry.logApiLatency(
-        codeTransformApiNames = apiName,
-        codeTransformSessionId = sessionId,
-        codeTransformRunTimeLatency = calculateTotalLatency(startTime, Instant.now()),
-        codeTransformUploadId = codeTransformUploadId,
-        codeTransformJobId = codeTransformJobId,
-        codeTransformTotalByteSize = codeTransformTotalByteSize,
-        codeTransformRequestId = codeTransformRequestId
-    )
-
-    fun vcsDiffViewerVisible(jobId: JobId) = CodetransformTelemetry.vcsDiffViewerVisible(
-        codeTransformSessionId = sessionId,
-        codeTransformJobId = jobId.id,
-    )
-
-    fun vcsViewerSubmitted(jobId: JobId) = CodetransformTelemetry.vcsViewerSubmitted(
-        codeTransformSessionId = sessionId,
-        codeTransformJobId = jobId.id,
-        codeTransformStatus = currentJobStatus,
-    )
-
-    fun vscViewerCancelled(jobId: JobId) = CodetransformTelemetry.vcsViewerCanceled(
-        codeTransformPatchViewerCancelSrcComponents = CodeTransformPatchViewerCancelSrcComponents.CancelButton,
-        codeTransformSessionId = sessionId,
-        codeTransformJobId = jobId.id,
-        codeTransformStatus = currentJobStatus,
-    )
-
-    fun vcsViewerClicked(jobId: JobId) = CodetransformTelemetry.vcsViewerClicked(
-        codeTransformVCSViewerSrcComponents = CodeTransformVCSViewerSrcComponents.ToastNotification,
-        codeTransformSessionId = sessionId,
-        codeTransformJobId = jobId.id,
-    )
-
-    fun jobArtifactDownloadAndDeserializeTime(downloadStartTime: Instant, jobId: JobId, totalDownloadBytes: Int, telemetryErrorMessage: String?) {
-        CodetransformTelemetry.jobArtifactDownloadAndDeserializeTime(
-            codeTransformSessionId = sessionId,
-            codeTransformRunTimeLatency = calculateTotalLatency(downloadStartTime, Instant.now()),
-            codeTransformJobId = jobId.id,
-            codeTransformTotalByteSize = totalDownloadBytes,
-            codeTransformRuntimeError = telemetryErrorMessage,
-        )
-    }
-
-    // TODO: deprecated metric - remove after BI started using new metric
-    fun mvnBuildFailed(mavenBuildCommand: CodeTransformMavenBuildCommand, error: String) {
-        CodetransformTelemetry.mvnBuildFailed(
-            codeTransformSessionId = sessionId,
-            codeTransformMavenBuildCommand = mavenBuildCommand,
-            reason = error
-        )
-    }
-
     fun dependenciesCopied() = CodetransformTelemetry.dependenciesCopied(codeTransformSessionId = sessionId)
 
     fun jobIsStartedFromChatPrompt() {
@@ -188,7 +124,7 @@ class CodeTransformTelemetryManager(private val project: Project) {
         )
     }
 
-    fun submitSelection(userChoice: String, customerSelection: CustomerSelection? = null, telemetryErrorMessage: String? = null) {
+    fun submitSelection(userChoice: String? = null, customerSelection: CustomerSelection? = null, telemetryErrorMessage: String? = null) {
         CodetransformTelemetry.submitSelection(
             codeTransformJavaSourceVersionsAllowed = CodeTransformJavaSourceVersionsAllowed.from(customerSelection?.sourceJavaVersion?.name.orEmpty()),
             codeTransformJavaTargetVersionsAllowed = CodeTransformJavaTargetVersionsAllowed.from(customerSelection?.targetJavaVersion?.name.orEmpty()),