From 621ac8dc12eec50d0cb4930c496fe12358734154 Mon Sep 17 00:00:00 2001 From: David Hasani Date: Thu, 2 Jan 2025 16:08:33 -0800 Subject: [PATCH 1/7] telemetry(amazonq): combine metrics --- .../codemodernizer/ArtifactHandler.kt | 5 ++- .../CodeTransformTelemetryManager.kt | 35 +++++-------------- 2 files changed, 11 insertions(+), 29 deletions(-) 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 index 0922743f611..c7180b5c2e0 100644 --- 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 @@ -312,8 +312,7 @@ class ArtifactHandler( dialog.isModal = true if (dialog.showAndGet()) { - telemetry.submitSelection("Submit-${diffDescription?.name}") - telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Submit", source) + telemetry.submitSelection("Submit-${diffDescription?.name}", jobId.toString()) if (diffDescription == null) { val resultContent = CodeTransformChatMessageContent( type = CodeTransformChatMessageType.PendingAnswer, @@ -352,7 +351,7 @@ class ArtifactHandler( } } } else { - telemetry.viewArtifact(CodeTransformArtifactType.ClientInstructions, jobId, "Cancel", source) + telemetry.submitSelection("Cancel", jobId.toString()) } } } diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt index 3f2d7a6d31d..e7d066f0f80 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt @@ -26,6 +26,7 @@ import software.aws.toolkits.telemetry.CodeTransformJavaTargetVersionsAllowed import software.aws.toolkits.telemetry.CodeTransformPreValidationError import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents import software.aws.toolkits.telemetry.CodetransformTelemetry +import software.aws.toolkits.telemetry.MetricResult import software.aws.toolkits.telemetry.Result import java.time.Instant import java.util.Base64 @@ -65,13 +66,14 @@ class CodeTransformTelemetryManager(private val project: Project) { ) } - fun submitSelection(userChoice: String, customerSelection: CustomerSelection? = null, telemetryErrorMessage: String? = null) { + fun submitSelection(userChoice: String, jobId: String? = null, 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) }, + codeTransformJobId = jobId, 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, @@ -128,25 +130,6 @@ class CodeTransformTelemetryManager(private val project: Project) { ) } - fun viewArtifact( - artifactType: CodeTransformArtifactType, - jobId: JobId, - userChoice: String, - source: CodeTransformVCSViewerSrcComponents, - telemetryErrorMessage: String? = null, - ) { - CodetransformTelemetry.viewArtifact( - codeTransformArtifactType = artifactType, - codeTransformVCSViewerSrcComponents = source, - codeTransformSessionId = sessionId, - codeTransformJobId = jobId.id, - codeTransformStatus = currentJobStatus, - userChoice = userChoice, - result = if (telemetryErrorMessage.isNullOrEmpty()) Result.Succeeded else Result.Failed, - reason = telemetryErrorMessage, - ) - } - fun getProjectHash(customerSelection: CustomerSelection) = Base64.getEncoder().encodeToString( DigestUtils.sha256(customerSelection.configurationFile?.toNioPath()?.toAbsolutePath().toString()) ) @@ -196,12 +179,12 @@ class CodeTransformTelemetryManager(private val project: Project) { fun logHil(jobId: String, metaData: HilTelemetryMetaData, success: Boolean, reason: String) { CodetransformTelemetry.humanInTheLoop( - project, - jobId, - metaData.toString(), - sessionId, - reason, - success, + project = project, + codeTransformJobId = jobId, + codeTransformMetadata = metaData.toString(), + codeTransformSessionId = sessionId, + reason = reason, + result = if (success) MetricResult.Succeeded else MetricResult.Failed, ) } From be2892c9ec529bbc49fbb53fad3e51aa0b9ea0f7 Mon Sep 17 00:00:00 2001 From: David Hasani Date: Thu, 2 Jan 2025 16:28:08 -0800 Subject: [PATCH 2/7] remove unneeded field --- gradle/libs.versions.toml | 2 +- .../services/codemodernizer/ArtifactHandler.kt | 12 +++++------- .../codemodernizer/CodeTransformTelemetryManager.kt | 1 - .../controller/CodeTransformChatController.kt | 12 +++++------- .../CodeWhispererCodeModernizerTest.kt | 8 +++----- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c2e912e78d7..830ac70a851 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -27,7 +27,7 @@ mockitoKotlin = "5.4.0" mockk = "1.13.10" nimbus-jose-jwt = "9.40" node-gradle = "7.0.2" -telemetryGenerator = "1.0.284" +telemetryGenerator = "1.0.291" testLogger = "4.0.0" testRetry = "1.5.10" # test-only; platform provides slf4j transitively at runtime 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 index c7180b5c2e0..8d62a1c628c 100644 --- 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 @@ -56,7 +56,6 @@ import software.aws.toolkits.jetbrains.utils.notifyStickyInfo import software.aws.toolkits.jetbrains.utils.notifyStickyWarn import software.aws.toolkits.resources.message import software.aws.toolkits.telemetry.CodeTransformArtifactType -import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents import java.io.File import java.nio.file.Files import java.nio.file.Path @@ -93,17 +92,17 @@ class ArtifactHandler( private var totalPatchFiles: Int = 0 private var sharedPatchIndex: Int = 0 - internal suspend fun displayDiff(job: JobId, source: CodeTransformVCSViewerSrcComponents) { + internal suspend fun displayDiff(job: JobId) { if (isCurrentlyDownloading.get()) return when (val result = downloadArtifact(job, TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS)) { is DownloadArtifactResult.Success -> { if (result.artifact !is CodeModernizerArtifact) return notifyUnableToApplyPatch("") totalPatchFiles = result.artifact.patches.size if (result.artifact.description == null) { - displayDiffUsingPatch(result.artifact.patches.first(), totalPatchFiles, null, job, source) + displayDiffUsingPatch(result.artifact.patches.first(), totalPatchFiles, null, job) } else { val diffDescription = result.artifact.description[getCurrentPatchIndex()] - displayDiffUsingPatch(result.artifact.patches[getCurrentPatchIndex()], totalPatchFiles, diffDescription, job, source) + displayDiffUsingPatch(result.artifact.patches[getCurrentPatchIndex()], totalPatchFiles, diffDescription, job) } } is DownloadArtifactResult.ParseZipFailure -> notifyUnableToApplyPatch(result.failureReason.errorMessage) @@ -285,7 +284,6 @@ class ArtifactHandler( totalPatchFiles: Int, diffDescription: PatchInfo?, jobId: JobId, - source: CodeTransformVCSViewerSrcComponents, ) { withContext(EDT) { val dialog = ApplyPatchDifferentiatedDialog( @@ -464,9 +462,9 @@ class ArtifactHandler( ) } - fun displayDiffAction(jobId: JobId, source: CodeTransformVCSViewerSrcComponents) = runReadAction { + fun displayDiffAction(jobId: JobId) = runReadAction { projectCoroutineScope(project).launch { - displayDiff(jobId, source) + displayDiff(jobId) } } diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt index e7d066f0f80..f3238f81993 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt @@ -24,7 +24,6 @@ import software.aws.toolkits.telemetry.CodeTransformCancelSrcComponents import software.aws.toolkits.telemetry.CodeTransformJavaSourceVersionsAllowed import software.aws.toolkits.telemetry.CodeTransformJavaTargetVersionsAllowed import software.aws.toolkits.telemetry.CodeTransformPreValidationError -import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents import software.aws.toolkits.telemetry.CodetransformTelemetry import software.aws.toolkits.telemetry.MetricResult import software.aws.toolkits.telemetry.Result diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt index acd56c8fcbc..109c91ce764 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt @@ -113,7 +113,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.unzipFile import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateSctMetadata import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType import software.aws.toolkits.resources.message -import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents class CodeTransformChatController( private val context: AmazonQAppInitContext, @@ -273,7 +272,7 @@ class CodeTransformChatController( override suspend fun processCodeTransformCancelAction(message: IncomingCodeTransformMessage.CodeTransformCancel) { if (!checkForAuth(message.tabId)) { - telemetry.submitSelection("Cancel", null, "User is not authenticated") + telemetry.submitSelection("Cancel", null, null, "User is not authenticated") return } @@ -288,7 +287,7 @@ class CodeTransformChatController( override suspend fun processCodeTransformStartAction(message: IncomingCodeTransformMessage.CodeTransformStart) { if (!checkForAuth(message.tabId)) { - telemetry.submitSelection("Confirm", null, "User is not authenticated") + telemetry.submitSelection("Confirm", null, null, "User is not authenticated") return } @@ -311,7 +310,7 @@ class CodeTransformChatController( codeModernizerManager.createCodeModernizerSession(selection, context.project) // Publish metric to capture user selection before local build starts - telemetry.submitSelection("Confirm-Java", selection) + telemetry.submitSelection("Confirm-Java", null, selection) codeTransformChatHelper.run { addNewMessage(buildUserInputSkipTestsFlagChatIntroContent()) @@ -343,7 +342,7 @@ class CodeTransformChatController( unzipFile(selectedZipFile.toNioPath(), extractedZip.toPath(), true) - val sctFile = extractedZip.listFiles { file -> file.name.endsWith(".sct") }.firstOrNull() + val sctFile = extractedZip.listFiles { file -> file.name.endsWith(".sct") }?.firstOrNull() val metadataValidationResult = validateSctMetadata(sctFile) @@ -373,7 +372,7 @@ class CodeTransformChatController( sqlMetadataZip = extractedZip, ) codeModernizerManager.createCodeModernizerSession(selection, context.project) - telemetry.submitSelection("Confirm-SQL", selection) + telemetry.submitSelection("Confirm-SQL", null, selection) } } @@ -494,7 +493,6 @@ class CodeTransformChatController( override suspend fun processCodeTransformViewDiff(message: IncomingCodeTransformMessage.CodeTransformViewDiff) { artifactHandler.displayDiffAction( CodeModernizerSessionState.getInstance(context.project).currentJobId as JobId, - CodeTransformVCSViewerSrcComponents.Chat ) } diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt index e8de6cfc5c3..633879f4872 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt @@ -35,7 +35,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.ValidationR import software.aws.toolkits.jetbrains.services.codemodernizer.utils.filterOnlyParentFiles import software.aws.toolkits.jetbrains.services.codemodernizer.utils.unzipFile import software.aws.toolkits.telemetry.CodeTransformPreValidationError -import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents import kotlin.io.path.Path import kotlin.io.path.createTempDirectory import kotlin.io.path.exists @@ -55,7 +54,7 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() { doNothing().whenever(handler).notifyUnableToApplyPatch(any()) val result = DownloadArtifactResult.ParseZipFailure(expectedError) doReturn(result).whenever(handler).downloadArtifact(any(), eq(TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS), eq(false)) - handler.displayDiff(jobId, CodeTransformVCSViewerSrcComponents.ToastNotification) + handler.displayDiff(jobId) verify(handler, times(1)).notifyUnableToApplyPatch(any()) } @@ -136,15 +135,14 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() { doAnswer { mockDialog.showAndGet() mockDialog - }.whenever(handler).displayDiffUsingPatch(any(), any(), any(), any(), any()) - handler.displayDiff(jobId, CodeTransformVCSViewerSrcComponents.Chat) + }.whenever(handler).displayDiffUsingPatch(any(), any(), any(), any()) + handler.displayDiff(jobId) verify(handler, never()).notifyUnableToApplyPatch(any()) verify(handler, times(1)).displayDiffUsingPatch( testCodeModernizerArtifact.patches[0], testCodeModernizerArtifact.patches.size, testCodeModernizerArtifact.description?.get(0), jobId, - CodeTransformVCSViewerSrcComponents.Chat ) } From bca224b779f0047b3ec661e5068213e87fc6422e Mon Sep 17 00:00:00 2001 From: David Hasani Date: Thu, 2 Jan 2025 19:11:15 -0800 Subject: [PATCH 3/7] re-run CI --- .../services/codemodernizer/CodeTransformTelemetryManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt index f3238f81993..79a1b3cb9a7 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt @@ -67,7 +67,7 @@ class CodeTransformTelemetryManager(private val project: Project) { fun submitSelection(userChoice: String, jobId: String? = null, customerSelection: CustomerSelection? = null, telemetryErrorMessage: String? = null) { CodetransformTelemetry.submitSelection( - // TODO: remove below 2 lines (JavaSource / JavaTarget) once BI is updated to use source / target + // TODO: remove the 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, From ba6553c811e5c1a4a9c983ca55efb349001b5f83 Mon Sep 17 00:00:00 2001 From: David Hasani Date: Fri, 3 Jan 2025 08:26:23 -0800 Subject: [PATCH 4/7] remove unused property --- .../services/codemodernizer/CodeTransformTelemetryManager.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt index 79a1b3cb9a7..15182c631c1 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt @@ -36,7 +36,6 @@ import java.util.Base64 @Service(Service.Level.PROJECT) class CodeTransformTelemetryManager(private val project: Project) { private val sessionId get() = CodeTransformTelemetryState.instance.getSessionId() - private val currentJobStatus get() = CodeModernizerSessionState.getInstance(project).currentJobStatus.toString() fun initiateTransform(telemetryErrorMessage: String? = null) { CodetransformTelemetry.initiateTransform( From 15a74964e6f9de2eed70ce47994bfbb484cf6822 Mon Sep 17 00:00:00 2001 From: David Hasani Date: Fri, 3 Jan 2025 09:42:33 -0800 Subject: [PATCH 5/7] fix detekt --- .../services/codemodernizer/CodeTransformTelemetryManager.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt index 15182c631c1..3901895bb27 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt @@ -11,7 +11,6 @@ import software.amazon.awssdk.services.codewhispererruntime.model.Transformation 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 -import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeTransformTelemetryState import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTotalLatency import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getAuthType From 713152fbb8f0f1f789e1a9ec5c9cf92f499d63b0 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Mon, 6 Jan 2025 16:30:40 -0800 Subject: [PATCH 6/7] Update CodeTransformTelemetryManager.kt --- .../services/codemodernizer/CodeTransformTelemetryManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt index 3901895bb27..2f341ec6ad1 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt @@ -65,7 +65,7 @@ class CodeTransformTelemetryManager(private val project: Project) { fun submitSelection(userChoice: String, jobId: String? = null, customerSelection: CustomerSelection? = null, telemetryErrorMessage: String? = null) { CodetransformTelemetry.submitSelection( - // TODO: remove the below 2 lines (JavaSource / JavaTarget) once BI is updated to use source / target + // TODO: remove the 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, From 8a2463681ac58367a0b0271c7736d307dddc1148 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Mon, 6 Jan 2025 17:05:15 -0800 Subject: [PATCH 7/7] Update CodeTransformTelemetryManager.kt --- .../services/codemodernizer/CodeTransformTelemetryManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt index 2f341ec6ad1..3901895bb27 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt @@ -65,7 +65,7 @@ class CodeTransformTelemetryManager(private val project: Project) { fun submitSelection(userChoice: String, jobId: String? = null, customerSelection: CustomerSelection? = null, telemetryErrorMessage: String? = null) { CodetransformTelemetry.submitSelection( - // TODO: remove the below 2 lines (JavaSource / JavaTarget) once BI is updated to use source / target + // TODO: remove the 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,