Merge master into feature/postreinvent

Author: aws-toolkit-automation

packages/core/src/amazonq/webview/ui/quickActions/generator.ts

@@ -86,7 +86,7 @@ export class QuickActionGenerator {
                         ? [
                               {
                                   command: '/transform',
-                                  description: 'Transform your Java 8 or 11 Maven project to Java 17',
+                                  description: 'Transform your Java 8, 11, or 17 Maven projects',
                                   icon: MynahIcons.TRANSFORM,
                               },
                           ]

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -411,31 +411,40 @@ export class GumbyController {
     }
 
     private async handleSkipTestsSelection(message: any) {
-        const skipTestsSelection = message.formSelectedValues['GumbyTransformSkipTestsForm']
-        if (skipTestsSelection === CodeWhispererConstants.skipUnitTestsMessage) {
-            transformByQState.setCustomBuildCommand(CodeWhispererConstants.skipUnitTestsBuildCommand)
-        } else {
-            transformByQState.setCustomBuildCommand(CodeWhispererConstants.doNotSkipUnitTestsBuildCommand)
-        }
-        telemetry.codeTransform_submitSelection.emit({
-            codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
-            userChoice: skipTestsSelection,
-            result: MetadataResult.Pass,
+        await telemetry.codeTransform_submitSelection.run(async () => {
+            const skipTestsSelection = message.formSelectedValues['GumbyTransformSkipTestsForm']
+            if (skipTestsSelection === CodeWhispererConstants.skipUnitTestsMessage) {
+                transformByQState.setCustomBuildCommand(CodeWhispererConstants.skipUnitTestsBuildCommand)
+            } else {
+                transformByQState.setCustomBuildCommand(CodeWhispererConstants.doNotSkipUnitTestsBuildCommand)
+            }
+            telemetry.record({
+                codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                userChoice: skipTestsSelection,
+            })
+            this.messenger.sendSkipTestsSelectionMessage(skipTestsSelection, message.tabID)
+            await this.messenger.sendOneOrMultipleDiffsPrompt(message.tabID)
         })
-        this.messenger.sendSkipTestsSelectionMessage(skipTestsSelection, message.tabID)
-        await this.messenger.sendOneOrMultipleDiffsPrompt(message.tabID)
     }
 
     private async handleOneOrMultipleDiffs(message: any) {
-        const oneOrMultipleDiffsSelection = message.formSelectedValues['GumbyTransformOneOrMultipleDiffsForm']
-        if (oneOrMultipleDiffsSelection === CodeWhispererConstants.multipleDiffsMessage) {
-            transformByQState.setMultipleDiffs(true)
-        } else {
-            transformByQState.setMultipleDiffs(false)
-        }
-        this.messenger.sendOneOrMultipleDiffsMessage(oneOrMultipleDiffsSelection, message.tabID)
-        // perform local build
-        await this.validateBuildWithPromptOnError(message)
+        await telemetry.codeTransform_submitSelection.run(async () => {
+            const oneOrMultipleDiffsSelection = message.formSelectedValues['GumbyTransformOneOrMultipleDiffsForm']
+            if (oneOrMultipleDiffsSelection === CodeWhispererConstants.multipleDiffsMessage) {
+                transformByQState.setMultipleDiffs(true)
+            } else {
+                transformByQState.setMultipleDiffs(false)
+            }
+
+            telemetry.record({
+                codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                userChoice: oneOrMultipleDiffsSelection,
+            })
+
+            this.messenger.sendOneOrMultipleDiffsMessage(oneOrMultipleDiffsSelection, message.tabID)
+            // perform local build
+            await this.validateBuildWithPromptOnError(message)
+        })
     }
 
     private async handleUserLanguageUpgradeProjectChoice(message: any) {