Merge branch 'refactor-telemetry' of github.com:chungjac/aws-toolkit-jetbrains into refactor-telemetry

Author: chungjac

.changes/next-release/bugfix-3e9ee812-d817-4c0d-9389-7b32d4049441.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix incorrect text shown while updating documentation in /doc"
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -22,6 +22,7 @@ import kotlinx.coroutines.future.await
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
+import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory
 import software.amazon.awssdk.services.codewhispererruntime.model.Position
 import software.amazon.awssdk.services.codewhispererruntime.model.Range
 import software.amazon.awssdk.services.codewhispererruntime.model.Reference
@@ -571,6 +572,7 @@ class CodeTestChatController(
                     session.testGenerationJob,
                     session.testGenerationJobGroupName,
                     session.programmingLanguage,
+                    IdeCategory.JETBRAINS,
                     session.numberOfUnitTestCasesGenerated,
                     session.numberOfUnitTestCasesGenerated,
                     session.linesOfCodeGenerated,
@@ -766,6 +768,7 @@ class CodeTestChatController(
                     session.testGenerationJob,
                     session.testGenerationJobGroupName,
                     session.programmingLanguage,
+                    IdeCategory.JETBRAINS,
                     session.numberOfUnitTestCasesGenerated,
                     0,
                     session.linesOfCodeGenerated,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt

@@ -110,7 +110,7 @@ fun getIconForStep(targetStep: DocGenerationStep, currentStep: DocGenerationStep
     else -> checkIcons["wait"]
 }
 
-fun docGenerationProgressMessage(currentStep: DocGenerationStep, mode: Mode): String {
+fun docGenerationProgressMessage(currentStep: DocGenerationStep, mode: Mode?): String {
     val isCreationMode = mode == Mode.CREATE
     val baseLine = if (isCreationMode) message("amazonqDoc.progress_message.creating") else message("amazonqDoc.progress_message.updating")
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/DocGenerationState.kt

@@ -64,8 +64,8 @@ class DocGenerationState(
                 message = action.msg,
                 intent = Intent.DOC
             )
-
-            val codeGenerationResult = generateCode(codeGenerationId = response.codeGenerationId(), token)
+            val mode = if (action.msg == message("amazonqDoc.session.create")) Mode.CREATE else null
+            val codeGenerationResult = generateCode(codeGenerationId = response.codeGenerationId(), mode, token)
             numberOfReferencesGenerated = codeGenerationResult.references.size
             numberOfFilesGenerated = codeGenerationResult.newFiles.size
             codeGenerationRemainingIterationCount = codeGenerationResult.codeGenerationRemainingIterationCount
@@ -138,7 +138,7 @@ fun getFileSummaryPercentage(input: String): Double {
     return percentage
 }
 
-private suspend fun DocGenerationState.generateCode(codeGenerationId: String, token: CancellationTokenSource?): CodeGenerationResult {
+private suspend fun DocGenerationState.generateCode(codeGenerationId: String, mode: Mode?, token: CancellationTokenSource?): CodeGenerationResult {
     val pollCount = 180
     val requestDelay = 10000L
 
@@ -214,7 +214,7 @@ private suspend fun DocGenerationState.generateCode(codeGenerationId: String, to
                             } else {
                                 DocGenerationStep.GENERATING_ARTIFACTS
                             },
-                            mode = Mode.CREATE
+                            mode
                         )
                     )
                 }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt

@@ -27,6 +27,7 @@ import software.amazon.awssdk.services.codewhispererruntime.model.GenerateComple
 import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeFixJobRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeFixJobResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.GetTestGenerationResponse
+import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory
 import software.amazon.awssdk.services.codewhispererruntime.model.InlineChatUserDecision
 import software.amazon.awssdk.services.codewhispererruntime.model.ListAvailableCustomizationsRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.ListFeatureEvaluationsResponse
@@ -199,6 +200,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         jobId: String,
         groupName: String,
         language: CodeWhispererProgrammingLanguage?,
+        ideCategory: IdeCategory?,
         numberOfUnitTestCasesGenerated: Int?,
         numberOfUnitTestCasesAccepted: Int?,
         linesOfCodeGenerated: Int?,
@@ -668,6 +670,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         jobId: String,
         groupName: String,
         language: CodeWhispererProgrammingLanguage?,
+        ideCategory: IdeCategory?,
         numberOfUnitTestCasesGenerated: Int?,
         numberOfUnitTestCasesAccepted: Int?,
         linesOfCodeGenerated: Int?,
@@ -682,6 +685,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 }
                 it.jobId(jobId)
                 it.groupName(groupName)
+                it.ideCategory(ideCategory)
                 it.numberOfUnitTestCasesGenerated(numberOfUnitTestCasesGenerated)
                 it.numberOfUnitTestCasesAccepted(numberOfUnitTestCasesAccepted)
                 it.linesOfCodeGenerated(linesOfCodeGenerated)