fix: Catch the issues with service unavailable other than the Connect Timeout

gateway-service/src/main/java/org/zowe/apiml/gateway/config/NettyRoutingFilterApiml.java

@@ -11,6 +11,7 @@
 package org.zowe.apiml.gateway.config;
 
 import io.netty.channel.ChannelOption;
+import io.netty.channel.ConnectTimeoutException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,6 +26,7 @@
 import reactor.netty.http.client.HttpClient;
 
 import java.net.ConnectException;
+import java.net.NoRouteToHostException;
 import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
@@ -84,14 +86,30 @@ protected HttpClient getHttpClient(Route route, ServerWebExchange exchange) {
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         return super.filter(exchange, chain).onErrorResume(e -> {
-            if (e.getCause() instanceof ConnectException) {
+            if (isServiceUnavailable(e)) {
                 log.debug("Connection to {} was not established: {}", exchange.getRequest().getURI(), e.getMessage());
                 var uri = exchange.getRequest().getURI();
                 return Mono.error(new ServiceNotAccessibleException(String.format("Service is not available at %s://%s:%d", uri.getScheme(), uri.getHost(), uri.getPort()), e));
             }
             return Mono.error(e);
         });
+    }
 
+    static boolean isServiceUnavailable(Throwable error) {
+        if (error == null) {
+            return false;
+        }
+        // Check the full cause chain
+        Throwable current = error;
+        while (current != null) {
+            if (current instanceof ConnectException
+                    || current instanceof ConnectTimeoutException
+                    || current instanceof NoRouteToHostException) {
+                return true;
+            }
+            current = current.getCause();
+        }
+        return false;
     }
 
 }

gateway-service/src/test/java/org/zowe/apiml/gateway/config/NettyRoutingFilterApimlTest.java

@@ -12,6 +12,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.netty.channel.ChannelOption;
+import io.netty.channel.ConnectTimeoutException;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import org.hamcrest.Matchers;
@@ -28,6 +29,9 @@
 import reactor.netty.http.client.HttpClient;
 
 import javax.net.ssl.SSLException;
+import java.net.ConnectException;
+import java.net.NoRouteToHostException;
+import java.nio.channels.ClosedChannelException;
 import java.time.Duration;
 
 import static io.restassured.RestAssured.given;
@@ -158,6 +162,81 @@ void givenTimeoutAndRequirementsForClientCert_whenGetHttpClient_thenCallWithoutC
 
     }
 
+    @Nested
+    class IsServiceUnavailable {
+
+        @Test
+        void givenConnectTimeoutException_whenIsServiceUnavailable_thenReturnsTrue() {
+            assertTrue(NettyRoutingFilterApiml.isServiceUnavailable(new ConnectTimeoutException("connect timed out")));
+        }
+
+        @Test
+        void givenConnectException_whenIsServiceUnavailable_thenReturnsTrue() {
+            assertTrue(NettyRoutingFilterApiml.isServiceUnavailable(new ConnectException("connection refused")));
+        }
+
+        @Test
+        void givenConnectExceptionNestedInClosedChannelException_whenIsServiceUnavailable_thenReturnsTrue() {
+            ClosedChannelException outer = new ClosedChannelException();
+            ConnectException inner = new ConnectException("connection refused");
+            outer.initCause(inner);
+            assertTrue(NettyRoutingFilterApiml.isServiceUnavailable(outer));
+        }
+
+        @Test
+        void givenUnrelatedException_whenIsServiceUnavailable_thenReturnsFalse() {
+            assertFalse(NettyRoutingFilterApiml.isServiceUnavailable(new RuntimeException("some other error")));
+        }
+
+        @Test
+        void givenSslException_whenIsServiceUnavailable_thenReturnsFalse() {
+            assertFalse(NettyRoutingFilterApiml.isServiceUnavailable(new javax.net.ssl.SSLException("cert error")));
+        }
+
+        @Test
+        void givenNoRouteToHostException_whenIsServiceUnavailable_thenReturnsTrue() {
+            assertTrue(NettyRoutingFilterApiml.isServiceUnavailable(new NoRouteToHostException("no route to host")));
+        }
+
+        @Test
+        void givenNoRouteToHostExceptionNested_whenIsServiceUnavailable_thenReturnsTrue() {
+            RuntimeException outer = new RuntimeException("wrapper");
+            NoRouteToHostException inner = new NoRouteToHostException("no route to host");
+            outer.initCause(inner);
+            assertTrue(NettyRoutingFilterApiml.isServiceUnavailable(outer));
+        }
+
+        @Test
+        void givenNull_whenIsServiceUnavailable_thenReturnsFalse() {
+            assertFalse(NettyRoutingFilterApiml.isServiceUnavailable(null));
+        }
+
+        @Test
+        void givenConnectTimeoutExceptionNested_whenIsServiceUnavailable_thenReturnsTrue() {
+            RuntimeException outer = new RuntimeException("wrapper");
+            ConnectTimeoutException inner = new ConnectTimeoutException("timed out");
+            outer.initCause(inner);
+            assertTrue(NettyRoutingFilterApiml.isServiceUnavailable(outer));
+        }
+
+        @Test
+        void givenExceptionWithNullCause_whenIsServiceUnavailable_thenReturnsFalse() {
+            RuntimeException ex = new RuntimeException("no cause");
+            assertFalse(NettyRoutingFilterApiml.isServiceUnavailable(ex));
+        }
+
+        @Test
+        void givenMultiLevelNestedServiceUnavailableException_whenIsServiceUnavailable_thenReturnsTrue() {
+            RuntimeException level1 = new RuntimeException("level1");
+            RuntimeException level2 = new RuntimeException("level2");
+            ConnectException level3 = new ConnectException("no connection");
+            level1.initCause(level2);
+            level2.initCause(level3);
+            assertTrue(NettyRoutingFilterApiml.isServiceUnavailable(level1));
+        }
+
+    }
+
     @Nested
     class UnavailableService extends AcceptanceTestWithMockServices {