From 51d65e1290563faa15acf0df48b07897ccae684c Mon Sep 17 00:00:00 2001
From: Yuxin Lin <linyuxi@amazon.com>
Date: Mon, 10 Feb 2025 09:41:55 -0500
Subject: [PATCH 1/6] Fix: filter out frequent client error from codegeneration
 telemetry

---
 .../core/src/amazonqFeatureDev/constants.ts   |  6 ++++++
 .../controllers/chat/controller.ts            | 20 +++++++++++++++++--
 .../controllers/chat/controller.test.ts       | 19 ++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/amazonqFeatureDev/constants.ts b/packages/core/src/amazonqFeatureDev/constants.ts
index 5c00e8d7bfa..87ac31742c8 100644
--- a/packages/core/src/amazonqFeatureDev/constants.ts
+++ b/packages/core/src/amazonqFeatureDev/constants.ts
@@ -20,6 +20,12 @@ export const generateDevFilePrompt =
 // Max allowed size for file collection
 export const maxRepoSizeBytes = 200 * 1024 * 1024
 
+export const startCodeGenClientErrorMessages = ['Improperly formed request', 'Resource not found']
+export const clientErrorMessages = [
+    'StartTaskAssistCodeGeneration reached for this month.',
+    'The folder you chose did not contain any source files in a supported language. Choose another folder and try again.',
+]
+
 // License text that's used in codewhisperer reference log
 export const referenceLogText = (reference: CodeReference) =>
     `[${new Date().toLocaleString()}] Accepted recommendation from Amazon Q. Code provided with reference under <a href="${LicenseUtil.getLicenseHtml(
diff --git a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
index 6ce82a1a0ab..225e5b1c7f6 100644
--- a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
+++ b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
@@ -29,7 +29,13 @@ import {
 } from '../../errors'
 import { codeGenRetryLimit, defaultRetryLimit } from '../../limits'
 import { Session } from '../../session/session'
-import { featureDevScheme, featureName, generateDevFilePrompt } from '../../constants'
+import {
+    clientErrorMessages,
+    featureDevScheme,
+    featureName,
+    generateDevFilePrompt,
+    startCodeGenClientErrorMessages,
+} from '../../constants'
 import { DeletedFileInfo, DevPhase, MetricDataOperationName, MetricDataResult, type NewFileInfo } from '../../types'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import { AuthController } from '../../../amazonq/auth/controller'
@@ -555,12 +561,22 @@ export class FeatureDevController {
                         result = MetricDataResult.Fault
                     }
                     break
+                case MonthlyConversationLimitError.name:
+                case CodeIterationLimitError.name:
                 case PromptRefusalException.name:
                 case NoChangeRequiredException.name:
                     result = MetricDataResult.Error
                     break
                 default:
-                    result = MetricDataResult.Fault
+                    if (
+                        (err.code === 'StartCodeGenerationFailed' &&
+                            startCodeGenClientErrorMessages.some((msg) => err.message.includes(msg))) ||
+                        clientErrorMessages.some((msg) => err.message.includes(msg))
+                    ) {
+                        result = MetricDataResult.Error
+                    } else {
+                        result = MetricDataResult.Fault
+                    }
                     break
             }
 
diff --git a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
index 139ac2c112c..bad21c9f3d1 100644
--- a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
+++ b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
@@ -471,12 +471,31 @@ describe('Controller', () => {
                 ['EmptyPatchException', MetricDataResult.LlmFailure],
                 [PromptRefusalException.name, MetricDataResult.Error],
                 [NoChangeRequiredException.name, MetricDataResult.Error],
+                [MonthlyConversationLimitError.name, MetricDataResult.Error],
+                [CodeIterationLimitError.name, MetricDataResult.Error],
             ])
 
             function getMetricResult(error: ToolkitError): MetricDataResult {
                 if (error instanceof FeatureDevServiceError && error.code) {
                     return errorResultMapping.get(error.code) ?? MetricDataResult.Error
                 }
+                if (
+                    error.code === 'StartCodeGenerationFailed' &&
+                    (error.message.includes('Improperly formed request') ||
+                        error.message.includes('Resource not found'))
+                ) {
+                    return MetricDataResult.Error
+                }
+                if (error.message.includes('StartTaskAssistCodeGeneration reached for this month.')) {
+                    return MetricDataResult.Error
+                }
+                if (
+                    error.message.includes(
+                        'The folder you chose did not contain any source files in a supported language. Choose another folder and try again.'
+                    )
+                ) {
+                    return MetricDataResult.Error
+                }
                 return errorResultMapping.get(error.constructor.name) ?? MetricDataResult.Fault
             }
 

From 19d80992f20c234dd4429e0a85f4ea8050a77076 Mon Sep 17 00:00:00 2001
From: Yuxin Lin <linyuxi@amazon.com>
Date: Mon, 10 Feb 2025 10:14:10 -0500
Subject: [PATCH 2/6] Pull error messages as constants

---
 .../amazonqFeatureDev/client/featureDev.ts    |  7 ++-----
 .../core/src/amazonqFeatureDev/constants.ts   |  2 +-
 .../controllers/chat/controller.ts            |  4 +++-
 .../controllers/chat/controller.test.ts       | 20 ++++++++++---------
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/packages/core/src/amazonqFeatureDev/client/featureDev.ts b/packages/core/src/amazonqFeatureDev/client/featureDev.ts
index 01be84828b3..3ba70865c0d 100644
--- a/packages/core/src/amazonqFeatureDev/client/featureDev.ts
+++ b/packages/core/src/amazonqFeatureDev/client/featureDev.ts
@@ -10,7 +10,7 @@ import { ServiceOptions } from '../../shared/awsClientBuilder'
 import globals from '../../shared/extensionGlobals'
 import { getLogger } from '../../shared/logger'
 import * as FeatureDevProxyClient from './featuredevproxyclient'
-import { featureName } from '../constants'
+import { featureName, startTaskAssisLimitReachedMessage } from '../constants'
 import { CodeReference } from '../../amazonq/webview/ui/connector'
 import {
     ApiError,
@@ -185,10 +185,7 @@ export class FeatureDevClient {
             )
             if (isAwsError(e)) {
                 // API Front-end will throw Throttling if conversation limit is reached. API Front-end monitors StartCodeGeneration for throttling
-                if (
-                    e.code === 'ThrottlingException' &&
-                    e.message.includes('StartTaskAssistCodeGeneration reached for this month.')
-                ) {
+                if (e.code === 'ThrottlingException' && e.message.includes(startTaskAssisLimitReachedMessage)) {
                     throw new MonthlyConversationLimitError(e.message)
                 }
                 // BE service will throw ServiceQuota if code generation iteration limit is reached
diff --git a/packages/core/src/amazonqFeatureDev/constants.ts b/packages/core/src/amazonqFeatureDev/constants.ts
index 87ac31742c8..77ff22280fc 100644
--- a/packages/core/src/amazonqFeatureDev/constants.ts
+++ b/packages/core/src/amazonqFeatureDev/constants.ts
@@ -21,8 +21,8 @@ export const generateDevFilePrompt =
 export const maxRepoSizeBytes = 200 * 1024 * 1024
 
 export const startCodeGenClientErrorMessages = ['Improperly formed request', 'Resource not found']
+export const startTaskAssisLimitReachedMessage = 'StartTaskAssistCodeGeneration reached for this month.'
 export const clientErrorMessages = [
-    'StartTaskAssistCodeGeneration reached for this month.',
     'The folder you chose did not contain any source files in a supported language. Choose another folder and try again.',
 ]
 
diff --git a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
index 225e5b1c7f6..95410f7d78a 100644
--- a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
+++ b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
@@ -35,6 +35,7 @@ import {
     featureName,
     generateDevFilePrompt,
     startCodeGenClientErrorMessages,
+    startTaskAssisLimitReachedMessage,
 } from '../../constants'
 import { DeletedFileInfo, DevPhase, MetricDataOperationName, MetricDataResult, type NewFileInfo } from '../../types'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
@@ -571,7 +572,8 @@ export class FeatureDevController {
                     if (
                         (err.code === 'StartCodeGenerationFailed' &&
                             startCodeGenClientErrorMessages.some((msg) => err.message.includes(msg))) ||
-                        clientErrorMessages.some((msg) => err.message.includes(msg))
+                        clientErrorMessages.some((msg) => err.message.includes(msg)) ||
+                        err.message.includes(startTaskAssisLimitReachedMessage)
                     ) {
                         result = MetricDataResult.Error
                     } else {
diff --git a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
index bad21c9f3d1..1de2168e0bd 100644
--- a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
+++ b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
@@ -39,7 +39,14 @@ import { CodeGenState, PrepareCodeGenState } from '../../../../amazonqFeatureDev
 import { FeatureDevClient } from '../../../../amazonqFeatureDev/client/featureDev'
 import { createAmazonQUri } from '../../../../amazonq/commons/diff'
 import { AuthUtil } from '../../../../codewhisperer'
-import { featureDevScheme, featureName, messageWithConversationId } from '../../../../amazonqFeatureDev'
+import {
+    featureDevScheme,
+    featureName,
+    messageWithConversationId,
+    clientErrorMessages,
+    startCodeGenClientErrorMessages,
+    startTaskAssisLimitReachedMessage,
+} from '../../../../amazonqFeatureDev'
 import { i18n } from '../../../../shared/i18n-helper'
 import { FollowUpTypes } from '../../../../amazonq/commons/types'
 import { ToolkitError } from '../../../../shared'
@@ -481,18 +488,13 @@ describe('Controller', () => {
                 }
                 if (
                     error.code === 'StartCodeGenerationFailed' &&
-                    (error.message.includes('Improperly formed request') ||
-                        error.message.includes('Resource not found'))
+                    startCodeGenClientErrorMessages.some((msg: string) => error.message.includes(msg))
                 ) {
                     return MetricDataResult.Error
                 }
-                if (error.message.includes('StartTaskAssistCodeGeneration reached for this month.')) {
-                    return MetricDataResult.Error
-                }
                 if (
-                    error.message.includes(
-                        'The folder you chose did not contain any source files in a supported language. Choose another folder and try again.'
-                    )
+                    clientErrorMessages.some((msg: string) => error.message.includes(msg)) ||
+                    error.message.includes(startTaskAssisLimitReachedMessage) // Include this check
                 ) {
                     return MetricDataResult.Error
                 }

From dc6b265a200db6252d8988a0e9628d433b789ced Mon Sep 17 00:00:00 2001
From: Yuxin Lin <linyuxi@amazon.com>
Date: Mon, 10 Feb 2025 11:01:55 -0500
Subject: [PATCH 3/6] fix type

---
 packages/core/src/amazonqFeatureDev/constants.ts              | 2 +-
 .../core/src/amazonqFeatureDev/controllers/chat/controller.ts | 4 ++--
 .../amazonqFeatureDev/controllers/chat/controller.test.ts     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/amazonqFeatureDev/constants.ts b/packages/core/src/amazonqFeatureDev/constants.ts
index 77ff22280fc..4bc3ca1fdb2 100644
--- a/packages/core/src/amazonqFeatureDev/constants.ts
+++ b/packages/core/src/amazonqFeatureDev/constants.ts
@@ -21,7 +21,7 @@ export const generateDevFilePrompt =
 export const maxRepoSizeBytes = 200 * 1024 * 1024
 
 export const startCodeGenClientErrorMessages = ['Improperly formed request', 'Resource not found']
-export const startTaskAssisLimitReachedMessage = 'StartTaskAssistCodeGeneration reached for this month.'
+export const startTaskAssistLimitReachedMessage = 'StartTaskAssistCodeGeneration reached for this month.'
 export const clientErrorMessages = [
     'The folder you chose did not contain any source files in a supported language. Choose another folder and try again.',
 ]
diff --git a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
index 95410f7d78a..5fc48da6ff9 100644
--- a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
+++ b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
@@ -35,7 +35,7 @@ import {
     featureName,
     generateDevFilePrompt,
     startCodeGenClientErrorMessages,
-    startTaskAssisLimitReachedMessage,
+    startTaskAssistLimitReachedMessage,
 } from '../../constants'
 import { DeletedFileInfo, DevPhase, MetricDataOperationName, MetricDataResult, type NewFileInfo } from '../../types'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
@@ -573,7 +573,7 @@ export class FeatureDevController {
                         (err.code === 'StartCodeGenerationFailed' &&
                             startCodeGenClientErrorMessages.some((msg) => err.message.includes(msg))) ||
                         clientErrorMessages.some((msg) => err.message.includes(msg)) ||
-                        err.message.includes(startTaskAssisLimitReachedMessage)
+                        err.message.includes(startTaskAssistLimitReachedMessage)
                     ) {
                         result = MetricDataResult.Error
                     } else {
diff --git a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
index 1de2168e0bd..2253389b054 100644
--- a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
+++ b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
@@ -45,7 +45,7 @@ import {
     messageWithConversationId,
     clientErrorMessages,
     startCodeGenClientErrorMessages,
-    startTaskAssisLimitReachedMessage,
+    startTaskAssistLimitReachedMessage,
 } from '../../../../amazonqFeatureDev'
 import { i18n } from '../../../../shared/i18n-helper'
 import { FollowUpTypes } from '../../../../amazonq/commons/types'
@@ -494,7 +494,7 @@ describe('Controller', () => {
                 }
                 if (
                     clientErrorMessages.some((msg: string) => error.message.includes(msg)) ||
-                    error.message.includes(startTaskAssisLimitReachedMessage) // Include this check
+                    error.message.includes(startTaskAssistLimitReachedMessage) // Include this check
                 ) {
                     return MetricDataResult.Error
                 }

From 88a0904c800d0a81e13c7ca790a908225f99e0a3 Mon Sep 17 00:00:00 2001
From: Yuxin Lin <linyuxi@amazon.com>
Date: Mon, 10 Feb 2025 11:04:54 -0500
Subject: [PATCH 4/6] combine conditions when testing

---
 .../controllers/chat/controller.test.ts                | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
index 2253389b054..371ba8dd2cd 100644
--- a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
+++ b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
@@ -487,14 +487,10 @@ describe('Controller', () => {
                     return errorResultMapping.get(error.code) ?? MetricDataResult.Error
                 }
                 if (
-                    error.code === 'StartCodeGenerationFailed' &&
-                    startCodeGenClientErrorMessages.some((msg: string) => error.message.includes(msg))
-                ) {
-                    return MetricDataResult.Error
-                }
-                if (
+                    (error.code === 'StartCodeGenerationFailed' &&
+                        startCodeGenClientErrorMessages.some((msg: string) => error.message.includes(msg))) ||
                     clientErrorMessages.some((msg: string) => error.message.includes(msg)) ||
-                    error.message.includes(startTaskAssistLimitReachedMessage) // Include this check
+                    error.message.includes(startTaskAssistLimitReachedMessage)
                 ) {
                     return MetricDataResult.Error
                 }

From bea0f888291f3c3dd1824aecc722cf42a8e4316b Mon Sep 17 00:00:00 2001
From: Yuxin Lin <linyuxi@amazon.com>
Date: Mon, 10 Feb 2025 11:11:11 -0500
Subject: [PATCH 5/6] fix typo

---
 packages/core/src/amazonqFeatureDev/client/featureDev.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/amazonqFeatureDev/client/featureDev.ts b/packages/core/src/amazonqFeatureDev/client/featureDev.ts
index 3ba70865c0d..56c4d5ef5f4 100644
--- a/packages/core/src/amazonqFeatureDev/client/featureDev.ts
+++ b/packages/core/src/amazonqFeatureDev/client/featureDev.ts
@@ -10,7 +10,7 @@ import { ServiceOptions } from '../../shared/awsClientBuilder'
 import globals from '../../shared/extensionGlobals'
 import { getLogger } from '../../shared/logger'
 import * as FeatureDevProxyClient from './featuredevproxyclient'
-import { featureName, startTaskAssisLimitReachedMessage } from '../constants'
+import { featureName, startTaskAssistLimitReachedMessage } from '../constants'
 import { CodeReference } from '../../amazonq/webview/ui/connector'
 import {
     ApiError,
@@ -185,7 +185,7 @@ export class FeatureDevClient {
             )
             if (isAwsError(e)) {
                 // API Front-end will throw Throttling if conversation limit is reached. API Front-end monitors StartCodeGeneration for throttling
-                if (e.code === 'ThrottlingException' && e.message.includes(startTaskAssisLimitReachedMessage)) {
+                if (e.code === 'ThrottlingException' && e.message.includes(startTaskAssistLimitReachedMessage)) {
                     throw new MonthlyConversationLimitError(e.message)
                 }
                 // BE service will throw ServiceQuota if code generation iteration limit is reached

From ebc144853b4870555eba54033996709aff1aa16a Mon Sep 17 00:00:00 2001
From: Yuxin Lin <linyuxi@amazon.com>
Date: Mon, 10 Feb 2025 11:41:08 -0500
Subject: [PATCH 6/6] Used util function isAPIClientError when filtering error

---
 .../controllers/chat/controller.ts              | 17 +++--------------
 packages/core/src/amazonqFeatureDev/errors.ts   | 16 +++++++++++++++-
 .../controllers/chat/controller.test.ts         | 17 +++--------------
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
index 5fc48da6ff9..5718772d62f 100644
--- a/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
+++ b/packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts
@@ -15,6 +15,7 @@ import {
     createUserFacingErrorMessage,
     denyListedErrors,
     FeatureDevServiceError,
+    isAPIClientError,
     MonthlyConversationLimitError,
     NoChangeRequiredException,
     PrepareRepoFailedError,
@@ -29,14 +30,7 @@ import {
 } from '../../errors'
 import { codeGenRetryLimit, defaultRetryLimit } from '../../limits'
 import { Session } from '../../session/session'
-import {
-    clientErrorMessages,
-    featureDevScheme,
-    featureName,
-    generateDevFilePrompt,
-    startCodeGenClientErrorMessages,
-    startTaskAssistLimitReachedMessage,
-} from '../../constants'
+import { featureDevScheme, featureName, generateDevFilePrompt } from '../../constants'
 import { DeletedFileInfo, DevPhase, MetricDataOperationName, MetricDataResult, type NewFileInfo } from '../../types'
 import { AuthUtil } from '../../../codewhisperer/util/authUtil'
 import { AuthController } from '../../../amazonq/auth/controller'
@@ -569,12 +563,7 @@ export class FeatureDevController {
                     result = MetricDataResult.Error
                     break
                 default:
-                    if (
-                        (err.code === 'StartCodeGenerationFailed' &&
-                            startCodeGenClientErrorMessages.some((msg) => err.message.includes(msg))) ||
-                        clientErrorMessages.some((msg) => err.message.includes(msg)) ||
-                        err.message.includes(startTaskAssistLimitReachedMessage)
-                    ) {
+                    if (isAPIClientError(err)) {
                         result = MetricDataResult.Error
                     } else {
                         result = MetricDataResult.Fault
diff --git a/packages/core/src/amazonqFeatureDev/errors.ts b/packages/core/src/amazonqFeatureDev/errors.ts
index 06e994080f3..f64217f94ad 100644
--- a/packages/core/src/amazonqFeatureDev/errors.ts
+++ b/packages/core/src/amazonqFeatureDev/errors.ts
@@ -4,7 +4,12 @@
  */
 
 import { ToolkitError } from '../shared/errors'
-import { featureName } from './constants'
+import {
+    featureName,
+    clientErrorMessages,
+    startCodeGenClientErrorMessages,
+    startTaskAssistLimitReachedMessage,
+} from './constants'
 import { uploadCodeError } from './userFacingText'
 import { i18n } from '../shared/i18n-helper'
 
@@ -140,3 +145,12 @@ export function createUserFacingErrorMessage(message: string) {
     }
     return message
 }
+
+export function isAPIClientError(error: { code?: string; message: string }): boolean {
+    return (
+        (error.code === 'StartCodeGenerationFailed' &&
+            startCodeGenClientErrorMessages.some((msg: string) => error.message.includes(msg))) ||
+        clientErrorMessages.some((msg: string) => error.message.includes(msg)) ||
+        error.message.includes(startTaskAssistLimitReachedMessage)
+    )
+}
diff --git a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
index 371ba8dd2cd..b48ea05ffa6 100644
--- a/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
+++ b/packages/core/src/test/amazonqFeatureDev/controllers/chat/controller.test.ts
@@ -24,6 +24,7 @@ import {
     ContentLengthError,
     createUserFacingErrorMessage,
     FeatureDevServiceError,
+    isAPIClientError,
     MonthlyConversationLimitError,
     NoChangeRequiredException,
     PrepareRepoFailedError,
@@ -39,14 +40,7 @@ import { CodeGenState, PrepareCodeGenState } from '../../../../amazonqFeatureDev
 import { FeatureDevClient } from '../../../../amazonqFeatureDev/client/featureDev'
 import { createAmazonQUri } from '../../../../amazonq/commons/diff'
 import { AuthUtil } from '../../../../codewhisperer'
-import {
-    featureDevScheme,
-    featureName,
-    messageWithConversationId,
-    clientErrorMessages,
-    startCodeGenClientErrorMessages,
-    startTaskAssistLimitReachedMessage,
-} from '../../../../amazonqFeatureDev'
+import { featureDevScheme, featureName, messageWithConversationId } from '../../../../amazonqFeatureDev'
 import { i18n } from '../../../../shared/i18n-helper'
 import { FollowUpTypes } from '../../../../amazonq/commons/types'
 import { ToolkitError } from '../../../../shared'
@@ -486,12 +480,7 @@ describe('Controller', () => {
                 if (error instanceof FeatureDevServiceError && error.code) {
                     return errorResultMapping.get(error.code) ?? MetricDataResult.Error
                 }
-                if (
-                    (error.code === 'StartCodeGenerationFailed' &&
-                        startCodeGenClientErrorMessages.some((msg: string) => error.message.includes(msg))) ||
-                    clientErrorMessages.some((msg: string) => error.message.includes(msg)) ||
-                    error.message.includes(startTaskAssistLimitReachedMessage)
-                ) {
+                if (isAPIClientError(error)) {
                     return MetricDataResult.Error
                 }
                 return errorResultMapping.get(error.constructor.name) ?? MetricDataResult.Fault