From 28080a5ebaa0323d0254b4eaa887a34d2e68fb17 Mon Sep 17 00:00:00 2001
From: Sherif <sherif@keyvalue.systems>
Date: Tue, 26 Mar 2024 11:59:15 +0530
Subject: [PATCH] fix: 5XX series issues

---
 .../com/netflix/conductor/tasks/http/HttpTask.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java b/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java
index 942ae234a1..efa5bb2f63 100644
--- a/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java
+++ b/http-task/src/main/java/com/netflix/conductor/tasks/http/HttpTask.java
@@ -25,7 +25,7 @@
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
@@ -120,8 +120,12 @@ public void start(WorkflowModel workflow, TaskModel task, WorkflowExecutor execu
                     task.setReasonForIncompletion(response.body.toString());
                 } else {
                     task.setReasonForIncompletion(
-                            Objects.requireNonNullElse(
-                                    response.reasonPhrase, "No response from the remote service"));
+                            String.format(
+                                    "%d: %s",
+                                    response.statusCode,
+                                    Objects.requireNonNullElse(
+                                            response.reasonPhrase,
+                                            "No response from the remote service")));
                 }
                 task.setStatus(TaskModel.Status.FAILED);
             }
@@ -184,7 +188,7 @@ protected HttpResponse httpCall(Input input) throws Exception {
                     HttpStatus.valueOf(responseEntity.getStatusCode().value()).getReasonPhrase();
             response.headers = responseEntity.getHeaders();
             return response;
-        } catch (HttpClientErrorException ex) {
+        } catch (HttpStatusCodeException ex) {
             response.headers = ex.getResponseHeaders();
             response.statusCode = ex.getStatusCode().value();
             response.reasonPhrase = ex.getStatusText();