Add http connect error and include in on server retriees

BlueBrain · Oct 8, 2024 · 9f2965c · 9f2965c
1 parent a2ea991
commit 9f2965c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/http/HttpClient.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/http/HttpClient.scala
@@ -19,7 +19,7 @@ import ch.epfl.bluebrain.nexus.delta.sdk.http.HttpClientError._
 import ch.epfl.bluebrain.nexus.delta.sdk.syntax._
 import io.circe.{Decoder, Json}
 
-import java.net.UnknownHostException
+import java.net.{ConnectException, UnknownHostException}
 import scala.concurrent.{ExecutionContext, TimeoutException}
 import scala.reflect.ClassTag
 
@@ -116,6 +116,7 @@ object HttpClient {
 
       @SuppressWarnings(Array("IsInstanceOf"))
       private def toHttpError(req: HttpRequest): Throwable => HttpClientError = {
+        case e: ConnectException                                                    => HttpConnectError(req, e.getMessage)
         case e: TimeoutException                                                    => HttpTimeoutError(req, e.getMessage)
         case e: StreamTcpException if e.getCause.isInstanceOf[UnknownHostException] => HttpUnknownHost(req)
         case e: Throwable                                                           => HttpUnexpectedError(req, e.getMessage)

diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/http/HttpClientError.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/http/HttpClientError.scala
@@ -68,6 +68,16 @@ object HttpClientError {
     override val errorCode: Option[StatusCode] = None
   }
 
+  /**
+    * A connection error (ex: connection refused).
+    */
+  final case class HttpConnectError(req: HttpRequest, message: String) extends HttpClientError {
+    override val reason: String                =
+      s"an HTTP response to endpoint '${req.uri}' with method '${req.method}' resulted in a connect error"
+    override val details: Option[String]       = Some(s"the request failed due to '$message'")
+    override val errorCode: Option[StatusCode] = None
+  }
+
   /**
     * A timeout error.
     */

diff --git a/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/http/HttpClientWorthRetry.scala b/delta/sdk/src/main/scala/ch/epfl/bluebrain/nexus/delta/sdk/http/HttpClientWorthRetry.scala
@@ -1,7 +1,7 @@
 package ch.epfl.bluebrain.nexus.delta.sdk.http
 
 import akka.http.scaladsl.model.StatusCodes.GatewayTimeout
-import ch.epfl.bluebrain.nexus.delta.sdk.http.HttpClientError.{HttpServerStatusError, HttpTimeoutError, HttpUnexpectedError}
+import ch.epfl.bluebrain.nexus.delta.sdk.http.HttpClientError.{HttpConnectError, HttpServerStatusError, HttpTimeoutError, HttpUnexpectedError}
 
 trait HttpClientWorthRetry extends (HttpClientError => Boolean)
 
@@ -22,6 +22,7 @@ object HttpClientWorthRetry {
     */
   val onServerError: HttpClientWorthRetry = {
     case HttpServerStatusError(_, code, _) if code != GatewayTimeout             => true
+    case _: HttpConnectError                                                     => true
     case _: HttpTimeoutError                                                     => true
     case err: HttpUnexpectedError if !err.message.contains("Connection refused") => true
     case _                                                                       => false