Improving telemetry error messages (#4565)

* Improving error messages

Author: laileni-aws

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

@@ -399,14 +399,7 @@ class CodeWhispererCodeScanManager(val project: Project) {
             is CodeWhispererCodeScanServerException -> e.message
             is WaiterTimeoutException, is TimeoutCancellationException -> message("codewhisperer.codescan.scan_timed_out")
             is CancellationException -> message("codewhisperer.codescan.cancelled_by_user_exception")
-            else -> when {
-                /**
-                 * Error message has text with user details(like requestId) which is specific so sending a custom error message to calculate the occurence of this event.
-                 */
-                e.message?.startsWith("Too many requests, please wait before trying again.") == true ->
-                    "Too many requests, please wait before trying again."
-                else -> e.message
-            }
+            else -> e.message
         } ?: message("codewhisperer.codescan.run_scan_error_telemetry")
 
         return telemetryErrorMessage

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt

@@ -286,7 +286,13 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
         )
     } catch (e: Exception) {
         LOG.debug { "Create Upload URL failed: ${e.message}" }
-        throw codeScanServerException("CreateUploadUrlException: " + e.message?.let { it } ?: message("codewhisperer.codescan.run_scan_error_telemetry"))
+
+        val errorMessage = when {
+            e.message?.contains("Your account is not authorized to make this call.") == true -> "Your account is not authorized to make this call."
+            e.message?.contains("Service returned HTTP status code 407") == true -> "Service returned HTTP status code 407"
+            else -> e.message ?: message("codewhisperer.codescan.run_scan_error_telemetry")
+        }
+        throw codeScanServerException("CreateUploadUrlException: $errorMessage")
     }
 
     private fun getUploadIntent(scope: CodeWhispererConstants.CodeAnalysisScope): UploadIntent = when (scope) {
@@ -341,7 +347,15 @@ class CodeWhispererCodeScanSession(val sessionContext: CodeScanSessionContext) {
             )
         } catch (e: Exception) {
             LOG.debug { "Creating security scan failed: ${e.message}" }
-            throw codeScanServerException("CreateCodeScanException: " + e.message?.let { it } ?: message("codewhisperer.codescan.run_scan_error_telemetry"))
+            val errorMessage = when {
+                e.message?.contains("Too many requests, please wait before trying again.") == true -> "Too many requests, please wait before trying again."
+                e.message?.contains("Improperly formed request.") == true -> "Improperly formed request."
+                e.message?.contains("Service returned HTTP status code 407") == true -> "Service returned HTTP status code 407"
+                e.message?.contains("Encountered an unexpected error when processing the request, please try again.") == true ->
+                    "Encountered an unexpected error when processing the request, please try again."
+                else -> e.message ?: message("codewhisperer.codescan.run_scan_error_telemetry")
+            }
+            throw codeScanServerException("CreateCodeScanException: $errorMessage")
         }
     }