Skip to content

Commit 9963dcf

Browse files
authored
Remove duplicated HIL ApiError metrics (aws#4533)
1 parent c989166 commit 9963dcf

File tree

2 files changed

+5
-34
lines changed

2 files changed

+5
-34
lines changed

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.openTrouble
3333
import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
3434
import software.aws.toolkits.jetbrains.utils.notifyStickyWarn
3535
import software.aws.toolkits.resources.message
36-
import software.aws.toolkits.telemetry.CodeTransformApiNames
3736
import java.io.File
3837
import java.nio.file.Files
3938
import java.nio.file.Path
@@ -90,14 +89,7 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G
9089
}
9190

9291
suspend fun downloadHilArtifact(jobId: JobId, artifactId: String, tmpDir: File): CodeTransformHilDownloadArtifact? {
93-
val downloadResultsResponse = try {
94-
clientAdaptor.downloadExportResultArchive(jobId, artifactId)
95-
} catch (e: Exception) {
96-
val errorMessage = "Unexpected error when downloading hil artifact: ${e.localizedMessage}"
97-
LOG.error { errorMessage }
98-
telemetry.apiError(errorMessage, CodeTransformApiNames.ExportResultArchive, jobId = jobId.id)
99-
throw e
100-
}
92+
val downloadResultsResponse = clientAdaptor.downloadExportResultArchive(jobId, artifactId)
10193

10294
return try {
10395
val tmpPath = tmpDir.toPath()

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -270,27 +270,13 @@ class CodeModernizerSession(
270270

271271
fun resumeTransformFromHil() {
272272
val clientAdaptor = GumbyClient.getInstance(sessionContext.project)
273-
try {
274-
clientAdaptor.resumeCodeTransformation(state.currentJobId as JobId, TransformationUserActionStatus.COMPLETED)
275-
} catch (e: Exception) {
276-
val errorMessage = "Unexpected error when resuming transformation: ${e.localizedMessage}"
277-
LOG.error { errorMessage }
278-
telemetry.apiError(errorMessage, CodeTransformApiNames.ResumeTransformation, jobId = state.currentJobId?.id)
279-
throw e
280-
}
273+
clientAdaptor.resumeCodeTransformation(state.currentJobId as JobId, TransformationUserActionStatus.COMPLETED)
281274
}
282275

283276
fun rejectHilAndContinue(): ResumeTransformationResponse {
284277
val clientAdaptor = GumbyClient.getInstance(sessionContext.project)
285-
return try {
286-
val jobId = state.currentJobId ?: throw CodeModernizerException("No Job ID found")
287-
clientAdaptor.resumeCodeTransformation(jobId, TransformationUserActionStatus.REJECTED)
288-
} catch (e: Exception) {
289-
val errorMessage = "Unexpected error when resuming transformation: ${e.localizedMessage}"
290-
LOG.error { errorMessage }
291-
telemetry.apiError(errorMessage, CodeTransformApiNames.ResumeTransformation, jobId = state.currentJobId?.id)
292-
throw e
293-
}
278+
val jobId = state.currentJobId ?: throw CodeModernizerException("No Job ID found")
279+
return clientAdaptor.resumeCodeTransformation(jobId, TransformationUserActionStatus.REJECTED)
294280
}
295281

296282
fun uploadHilPayload(payload: File): String {
@@ -300,14 +286,7 @@ class CodeModernizerSession(
300286
}
301287
val jobId = state.currentJobId ?: throw CodeModernizerException("No Job ID found")
302288
val clientAdaptor = GumbyClient.getInstance(sessionContext.project)
303-
val createUploadUrlResponse = try {
304-
clientAdaptor.createHilUploadUrl(sha256checksum, jobId = jobId)
305-
} catch (e: Exception) {
306-
val errorMessage = "Unexpected error when creating upload url for HIL: ${e.localizedMessage}"
307-
LOG.error { errorMessage }
308-
telemetry.apiError(errorMessage, CodeTransformApiNames.CreateUploadUrl, jobId = state.currentJobId?.id)
309-
throw e
310-
}
289+
val createUploadUrlResponse = clientAdaptor.createHilUploadUrl(sha256checksum, jobId = jobId)
311290

312291
LOG.info {
313292
"Uploading zip with checksum $sha256checksum using uploadId: ${

0 commit comments

Comments
 (0)