fix: add requestIds for each LLM call for amazonq_addMessage metric (#1338)

Author: chungjac

server/aws-lsp-codewhisperer/src/language-server/agenticChat/agenticChatController.ts

@@ -578,6 +578,12 @@ export class AgenticChatController implements ChatHandlers {
             // Phase 3: Request Execution
             this.#truncateRequest(currentRequestInput)
             const response = await session.generateAssistantResponse(currentRequestInput)
+
+            if (response.$metadata.requestId) {
+                metric.mergeWith({
+                    requestIds: [response.$metadata.requestId],
+                })
+            }
             this.#features.logging.info(
                 `generateAssistantResponse ResponseMetadata: ${loggingUtils.formatObj(response.$metadata)}`
             )
@@ -665,6 +671,7 @@ export class AgenticChatController implements ChatHandlers {
                     shouldDisplayMessage = false
                 }
                 metric.setDimension('cwsprChatConversationType', 'AgenticChatWithToolUse')
+                metric.setDimension('requestIds', metric.metric.requestIds)
             } else {
                 // Send an error card to UI?
                 toolResults = pendingToolUses.map(toolUse => ({

server/aws-lsp-codewhisperer/src/language-server/chat/telemetry/chatTelemetryController.ts

@@ -242,6 +242,7 @@ export class ChatTelemetryController {
                 cwsprChatCodeContextCount: metric.cwsprChatCodeContextCount,
                 cwsprChatFocusFileContextLength: metric.cwsprChatFocusFileContextLength,
                 languageServerVersion: metric.languageServerVersion,
+                requestIds: metric.requestIds,
             }
         )
     }

server/aws-lsp-codewhisperer/src/shared/telemetry/telemetryService.test.ts

@@ -801,6 +801,7 @@ describe('TelemetryService', () => {
                     codewhispererCustomizationArn: 'cust-123',
                     result: 'Succeeded',
                     languageServerVersion: undefined,
+                    requestIds: undefined,
                     cwsprChatHasContextList: true,
                     cwsprChatFolderContextCount: 0,
                     cwsprChatFileContextCount: 0,

server/aws-lsp-codewhisperer/src/shared/telemetry/telemetryService.ts

@@ -457,12 +457,15 @@ export class TelemetryService {
             cwsprChatCodeContextLength: number
             cwsprChatFocusFileContextLength: number
             languageServerVersion?: string
+            requestIds?: string[]
         }>
     ) {
         if (!params.conversationId || !params.messageId) {
             return
         }
         const timeBetweenChunks = params.timeBetweenChunks?.slice(0, 100)
+        // truncate requestIds if longer than 875 so it does not go over field limit
+        const truncatedRequestIds = additionalParams.requestIds?.slice(0, 875)
 
         if (this.enableTelemetryEventsToDestination) {
             this.telemetry.emitMetric({
@@ -502,6 +505,7 @@ export class TelemetryService {
                     cwsprChatCodeContextLength: additionalParams.cwsprChatCodeContextLength,
                     result: 'Succeeded',
                     languageServerVersion: additionalParams.languageServerVersion,
+                    requestIds: truncatedRequestIds,
                 },
             })
         }

server/aws-lsp-codewhisperer/src/shared/telemetry/types.ts

@@ -250,6 +250,7 @@ export type AddMessageEvent = {
     cwsprChatConversationType: ChatConversationType
     codewhispererCustomizationArn?: string
     languageServerVersion?: string
+    requestIds?: string[]
 
     // context related metrics
     cwsprChatHasContextList?: boolean