fix(amazonq): Reduce redundant mapping from error to metric type

Author: neilk-aws

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -15,7 +15,7 @@ import {
     createUserFacingErrorMessage,
     denyListedErrors,
     FeatureDevServiceError,
-    isAPIClientError,
+    getMetricResult,
     MonthlyConversationLimitError,
     NoChangeRequiredException,
     PrepareRepoFailedError,
@@ -56,7 +56,6 @@ import { randomUUID } from '../../../shared/crypto'
 import { FollowUpTypes } from '../../../amazonq/commons/types'
 import { Messenger } from '../../../amazonq/commons/connector/baseMessenger'
 import { BaseChatSessionStorage } from '../../../amazonq/commons/baseChatStorage'
-import { ClientError, LlmError, ServiceError } from '../../../amazonq/errors'
 
 export interface ChatControllerEventEmitters {
     readonly processHumanChatMessage: EventEmitter<any>
@@ -551,22 +550,7 @@ export class FeatureDevController {
             this.messenger.sendUpdatePlaceholder(tabID, i18n('AWS.amazonq.featureDev.pillText.selectOption'))
         } catch (err: any) {
             getLogger().error(`${featureName}: Error during code generation: ${err}`)
-
-            let result: string = MetricDataResult.Fault
-            if (err instanceof ClientError) {
-                result = MetricDataResult.Error
-            } else if (err instanceof ServiceError) {
-                result = MetricDataResult.Fault
-            } else if (err instanceof LlmError) {
-                result = MetricDataResult.LlmFailure
-            } else {
-                if (isAPIClientError(err)) {
-                    result = MetricDataResult.Error
-                } else {
-                    result = MetricDataResult.Fault
-                }
-            }
-            await session.sendMetricDataTelemetry(MetricDataOperationName.EndCodeGeneration, result)
+            await session.sendMetricDataTelemetry(MetricDataOperationName.EndCodeGeneration, getMetricResult(err))
             throw err
         } finally {
             // Finish processing the event

packages/core/src/amazonqFeatureDev/errors.ts

@@ -6,7 +6,9 @@
 import { featureName, clientErrorMessages, startTaskAssistLimitReachedMessage } from './constants'
 import { uploadCodeError } from './userFacingText'
 import { i18n } from '../shared/i18n-helper'
-import { ClientError, ServiceError, ContentLengthError as SharedContentLengthError } from '../amazonq/errors'
+import { ClientError, LlmError, ServiceError, ContentLengthError as SharedContentLengthError } from '../amazonq/errors'
+import { MetricDataResult } from '../amazonq/commons/types'
+import { ToolkitError } from '../shared/errors'
 
 export class ConversationIdNotFoundError extends ServiceError {
     constructor() {
@@ -162,9 +164,23 @@ export function createUserFacingErrorMessage(message: string) {
     return message
 }
 
-export function isAPIClientError(error: { code?: string; message: string }): boolean {
+function isAPIClientError(error: { code?: string; message: string }): boolean {
     return (
         clientErrorMessages.some((msg: string) => error.message.includes(msg)) ||
         error.message.includes(startTaskAssistLimitReachedMessage)
     )
 }
+
+export function getMetricResult(error: ToolkitError): MetricDataResult {
+    if (error instanceof ClientError || isAPIClientError(error)) {
+        return MetricDataResult.Error
+    }
+    if (error instanceof ServiceError) {
+        return MetricDataResult.Fault
+    }
+    if (error instanceof LlmError) {
+        return MetricDataResult.LlmFailure
+    }
+
+    return MetricDataResult.Fault
+}

packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts

@@ -24,6 +24,7 @@ import {
     ContentLengthError,
     createUserFacingErrorMessage,
     FeatureDevServiceError,
+    getMetricResult,
     MonthlyConversationLimitError,
     NoChangeRequiredException,
     PrepareRepoFailedError,
@@ -47,7 +48,6 @@ import { i18n } from '../../../../shared/i18n-helper'
 import { FollowUpTypes } from '../../../../amazonq/commons/types'
 import { ToolkitError } from '../../../../shared'
 import { MessengerTypes } from '../../../../amazonqFeatureDev/controllers/chat/messenger/constants'
-import { ClientError, LlmError, ServiceError } from '../../../../amazonq/errors'
 
 let mockGetCodeGeneration: sinon.SinonStub
 describe('Controller', () => {
@@ -471,19 +471,6 @@ describe('Controller', () => {
             let session: any
             let sendMetricDataTelemetrySpy: sinon.SinonStub
 
-            function getMetricResult(error: ToolkitError): MetricDataResult {
-                if (error instanceof ClientError) {
-                    return MetricDataResult.Error
-                }
-                if (error instanceof LlmError) {
-                    return MetricDataResult.LlmFailure
-                }
-                if (error instanceof ServiceError) {
-                    return MetricDataResult.Fault
-                }
-                return MetricDataResult.Fault
-            }
-
             async function verifyException(error: ToolkitError) {
                 sinon.stub(session, 'send').throws(error)