diff --git a/.changes/next-release/bugfix-32139a16-d00e-43e2-aab8-a356008abfd1.json b/.changes/next-release/bugfix-32139a16-d00e-43e2-aab8-a356008abfd1.json new file mode 100644 index 00000000000..9f459dde6bf --- /dev/null +++ b/.changes/next-release/bugfix-32139a16-d00e-43e2-aab8-a356008abfd1.json @@ -0,0 +1,4 @@ +{ + "type" : "bugfix", + "description" : "Fix telemetry logging for new Amazon Q Code Transform telemetry updates" +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c74c9abe72c..282184c1bb6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ kotlinCoroutines = "1.6.4" mockito = "5.8.0" mockitoKotlin = "5.2.1" mockk = "1.13.8" -telemetryGenerator = "1.0.169" +telemetryGenerator = "1.0.171" testLogger = "3.1.0" testRetry = "1.5.2" slf4j = "1.7.36" diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt index 8f200d930b9..6f80ad2302b 100644 --- a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt +++ b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt @@ -116,7 +116,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo false, message("codemodernizer.notification.warn.invalid_project.description.reason.remote_backend"), InvalidTelemetryReason( - CodeTransformPreValidationError.ProjectRunningOnBackend + CodeTransformPreValidationError.RemoteRunProject ) ) } @@ -126,7 +126,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo false, message("codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in"), InvalidTelemetryReason( - CodeTransformPreValidationError.NonSSOLogin + CodeTransformPreValidationError.NonSsoLogin ) ) } @@ -136,7 +136,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo false, message("codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots"), InvalidTelemetryReason( - CodeTransformPreValidationError.EmptyProject + CodeTransformPreValidationError.NoPom ) ) } @@ -147,7 +147,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo false, message("codemodernizer.notification.warn.invalid_project.description.reason.invalid_jdk_versions", supportedJavaMappings.keys.joinToString()), InvalidTelemetryReason( - CodeTransformPreValidationError.ProjectSelectedIsNotJava8OrJava11, + CodeTransformPreValidationError.UnsupportedJavaVersion, project.tryGetJdk().toString() ) ) @@ -160,7 +160,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo false, message("codemodernizer.notification.warn.invalid_project.description.reason.no_valid_files", supportedBuildFileNames.joinToString()), InvalidTelemetryReason( - CodeTransformPreValidationError.ProjectSelectedIsNotJava8OrJava11, + CodeTransformPreValidationError.NonMavenProject, if (isGradleProject(project)) "Gradle build" else "other build" ) ) diff --git a/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codemodernizer/CodeWhispererCodeModernizerTest.kt b/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codemodernizer/CodeWhispererCodeModernizerTest.kt index 973b276a4c8..f25f735410b 100644 --- a/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codemodernizer/CodeWhispererCodeModernizerTest.kt +++ b/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codemodernizer/CodeWhispererCodeModernizerTest.kt @@ -153,7 +153,7 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() { false, message("codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in"), InvalidTelemetryReason( - CodeTransformPreValidationError.NonSSOLogin + CodeTransformPreValidationError.NonSsoLogin ) ) assertEquals(expectedResult, result)