send null/undefined if default customization whose arn is empty string and will cause service throwing validation exception

Author: Will-ShaoHua

packages/core/src/codewhisperer/client/codewhisperer.ts

@@ -265,6 +265,8 @@ export class DefaultCodeWhispererClient {
         }
         const response = await (await this.createUserSdkClient()).sendTelemetryEvent(requestWithCommonFields).promise()
         getLogger().debug(`codewhisperer: sendTelemetryEvent requestID: ${response.$response.requestId}`)
+
+        return response
     }
 
     public async listFeatureEvaluations(): Promise<ListFeatureEvaluationsResponse> {

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

@@ -15,7 +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 { activeCustomizationOrNull } from '../util/customizationUtil'
+import { getSelectedCustomization } from '../util/customizationUtil'
+import { undefinedIfEmpty } from '../../shared'
 
 /**
  * This singleton class is mainly used for calculating the percentage of user modification.
@@ -89,7 +90,6 @@ export class CodeWhispererTracker {
 
     public async emitTelemetryOnSuggestion(suggestion: AcceptedSuggestionEntry | InsertedCode) {
         let percentage = 1.0
-        const customization = activeCustomizationOrNull()
 
         try {
             if (suggestion.fileUrl?.scheme !== '') {
@@ -121,7 +121,7 @@ export class CodeWhispererTracker {
                                 conversationId: event.cwsprChatConversationId,
                                 messageId: event.cwsprChatMessageId,
                                 modificationPercentage: event.cwsprChatModificationPercentage,
-                                customizationArn: customization?.arn,
+                                customizationArn: undefinedIfEmpty(getSelectedCustomization().arn),
                             },
                         },
                     })

packages/core/src/codewhisperer/util/customizationUtil.ts

@@ -122,16 +122,6 @@ export const getSelectedCustomization = (): Customization => {
     }
 }
 
-// codewhisperer service will throw validation exception if arn is empty string, thus we need to specifically pass undefined if it's base customization
-export function activeCustomizationOrNull(): Customization | undefined {
-    const customization = getSelectedCustomization()
-    if (customization === baseCustomization) {
-        return undefined
-    }
-
-    return customization
-}
-
 export const setSelectedCustomization = async (customization: Customization) => {
     if (!AuthUtil.instance.isValidEnterpriseSsoInUse() || !AuthUtil.instance.conn) {
         return

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

@@ -34,7 +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 { activeCustomizationOrNull } from '../../../codewhisperer/util/customizationUtil'
+import { getSelectedCustomization } from '../../../codewhisperer/util/customizationUtil'
+import { undefinedIfEmpty } from '../../../shared'
 
 export function logSendTelemetryEventFailure(error: any) {
     let requestId: string | undefined
@@ -259,7 +260,7 @@ export class CWCTelemetryHelper {
                         acceptedLineCount: event.cwsprChatAcceptedNumberOfLines,
                         acceptedSnippetHasReference: false,
                         hasProjectLevelContext: this.responseWithProjectContext.get(event.cwsprChatMessageId),
-                        customizationArn: activeCustomizationOrNull()?.arn,
+                        customizationArn: undefinedIfEmpty(getSelectedCustomization().arn),
                     },
                 },
             })
@@ -383,7 +384,7 @@ export class CWCTelemetryHelper {
                         hasProjectLevelContext: triggerPayload.relevantTextDocuments
                             ? triggerPayload.relevantTextDocuments.length > 0
                             : false,
-                        customizationArn: activeCustomizationOrNull()?.arn,
+                        customizationArn: undefinedIfEmpty(getSelectedCustomization().arn),
                     },
                 },
             })