Merge master into feature/serverlessland

Author: aws-toolkit-automation

package-lock.json

@@ -40,7 +40,7 @@
         "mergeReports": "ts-node ./scripts/mergeReports.ts"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.295",
+        "@aws-toolkits/telemetry": "^1.0.296",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -35,6 +35,7 @@ export function init(appContext: AmazonQAppInitContext) {
         processResponseBodyLinkClick: new vscode.EventEmitter<any>(),
         fileClicked: new vscode.EventEmitter<any>(),
         scanCancelled: new vscode.EventEmitter<any>(),
+        processChatItemVotedMessage: new vscode.EventEmitter<any>(),
     }
     const dispatcher = new AppToWebViewMessageDispatcher(appContext.getAppsToWebViewMessagePublisher())
     const messenger = new Messenger(dispatcher)

packages/amazonq/src/app/amazonqScan/app.ts

@@ -32,6 +32,7 @@ import {
     scanSummaryMessage,
 } from '../../models/constants'
 import path from 'path'
+import { telemetry } from 'aws-core-vscode/telemetry'
 
 export class ScanController {
     private readonly messenger: Messenger
@@ -98,6 +99,15 @@ export class ScanController {
         this.chatControllerMessageListeners.scanCancelled.event((data) => {
             return this.handleScanCancelled(data)
         })
+
+        this.chatControllerMessageListeners.processChatItemVotedMessage.event((data) => {
+            telemetry.amazonq_feedback.emit({
+                featureId: 'amazonQReview',
+                amazonqConversationId: this.sessionStorage.getSession().scanUuid,
+                credentialStartUrl: AuthUtil.instance.startUrl,
+                interactionType: data.vote,
+            })
+        })
     }
 
     private async tabOpened(message: any) {

packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts

@@ -55,6 +55,9 @@ export class UIMessageListener {
             case 'file-click':
                 this.processFileClick(msg)
                 break
+            case 'chat-item-voted':
+                this.chatItemVoted(msg)
+                break
         }
     }
 
@@ -112,4 +115,12 @@ export class UIMessageListener {
             filePath: msg.filePath,
         })
     }
+
+    private chatItemVoted(msg: any) {
+        this.scanControllerEventsEmitters?.processChatItemVotedMessage.fire({
+            tabID: msg.tabID,
+            command: msg.command,
+            vote: msg.vote,
+        })
+    }
 }

packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts

