telemetry: Move common errors to shared folder

Author: neilk-aws

packages/amazonq/test/unit/amazonqFeatureDev/util/files.test.ts

@@ -11,11 +11,11 @@ import {
     maxRepoSizeBytes,
 } from 'aws-core-vscode/amazonqFeatureDev'
 import { assertTelemetry, getWorkspaceFolder, TestFolder } from 'aws-core-vscode/test'
-import { fs, AmazonqCreateUpload, ZipStream } from 'aws-core-vscode/shared'
+import { fs, AmazonqCreateUpload, ZipStream, ContentLengthError } from 'aws-core-vscode/shared'
 import { MetricName, Span } from 'aws-core-vscode/telemetry'
 import sinon from 'sinon'
 import { CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
-import { ContentLengthError, CurrentWsFolders } from 'aws-core-vscode/amazonq'
+import { CurrentWsFolders } from 'aws-core-vscode/amazonq'
 import path from 'path'
 
 const testDevfilePrepareRepo = async (devfileEnabled: boolean) => {

packages/core/src/amazonq/errors.ts

@@ -11,24 +11,6 @@
  */
 import { ErrorInformation, ToolkitError } from '../shared/errors'
 
-/**
- * Errors extending this class are considered "errors" in service metrics.
- */
-export class ClientError extends ToolkitError {
-    constructor(message: string, info: ErrorInformation = {}) {
-        super(message, info)
-    }
-}
-
-/**
- * Errors extending this class are considered "faults" in service metrics.
- */
-export class ServiceError extends ToolkitError {
-    constructor(message: string, info: ErrorInformation = {}) {
-        super(message, info)
-    }
-}
-
 /**
  * Errors extending this class are considered "LLM failures" in service metrics.
  */
@@ -37,9 +19,3 @@ export class LlmError extends ToolkitError {
         super(message, info)
     }
 }
-
-export class ContentLengthError extends ClientError {
-    constructor(message: string, info: ErrorInformation = { code: 'ContentLengthError' }) {
-        super(message, info)
-    }
-}

packages/core/src/amazonq/index.ts

@@ -44,7 +44,6 @@ export { ExtensionMessage } from '../amazonq/webview/ui/commands'
 export { CodeReference } from '../codewhispererChat/view/connector/connector'
 export { extractAuthFollowUp } from './util/authUtils'
 export { Messenger } from './commons/connector/baseMessenger'
-export { ContentLengthError } from './errors'
 import { FeatureContext } from '../shared/featureConfig'
 
 /**

packages/core/src/amazonq/util/files.ts

@@ -16,7 +16,7 @@ import { PrepareRepoFailedError } from '../../amazonqFeatureDev/errors'
 import { getLogger } from '../../shared/logger/logger'
 import { maxFileSizeBytes } from '../../amazonqFeatureDev/limits'
 import { CurrentWsFolders, DeletedFileInfo, NewFileInfo, NewFileZipContents } from '../../amazonqDoc/types'
-import { hasCode, ToolkitError } from '../../shared/errors'
+import { ContentLengthError, hasCode, ToolkitError } from '../../shared/errors'
 import { AmazonqCreateUpload, Span, telemetry as amznTelemetry, telemetry } from '../../shared/telemetry/telemetry'
 import { maxRepoSizeBytes } from '../../amazonqFeatureDev/constants'
 import { isCodeFile } from '../../shared/filetypes'
@@ -28,7 +28,6 @@ import { ZipStream } from '../../shared/utilities/zipStream'
 import { isPresent } from '../../shared/utilities/collectionUtils'
 import { AuthUtil } from '../../codewhisperer/util/authUtil'
 import { TelemetryHelper } from '../util/telemetryHelper'
-import { ContentLengthError } from '../errors'
 
 export const SvgFileExtension = '.svg'
 

packages/core/src/amazonqDoc/session/session.ts

@@ -30,8 +30,8 @@ import fs from '../../shared/fs/fs'
 import globals from '../../shared/extensionGlobals'
 import { extensionVersion } from '../../shared/vscode/env'
 import { getLogger } from '../../shared/logger/logger'
+import { ContentLengthError as CommonAmazonQContentLengthError } from '../../shared/errors'
 import { ContentLengthError } from '../errors'
-import { ContentLengthError as CommonAmazonQContentLengthError } from '../../amazonq/errors'
 
 export class Session {
     private _state?: SessionState | Omit<SessionState, 'uploadId'>

packages/core/src/amazonqFeatureDev/errors.ts

@@ -6,9 +6,14 @@
 import { featureName, clientErrorMessages, startTaskAssistLimitReachedMessage } from './constants'
 import { uploadCodeError } from './userFacingText'
 import { i18n } from '../shared/i18n-helper'
-import { ClientError, LlmError, ServiceError, ContentLengthError as SharedContentLengthError } from '../amazonq/errors'
+import { LlmError } from '../amazonq/errors'
 import { MetricDataResult } from '../amazonq/commons/types'
-import { ToolkitError } from '../shared/errors'
+import {
+    ClientError,
+    ServiceError,
+    ContentLengthError as CommonContentLengthError,
+    ToolkitError,
+} from '../shared/errors'
 
 export class ConversationIdNotFoundError extends ServiceError {
     constructor() {
@@ -104,7 +109,7 @@ export class IllegalStateError extends ServiceError {
     }
 }
 
-export class ContentLengthError extends SharedContentLengthError {
+export class ContentLengthError extends CommonContentLengthError {
     constructor() {
         super(i18n('AWS.amazonq.featureDev.error.contentLengthError'), { code: ContentLengthError.name })
     }

packages/core/src/amazonqFeatureDev/session/session.ts

@@ -33,7 +33,7 @@ import { UpdateAnswerMessage } from '../../amazonq/commons/connector/connectorMe
 import { FollowUpTypes } from '../../amazonq/commons/types'
 import { SessionConfig } from '../../amazonq/commons/session/sessionConfigFactory'
 import { Messenger } from '../../amazonq/commons/connector/baseMessenger'
-import { ContentLengthError as CommonAmazonQContentLengthError } from '../../amazonq/errors'
+import { ContentLengthError as CommonContentLengthError } from '../../shared/errors'
 export class Session {
     private _state?: SessionState | Omit<SessionState, 'uploadId'>
     private task: string = ''
@@ -159,7 +159,7 @@ export class Session {
 
             return resp.interaction
         } catch (e) {
-            if (e instanceof CommonAmazonQContentLengthError) {
+            if (e instanceof CommonContentLengthError) {
                 getLogger().debug(`Content length validation failed: ${e.message}`)
                 throw new ContentLengthError()
             }

packages/core/src/shared/errors.ts

@@ -826,6 +826,30 @@ export class PermissionsError extends ToolkitError {
     }
 }
 
+/**
+ * Errors extending this class are considered "errors" in service metrics.
+ */
+export class ClientError extends ToolkitError {
+    constructor(message: string, info: ErrorInformation = { code: '400' }) {
+        super(message, info)
+    }
+}
+
+/**
+ * Errors extending this class are considered "faults" in service metrics.
+ */
+export class ServiceError extends ToolkitError {
+    constructor(message: string, info: ErrorInformation = { code: '500' }) {
+        super(message, info)
+    }
+}
+
+export class ContentLengthError extends ClientError {
+    constructor(message: string, info: ErrorInformation = { code: 'ContentLengthError' }) {
+        super(message, info)
+    }
+}
+
 export function isNetworkError(err?: unknown): err is Error & { code: string } {
     if (!(err instanceof Error)) {
         return false