Telemetry: UTG send plaintext instead of python in amazonq_utgGenerateTests event

Author: laileni-aws

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

@@ -246,7 +246,7 @@ export class TestController {
             cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext',
             jobId: session.listOfTestGenerationJobId[0], // For RIV, UTG does only one StartTestGeneration API call
             jobGroup: session.testGenerationJobGroupName,
-            requestId: session.requestId,
+            requestId: session.startTestGenerationRequestId,
             hasUserPromptSupplied: session.hasUserPromptSupplied,
             isCodeBlockSelected: session.isCodeBlockSelected,
             buildPayloadBytes: session.srcPayloadSize,
@@ -726,7 +726,7 @@ export class TestController {
             cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext',
             jobId: session.listOfTestGenerationJobId[0], // For RIV, UTG does only one StartTestGeneration API call so jobId = session.listOfTestGenerationJobId[0]
             jobGroup: session.testGenerationJobGroupName,
-            requestId: session.requestId,
+            requestId: session.startTestGenerationRequestId,
             buildPayloadBytes: session.srcPayloadSize,
             buildZipFileBytes: session.srcZipFileSize,
             artifactsUploadDuration: session.artifactsUploadDuration,
@@ -850,7 +850,7 @@ export class TestController {
                 cwsprChatProgrammingLanguage: session.fileLanguage ?? 'plaintext',
                 jobId: session.listOfTestGenerationJobId[0], // For RIV, UTG does only one StartTestGeneration API call so jobId = session.listOfTestGenerationJobId[0]
                 jobGroup: session.testGenerationJobGroupName,
-                requestId: session.requestId,
+                requestId: session.startTestGenerationRequestId,
                 buildPayloadBytes: session.srcPayloadSize,
                 buildZipFileBytes: session.srcZipFileSize,
                 artifactsUploadDuration: session.artifactsUploadDuration,

packages/core/src/amazonqTest/chat/session/session.ts

@@ -31,7 +31,7 @@ export class Session {
     //This is unique per each test generation cycle
     public testGenerationJobGroupName: string | undefined = undefined
     public listOfTestGenerationJobId: string[] = []
-    public requestId: string | undefined = undefined
+    public startTestGenerationRequestId: string | undefined = undefined
     public testGenerationJob: TestGenerationJob | undefined
 
     // Start Test generation

packages/core/src/codewhisperer/service/testGenHandler.ts

@@ -94,13 +94,13 @@ export async function createTestJob(
     logger.debug('target line range end: %O', firstTargetLineRangeList?.end)
 
     const resp = await codewhispererClient.codeWhispererClient.startTestGeneration(req).catch((err) => {
-        ChatSessionManager.Instance.getSession().requestId = err.requestId
+        ChatSessionManager.Instance.getSession().startTestGenerationRequestId = err.requestId
         logger.error(`Failed creating test job. Request id: ${err.requestId}`)
         throw err
     })
     logger.info('Unit test generation request id: %s', resp.$response.requestId)
     logger.debug('Unit test generation data: %O', resp.$response.data)
-    ChatSessionManager.Instance.getSession().requestId = resp.$response.requestId
+    ChatSessionManager.Instance.getSession().startTestGenerationRequestId = resp.$response.requestId
     if (resp.$response.error) {
         logger.error('Unit test generation error: %O', resp.$response.error)
     }