@@ -602,6 +602,9 @@ export class Connector {
             case 'featuredev':
                 this.featureDevChatConnector.sendFeedback(tabId, feedbackPayload)
                 break
+            case 'testgen':
+                this.testChatConnector.onSendFeedback(tabId, feedbackPayload)
+                break
             case 'cwc':
                 this.cwChatConnector.onSendFeedback(tabId, feedbackPayload)
                 break

packages/core/src/amazonq/webview/ui/connector.ts

@@ -30,4 +30,5 @@ export interface ScanChatControllerEventEmitters {
     readonly processResponseBodyLinkClick: vscode.EventEmitter<any>
     readonly fileClicked: vscode.EventEmitter<any>
     readonly scanCancelled: vscode.EventEmitter<any>
+    readonly processChatItemVotedMessage: vscode.EventEmitter<any>
 }

packages/core/src/amazonqScan/controller.ts

@@ -32,6 +32,8 @@ export function init(appContext: AmazonQAppInitContext) {
         errorThrown: new vscode.EventEmitter<any>(),
         insertCodeAtCursorPosition: new vscode.EventEmitter<any>(),
         processResponseBodyLinkClick: new vscode.EventEmitter<any>(),
+        processChatItemVotedMessage: new vscode.EventEmitter<any>(),
+        processChatItemFeedbackMessage: new vscode.EventEmitter<any>(),
     }
     const dispatcher = new AppToWebViewMessageDispatcher(appContext.getAppsToWebViewMessagePublisher())
     const messenger = new Messenger(dispatcher)

packages/core/src/amazonqTest/app.ts

@@ -36,13 +36,14 @@ import {
 import { UserIntent } from '@amzn/codewhisperer-streaming'
 import { getSelectedCustomization } from '../../../codewhisperer/util/customizationUtil'
 import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient'
-import { ChatTriggerType } from '../../../codewhispererChat/controllers/chat/model'
+import { ChatItemVotedMessage, ChatTriggerType } from '../../../codewhispererChat/controllers/chat/model'
 import { triggerPayloadToChatRequest } from '../../../codewhispererChat/controllers/chat/chatRequest/converter'
 import { EditorContentController } from '../../../amazonq/commons/controllers/contentController'
 import { amazonQTabSuffix } from '../../../shared/constants'
 import { applyChanges } from '../../../shared/utilities/textDocumentUtilities'
 import { telemetry } from '../../../shared/telemetry/telemetry'
 import { CodeWhispererSettings } from '../../../codewhisperer/util/codewhispererSettings'
+import globals from '../../../shared/extensionGlobals'
 import { openUrl } from '../../../shared/utilities/vsCodeUtils'
 import { getLogger } from '../../../shared/logger/logger'
 import { i18n } from '../../../shared/i18n-helper'
@@ -78,6 +79,8 @@ export interface TestChatControllerEventEmitters {
     readonly errorThrown: vscode.EventEmitter<any>
     readonly insertCodeAtCursorPosition: vscode.EventEmitter<any>
     readonly processResponseBodyLinkClick: vscode.EventEmitter<any>
+    readonly processChatItemVotedMessage: vscode.EventEmitter<any>
+    readonly processChatItemFeedbackMessage: vscode.EventEmitter<any>
 }
 
 type OpenDiffMessage = {
@@ -156,6 +159,18 @@ export class TestController {
             return this.processLink(data)
         })
 
+        this.chatControllerMessageListeners.processChatItemVotedMessage.event((data) => {
+            this.processChatItemVotedMessage(data).catch((e) => {
+                getLogger().error('processChatItemVotedMessage failed: %s', (e as Error).message)
+            })
+        })
+
+        this.chatControllerMessageListeners.processChatItemFeedbackMessage.event((data) => {
+            this.processChatItemFeedbackMessage(data).catch((e) => {
+                getLogger().error('processChatItemFeedbackMessage failed: %s', (e as Error).message)
+            })
+        })
+
         this.chatControllerMessageListeners.followUpClicked.event((data) => {
             switch (data.followUp.type) {
                 case FollowUpTypes.ViewDiff:
@@ -205,6 +220,31 @@ export class TestController {
         }
     }
 
+    private async processChatItemVotedMessage(message: ChatItemVotedMessage) {
+        const session = this.sessionStorage.getSession()
+
+        telemetry.amazonq_feedback.emit({
+            featureId: 'amazonQTest',
+            amazonqConversationId: session.startTestGenerationRequestId,
+            credentialStartUrl: AuthUtil.instance.startUrl,
+            interactionType: message.vote,
+        })
+    }
+
+    private async processChatItemFeedbackMessage(message: any) {
+        const session = this.sessionStorage.getSession()
+
+        await globals.telemetry.postFeedback({
+            comment: `${JSON.stringify({
+                type: 'testgen-chat-answer-feedback',
+                amazonqConversationId: session.startTestGenerationRequestId,
+                reason: message?.selectedOption,
+                userComment: message?.comment,
+            })}`,
+            sentiment: 'Negative',
+        })
+    }
+
     private async tabClosed(data: any) {
         getLogger().debug('Tab closed with data tab id: %s', data.tabID)
         await this.sessionCleanUp()

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

@@ -62,6 +62,12 @@ export class UIMessageListener {
             case 'response-body-link-click':
                 this.processResponseBodyLinkClick(msg)
                 break
+            case 'chat-item-voted':
+                this.chatItemVoted(msg)
+                break
+            case 'chat-item-feedback':
+                this.chatItemFeedback(msg)
+                break
         }
     }
 
@@ -140,4 +146,16 @@ export class UIMessageListener {
             link: msg.link,
         })
     }
+
+    private chatItemVoted(msg: any) {
+        this.testControllerEventsEmitters?.processChatItemVotedMessage.fire({
+            tabID: msg.tabID,
+            command: msg.command,
+            vote: msg.vote,
+        })
+    }
+
+    private chatItemFeedback(msg: any) {
+        this.testControllerEventsEmitters?.processChatItemFeedbackMessage.fire(msg)
+    }
 }