Merge pull request #5362 from Will-ShaoHua/chat-custom

feat(chat): chat customization telemetry

Author: jpinkney-aws

packages/core/src/codewhisperer/client/user-service-2.json

@@ -399,6 +399,7 @@
             "members": {
                 "conversationId": { "shape": "ConversationId" },
                 "messageId": { "shape": "MessageId" },
+                "customizationArn": { "shape": "CustomizationArn" },
                 "userIntent": { "shape": "UserIntent" },
                 "hasCodeSnippet": { "shape": "Boolean" },
                 "programmingLanguage": { "shape": "ProgrammingLanguage" },
@@ -425,6 +426,7 @@
             "members": {
                 "conversationId": { "shape": "ConversationId" },
                 "messageId": { "shape": "MessageId" },
+                "customizationArn": { "shape": "CustomizationArn" },
                 "interactionType": { "shape": "ChatMessageInteractionType" },
                 "interactionTarget": { "shape": "ChatInteractWithMessageEventInteractionTargetString" },
                 "acceptedCharacterCount": { "shape": "Integer" },
@@ -471,6 +473,7 @@
             "required": ["conversationId", "messageId", "modificationPercentage"],
             "members": {
                 "conversationId": { "shape": "ConversationId" },
+                "customizationArn": { "shape": "CustomizationArn" },
                 "messageId": { "shape": "MessageId" },
                 "programmingLanguage": { "shape": "ProgrammingLanguage" },
                 "modificationPercentage": { "shape": "Double" },

packages/core/src/codewhisperer/tracker/codewhispererTracker.ts

@@ -15,6 +15,8 @@ import { InsertedCode } from '../../codewhispererChat/controllers/chat/model'
 import { codeWhispererClient } from '../client/codewhisperer'
 import { logSendTelemetryEventFailure } from '../../codewhispererChat/controllers/chat/telemetryHelper'
 import { Timeout } from '../../shared/utilities/timeoutUtils'
+import { getSelectedCustomization } from '../util/customizationUtil'
+import { undefinedIfEmpty } from '../../shared'
 
 /**
  * This singleton class is mainly used for calculating the percentage of user modification.
@@ -88,6 +90,7 @@ export class CodeWhispererTracker {
 
     public async emitTelemetryOnSuggestion(suggestion: AcceptedSuggestionEntry | InsertedCode) {
         let percentage = 1.0
+
         try {
             if (suggestion.fileUrl?.scheme !== '') {
                 const document = await vscode.workspace.openTextDocument(suggestion.fileUrl)
@@ -118,6 +121,7 @@ export class CodeWhispererTracker {
                                 conversationId: event.cwsprChatConversationId,
                                 messageId: event.cwsprChatMessageId,
                                 modificationPercentage: event.cwsprChatModificationPercentage,
+                                customizationArn: undefinedIfEmpty(getSelectedCustomization().arn),
                             },
                         },
                     })

packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts

@@ -34,6 +34,8 @@ import { isAwsError } from '../../../shared/errors'
 import { ChatMessageInteractionType } from '../../../codewhisperer/client/codewhispereruserclient'
 import { supportedLanguagesList } from '../chat/chatRequest/converter'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
+import { getSelectedCustomization } from '../../../codewhisperer/util/customizationUtil'
+import { undefinedIfEmpty } from '../../../shared'
 
 export function logSendTelemetryEventFailure(error: any) {
     let requestId: string | undefined
@@ -258,6 +260,7 @@ export class CWCTelemetryHelper {
                         acceptedLineCount: event.cwsprChatAcceptedNumberOfLines,
                         acceptedSnippetHasReference: false,
                         hasProjectLevelContext: this.responseWithProjectContext.get(event.cwsprChatMessageId),
+                        customizationArn: undefinedIfEmpty(getSelectedCustomization().arn),
                     },
                 },
             })
@@ -381,6 +384,7 @@ export class CWCTelemetryHelper {
                         hasProjectLevelContext: triggerPayload.relevantTextDocuments
                             ? triggerPayload.relevantTextDocuments.length > 0
                             : false,
+                        customizationArn: undefinedIfEmpty(getSelectedCustomization().arn),
                     },
                 },
             })