Adding requestId for amazonq_utgGenerateTests event

Author: laileni-aws

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

@@ -124,6 +124,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
         )
 
         val job = startTestGenerationResponse.testGenerationJob()
+        session.startTestGenerationRequestId = startTestGenerationResponse.responseMetadata().requestId()
         session.testGenerationJobGroupName = job.testGenerationJobGroupName()
         session.testGenerationJob = job.testGenerationJobId()
         throwIfCancelled(session)
@@ -522,7 +523,8 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     isCodeBlockSelected = session.isCodeBlockSelected,
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
-                    buildZipFileBytes = session.srcZipFileSize
+                    buildZipFileBytes = session.srcZipFileSize,
+                    requestId = session.startTestGenerationRequestId
                 )
                 session.isGeneratingTests = false
             } finally {

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

@@ -282,14 +282,18 @@ class CodeTestChatController(
             val request = requestData.toChatRequest()
             client.generateAssistantResponse(request, responseHandler).await()
             // TODO: Need to send isCodeBlockSelected field
-            AmazonqTelemetry.utgGenerateTests(
-                cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
-                hasUserPromptSupplied = session.hasUserPromptSupplied,
-                isSupportedLanguage = false,
-                credentialStartUrl = getStartUrl(project),
-                result = MetricResult.Succeeded,
-                perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration)
-            )
+            requestId.let { id ->
+                LOG.debug { "$FEATURE_NAME: Unit test generation requestId: $id" }
+                AmazonqTelemetry.utgGenerateTests(
+                    cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                    hasUserPromptSupplied = session.hasUserPromptSupplied,
+                    isSupportedLanguage = false,
+                    credentialStartUrl = getStartUrl(project),
+                    result = MetricResult.Succeeded,
+                    perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
+                    requestId = id
+                )
+            }
             session.isGeneratingTests = false
             codeTestChatHelper.updateUI(
                 loadingChat = false,
@@ -599,7 +603,8 @@ class CodeTestChatController(
                     isCodeBlockSelected = session.isCodeBlockSelected,
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
-                    buildZipFileBytes = session.srcZipFileSize
+                    buildZipFileBytes = session.srcZipFileSize,
+                    requestId = session.startTestGenerationRequestId
                 )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
@@ -792,7 +797,8 @@ class CodeTestChatController(
                     isCodeBlockSelected = session.isCodeBlockSelected,
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
-                    buildZipFileBytes = session.srcZipFileSize
+                    buildZipFileBytes = session.srcZipFileSize,
+                    requestId = session.startTestGenerationRequestId
                 )
                 sessionCleanUp(message.tabId)
             }

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

@@ -20,6 +20,7 @@ data class Session(val tabId: String) {
     var programmingLanguage: CodeWhispererProgrammingLanguage = CodeWhispererUnknownLanguage.INSTANCE
     var testGenerationJob: String = ""
     var testGenerationJobGroupName: String = ""
+    var startTestGenerationRequestId: String = ""
 
     // Telemetry
     var hasUserPromptSupplied: Boolean = false