Feature - Update aws-toolkit-commons package (#4051)

damntrecky · web-flow · commit 79d2fdcec5dd · 2023-12-12T07:15:22.000-08:00
* Chore - Update aws-toolkit-commons package
- update AmazonQ Code Transform telemetry definitions for new package update
diff --git a/.changes/next-release/bugfix-32139a16-d00e-43e2-aab8-a356008abfd1.json 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"
+}
diff --git 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
@@ -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
@@ -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)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Fix telemetry logging for new Amazon Q Code Transform telemetry updates"
 +}
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo`
`116`	`116`	`false,`
`117`	`117`	`message("codemodernizer.notification.warn.invalid_project.description.reason.remote_backend"),`
`118`	`118`	`InvalidTelemetryReason(`
`119`		`- CodeTransformPreValidationError.ProjectRunningOnBackend`
	`119`	`+ CodeTransformPreValidationError.RemoteRunProject`
`120`	`120`	`)`
`121`	`121`	`)`
`122`	`122`	`}`
`@@ -126,7 +126,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo`
`126`	`126`	`false,`
`127`	`127`	`message("codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in"),`
`128`	`128`	`InvalidTelemetryReason(`
`129`		`- CodeTransformPreValidationError.NonSSOLogin`
	`129`	`+ CodeTransformPreValidationError.NonSsoLogin`
`130`	`130`	`)`
`131`	`131`	`)`
`132`	`132`	`}`
`@@ -136,7 +136,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo`
`136`	`136`	`false,`
`137`	`137`	`message("codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots"),`
`138`	`138`	`InvalidTelemetryReason(`
`139`		`- CodeTransformPreValidationError.EmptyProject`
	`139`	`+ CodeTransformPreValidationError.NoPom`
`140`	`140`	`)`
`141`	`141`	`)`
`142`	`142`	`}`
`@@ -147,7 +147,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo`
`147`	`147`	`false,`
`148`	`148`	`message("codemodernizer.notification.warn.invalid_project.description.reason.invalid_jdk_versions", supportedJavaMappings.keys.joinToString()),`
`149`	`149`	`InvalidTelemetryReason(`
`150`		`- CodeTransformPreValidationError.ProjectSelectedIsNotJava8OrJava11,`
	`150`	`+ CodeTransformPreValidationError.UnsupportedJavaVersion,`
`151`	`151`	`project.tryGetJdk().toString()`
`152`	`152`	`)`
`153`	`153`	`)`
`@@ -160,7 +160,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo`
`160`	`160`	`false,`
`161`	`161`	`message("codemodernizer.notification.warn.invalid_project.description.reason.no_valid_files", supportedBuildFileNames.joinToString()),`
`162`	`162`	`InvalidTelemetryReason(`
`163`		`- CodeTransformPreValidationError.ProjectSelectedIsNotJava8OrJava11,`
	`163`	`+ CodeTransformPreValidationError.NonMavenProject,`
`164`	`164`	`if (isGradleProject(project)) "Gradle build" else "other build"`
`165`	`165`	`)`
`166`	`166`	`)`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() {`
`153`	`153`	`false,`
`154`	`154`	`message("codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in"),`
`155`	`155`	`InvalidTelemetryReason(`
`156`		`- CodeTransformPreValidationError.NonSSOLogin`
	`156`	`+ CodeTransformPreValidationError.NonSsoLogin`
`157`	`157`	`)`
`158`	`158`	`)`
`159`	`159`	`assertEquals(expectedResult, result)`