Fix comment

Author: siakmun-aws

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerExtensions.kt

@@ -72,8 +72,8 @@ suspend fun FeatureDevController.onCodeGeneration(
         messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.generating_code"))
 
         session.sendMetricDataTelemetry(
-            MetricDataOperationName.START_CODE_GENERATION.toString(),
-            MetricDataResult.SUCCESS.toString()
+            MetricDataOperationName.START_CODE_GENERATION,
+            MetricDataResult.SUCCESS
         )
 
         session.send(message) // Trigger code generation
@@ -147,56 +147,51 @@ suspend fun FeatureDevController.onCodeGeneration(
         }
 
         messenger.sendSystemPrompt(tabId = tabId, followUp = getFollowUpOptions(session.sessionState.phase, InsertAction.ALL))
-
-        session.sendMetricDataTelemetry(
-            MetricDataOperationName.END_CODE_GENERATION.toString(),
-            MetricDataResult.SUCCESS.toString()
-        )
         messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.after_code_generation"))
     } catch (err: FeatureDevException) {
         when (true) {
             (err is GuardrailsException) -> {
                 session.sendMetricDataTelemetry(
-                    MetricDataOperationName.END_CODE_GENERATION.toString(),
-                    MetricDataResult.ERROR.toString()
+                    MetricDataOperationName.END_CODE_GENERATION,
+                    MetricDataResult.ERROR
                 )
             }
             (err is PromptRefusalException) -> {
                 session.sendMetricDataTelemetry(
-                    MetricDataOperationName.END_CODE_GENERATION.toString(),
-                    MetricDataResult.ERROR.toString()
+                    MetricDataOperationName.END_CODE_GENERATION,
+                    MetricDataResult.ERROR
                 )
             }
             (err is EmptyPatchException) -> {
                 session.sendMetricDataTelemetry(
-                    MetricDataOperationName.END_CODE_GENERATION.toString(),
-                    MetricDataResult.LLMFAILURE.toString()
+                    MetricDataOperationName.END_CODE_GENERATION,
+                    MetricDataResult.LLMFAILURE
                 )
             }
             (err is NoChangeRequiredException) -> {
                 session.sendMetricDataTelemetry(
-                    MetricDataOperationName.END_CODE_GENERATION.toString(),
-                    MetricDataResult.ERROR.toString()
+                    MetricDataOperationName.END_CODE_GENERATION,
+                    MetricDataResult.ERROR
                 )
             }
             (err is ThrottlingException) -> {
                 session.sendMetricDataTelemetry(
-                    MetricDataOperationName.END_CODE_GENERATION.toString(),
-                    MetricDataResult.ERROR.toString()
+                    MetricDataOperationName.END_CODE_GENERATION,
+                    MetricDataResult.ERROR
                 )
             }
             else -> {
                 session.sendMetricDataTelemetry(
-                    MetricDataOperationName.END_CODE_GENERATION.toString(),
-                    MetricDataResult.FAULT.toString()
+                    MetricDataOperationName.END_CODE_GENERATION,
+                    MetricDataResult.FAULT
                 )
             }
         }
         throw err
     } catch (err: Exception) {
         session.sendMetricDataTelemetry(
-            MetricDataOperationName.END_CODE_GENERATION.toString(),
-            MetricDataResult.FAULT.toString()
+            MetricDataOperationName.END_CODE_GENERATION,
+            MetricDataResult.FAULT
         )
         throw err
     } finally {
@@ -218,6 +213,11 @@ suspend fun FeatureDevController.onCodeGeneration(
             )
         }
     }
+
+    session.sendMetricDataTelemetry(
+        MetricDataOperationName.END_CODE_GENERATION,
+        MetricDataResult.SUCCESS
+    )
 }
 
 private suspend fun disposeToken(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt

@@ -14,6 +14,8 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CODE_GENERATIO
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ConversationIdNotFoundException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MAX_PROJECT_SIZE_BYTES
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MetricDataOperationName
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MetricDataResult
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.IncomingFeatureDevMessage
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendAsyncEventProgress
@@ -219,8 +221,8 @@ class Session(val tabID: String, val project: Project) {
         this._codeResultMessageId = null
     }
 
-    fun sendMetricDataTelemetry(operationName: String, result: String) {
-        featureDevService.sendFeatureDevMetricData(operationName, result)
+    fun sendMetricDataTelemetry(operationName: MetricDataOperationName, result: MetricDataResult) {
+        featureDevService.sendFeatureDevMetricData(operationName.toString(), result.toString())
     }
 
     suspend fun send(msg: String): Interaction {

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerTest.kt

@@ -462,13 +462,13 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
         val mockInOrder = inOrder(mockSession)
 
         mockInOrder.verify(mockSession).sendMetricDataTelemetry(
-            MetricDataOperationName.START_CODE_GENERATION.toString(),
-            MetricDataResult.SUCCESS.toString()
+            MetricDataOperationName.START_CODE_GENERATION,
+            MetricDataResult.SUCCESS
 
         )
         mockInOrder.verify(mockSession).sendMetricDataTelemetry(
-            MetricDataOperationName.END_CODE_GENERATION.toString(),
-            MetricDataResult.SUCCESS.toString()
+            MetricDataOperationName.END_CODE_GENERATION,
+            MetricDataResult.SUCCESS
         )
     }
 
@@ -530,13 +530,13 @@ class FeatureDevControllerTest : FeatureDevTestBase() {
             val mockInOrder = inOrder(mockSession)
 
             mockInOrder.verify(mockSession).sendMetricDataTelemetry(
-                MetricDataOperationName.START_CODE_GENERATION.toString(),
-                MetricDataResult.SUCCESS.toString()
+                MetricDataOperationName.START_CODE_GENERATION,
+                MetricDataResult.SUCCESS
 
             )
             mockInOrder.verify(mockSession).sendMetricDataTelemetry(
-                MetricDataOperationName.END_CODE_GENERATION.toString(),
-                expectedResult.toString()
+                MetricDataOperationName.END_CODE_GENERATION,
+                expectedResult
             )
         }
     }