Removing the statusCode from UTG telemetry

Author: laileni-aws

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt

@@ -136,7 +136,6 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             val errorMessage = getTelemetryErrorMessage(e, CodeWhispererConstants.FeatureName.TEST_GENERATION)
             throw CodeTestException(
                 "CreateTestJobError: $errorMessage",
-                statusCode,
                 "CreateTestJobError",
                 message("testgen.error.generic_technical_error_message")
             )
@@ -195,7 +194,6 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     // If job status is Completed and has no ShortAnswer then there might be some issue in the backend.
                     throw CodeTestException(
                         "TestGenFailedError: " + message("testgen.message.failed"),
-                        500,
                         "TestGenFailedError",
                         message("testgen.error.generic_technical_error_message")
                     )
@@ -208,14 +206,13 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 if (testGenerationResponse.testGenerationJob().shortAnswer() != null) {
                     shortAnswer = parseShortAnswerString(testGenerationResponse.testGenerationJob().shortAnswer())
                     if (shortAnswer.stopIteration == "true") {
-                        throw CodeTestException("TestGenFailedError: ${shortAnswer.planSummary}", 400, "TestGenFailedError", shortAnswer.planSummary)
+                        throw CodeTestException("TestGenFailedError: ${shortAnswer.planSummary}", "TestGenFailedError", shortAnswer.planSummary)
                     }
                 }
 
                 // If job status is Failed and has no ShortAnswer then there might be some issue in the backend.
                 throw CodeTestException(
                     "TestGenFailedError: " + message("testgen.message.failed"),
-                    500,
                     "TestGenFailedError",
                     message("testgen.error.generic_technical_error_message")
                 )
@@ -230,7 +227,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 if (previousIterationContext == null && testGenerationResponse.testGenerationJob().shortAnswer() != null) {
                     shortAnswer = parseShortAnswerString(testGenerationResponse.testGenerationJob().shortAnswer())
                     if (shortAnswer.stopIteration == "true") {
-                        throw CodeTestException("TestGenFailedError: ${shortAnswer.planSummary}", 400, "TestGenFailedError", shortAnswer.planSummary)
+                        throw CodeTestException("TestGenFailedError: ${shortAnswer.planSummary}", "TestGenFailedError", shortAnswer.planSummary)
                     }
                     codeTestChatHelper.updateAnswer(
                         CodeTestChatMessageContent(
@@ -264,7 +261,6 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 LOG.error(e) { "ExportResultArchive failed: ${e.message}" }
                 throw CodeTestException(
                     "ExportResultsArchiveError: ${e.message}",
-                    500,
                     "ExportResultsArchiveError",
                     message("testgen.error.generic_technical_error_message")
                 )
@@ -530,7 +526,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             } catch (e: Exception) {
                 // Add an answer for displaying error message
                 val errorMessage = when {
-                    e is CodeTestException && e.statusCode == 400 &&
+                    e is CodeTestException &&
                         e.message?.startsWith("CreateTestJobError: Maximum") == true ->
                         message("testgen.error.maximum_generations_reach")
 
@@ -557,7 +553,6 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     result = if (e.message == message("testgen.message.cancelled")) MetricResult.Cancelled else MetricResult.Failed,
                     reason = (e as CodeTestException).code ?: "DefaultError",
                     reasonDesc = if (e.message == message("testgen.message.cancelled")) "${e.code}: ${e.message}" else e.message,
-                    httpStatusCode = e.statusCode.toString(),
                     perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
                     isCodeBlockSelected = session.isCodeBlockSelected,
                     artifactsUploadDuration = session.artifactUploadDuration,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -291,8 +291,7 @@ class CodeTestChatController(
                     credentialStartUrl = getStartUrl(project),
                     result = MetricResult.Succeeded,
                     perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
-                    requestId = id,
-                    httpStatusCode = "200"
+                    requestId = id
                 )
             }
             session.isGeneratingTests = false
@@ -604,8 +603,7 @@ class CodeTestChatController(
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId,
-                    httpStatusCode = "200"
+                    requestId = session.startTestGenerationRequestId
                 )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
@@ -799,8 +797,7 @@ class CodeTestChatController(
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId,
-                    httpStatusCode = "200"
+                    requestId = session.startTestGenerationRequestId
                 )
                 sessionCleanUp(message.tabId)
             }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/CodeTestException.kt

@@ -7,30 +7,29 @@ import software.aws.toolkits.resources.message
 
 open class CodeTestException(
     override val message: String?,
-    val statusCode: Int = 400,
     val code: String? = "DefaultError",
     val uiMessage: String? = message(
         "testgen.error.generic_error_message"
     ),
 ) : RuntimeException()
 
 internal fun noFileOpenError(): Nothing =
-    throw CodeTestException(message("codewhisperer.codescan.no_file_open"), 400, "ProjectZipError")
+    throw CodeTestException(message("codewhisperer.codescan.no_file_open"), "ProjectZipError")
 
 internal fun fileTooLarge(): Nothing =
-    throw CodeTestException(message("codewhisperer.codescan.file_too_large_telemetry"), 400, "ProjectZipError")
+    throw CodeTestException(message("codewhisperer.codescan.file_too_large_telemetry"), "ProjectZipError")
 
 internal fun cannotFindFile(errorMessage: String, filepath: String): Nothing =
     error(message("codewhisperer.codescan.file_not_found", filepath, errorMessage))
 
 internal fun cannotFindValidFile(errorMessage: String): Nothing =
-    throw CodeTestException(errorMessage, 400, "ProjectZipError")
+    throw CodeTestException(errorMessage, "ProjectZipError")
 
 internal fun cannotFindBuildArtifacts(errorMessage: String): Nothing =
-    throw CodeTestException(errorMessage, 400, "ProjectZipError")
+    throw CodeTestException(errorMessage, "ProjectZipError")
 
 internal fun invalidSourceZipError(): Nothing =
-    throw CodeTestException(message("codewhisperer.codescan.invalid_source_zip_telemetry"), 400, "InvalidSourceZipError")
+    throw CodeTestException(message("codewhisperer.codescan.invalid_source_zip_telemetry"), "InvalidSourceZipError")
 
 fun testGenStoppedError(): Nothing =
-    throw CodeTestException(message("testgen.message.cancelled"), 400, "TestGenCancelled", message("testgen.message.cancelled"))
+    throw CodeTestException(message("testgen.message.cancelled"), "TestGenCancelled", message("testgen.message.cancelled"))