Merge master into feature/q-dev-execution

aws-toolkit-automation · web-flow · commit 56afdf8b3ecd · 2024-11-07T14:46:42.000+01:00
diff --git a/packages/core/src/amazonq/messages/chatMessageDuration.ts b/packages/core/src/amazonq/messages/chatMessageDuration.ts
@@ -96,7 +96,12 @@ export class AmazonQChatMessageDuration {
                 })
             }
 
-            CWCTelemetryHelper.instance.emitAddMessage(tabID, totalDuration, metrics.events.chatMessageSent)
+            CWCTelemetryHelper.instance.emitAddMessage(
+                tabID,
+                totalDuration,
+                metrics.traceId,
+                metrics.events.chatMessageSent
+            )
 
             uiEventRecorder.delete(tabID)
         })
diff --git a/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts b/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts
@@ -420,7 +420,7 @@ export class CWCTelemetryHelper {
         })
     }
 
-    public emitAddMessage(tabID: string, fullDisplayLatency: number, startTime?: number) {
+    public emitAddMessage(tabID: string, fullDisplayLatency: number, traceId: string, startTime?: number) {
         const payload = this.messageStorage.get(tabID)
         if (!payload) {
             return
@@ -464,6 +464,7 @@ export class CWCTelemetryHelper {
             credentialStartUrl: AuthUtil.instance.startUrl,
             codewhispererCustomizationArn: triggerPayload.customization.arn,
             cwsprChatHasProjectContext: hasProjectLevelContext,
+            traceId,
         }
 
         telemetry.amazonq_addMessage.emit(event)

Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ export class CWCTelemetryHelper {`
`420`	`420`	`})`
`421`	`421`	`}`
`422`	`422`
`423`		`- public emitAddMessage(tabID: string, fullDisplayLatency: number, startTime?: number) {`
	`423`	`+ public emitAddMessage(tabID: string, fullDisplayLatency: number, traceId: string, startTime?: number) {`
`424`	`424`	`const payload = this.messageStorage.get(tabID)`
`425`	`425`	`if (!payload) {`
`426`	`426`	`return`
`@@ -464,6 +464,7 @@ export class CWCTelemetryHelper {`
`464`	`464`	`credentialStartUrl: AuthUtil.instance.startUrl,`
`465`	`465`	`codewhispererCustomizationArn: triggerPayload.customization.arn,`
`466`	`466`	`cwsprChatHasProjectContext: hasProjectLevelContext,`
	`467`	`+ traceId,`
`467`	`468`	`}`
`468`	`469`
`469`	`470`	`telemetry.amazonq_addMessage.emit(event)`