fix(amazonq): do not include plan generation and code generation durations in createUpload telemetry event for /dev (#4462)

Author: sarayev

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

@@ -36,6 +36,7 @@ class PrepareCodeGenerationState(
         var result: Result = Result.Succeeded
         var failureReason: String? = null
         var zipFileLength: Long? = null
+        val nextState: SessionState
         try {
             val repoZipResult = config.repoContext.getProjectZip()
             val zipFileChecksum = repoZipResult.checksum
@@ -49,10 +50,11 @@ class PrepareCodeGenerationState(
             )
 
             uploadArtifactToS3(uploadUrlResponse.uploadUrl(), fileToUpload, zipFileChecksum, zipFileLength, uploadUrlResponse.kmsKeyArn())
+            deleteUploadArtifact(fileToUpload)
 
             this.uploadId = uploadUrlResponse.uploadId()
 
-            val nextState = CodeGenerationState(
+            nextState = CodeGenerationState(
                 tabID = this.tabID,
                 approach = "", // No approach needed,
                 config = this.config,
@@ -61,9 +63,6 @@ class PrepareCodeGenerationState(
                 repositorySize = zipFileLength.toDouble(),
                 messenger = messenger
             )
-            deleteUploadArtifact(fileToUpload)
-
-            return nextState.interact(action)
         } catch (e: Exception) {
             result = Result.Failed
             failureReason = e.javaClass.simpleName
@@ -80,5 +79,7 @@ class PrepareCodeGenerationState(
                 credentialStartUrl = getStartUrl(config.featureDevService.project)
             )
         }
+        // It is essential to interact with the next state outside of try-catch block for  the telemetry to capture events for the states separately
+        return nextState.interact(action)
     }
 }

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

@@ -24,6 +24,7 @@ class PrepareRefinementState(
         var result: Result = Result.Succeeded
         var failureReason: String? = null
         var zipFileLength: Long? = null
+        val nextState: SessionState
         try {
             val repoZipResult = config.repoContext.getProjectZip()
             val zipFileChecksum = repoZipResult.checksum
@@ -37,11 +38,9 @@ class PrepareRefinementState(
             )
 
             uploadArtifactToS3(uploadUrlResponse.uploadUrl(), fileToUpload, zipFileChecksum, zipFileLength, uploadUrlResponse.kmsKeyArn())
-
             deleteUploadArtifact(fileToUpload)
 
-            val nextState = RefinementState(approach, tabID, config, uploadUrlResponse.uploadId(), 0)
-            return nextState.interact(action)
+            nextState = RefinementState(approach, tabID, config, uploadUrlResponse.uploadId(), 0)
         } catch (e: Exception) {
             result = Result.Failed
             failureReason = e.javaClass.simpleName
@@ -58,5 +57,7 @@ class PrepareRefinementState(
                 credentialStartUrl = getStartUrl(config.featureDevService.project)
             )
         }
+        // It is essential to interact with the next state outside of try-catch block for  the telemetry to capture events for the states separately
+        return nextState.interact(action)
     }
 }