fixup! add monitorType JMX

Author: alaturqua

gateway-ha/src/main/java/io/trino/gateway/ha/clustermonitor/ClusterStatsJmxMonitor.java

@@ -26,7 +26,6 @@
 
 import java.net.URI;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -102,31 +101,22 @@ public ClusterStats monitor(ProxyBackendConfiguration backend)
         log.info("Monitoring cluster stats for backend: %s", backend.getProxyTo());
         ClusterStats.Builder clusterStatsBuilder = ClusterStatsMonitor.getClusterStatsBuilder(backend);
 
-        try {
-            JmxResponse discoveryResponse = queryJmx(backend, "trino.metadata:name=DiscoveryNodeManager")
-                    .orElseThrow(() -> new NoSuchElementException("No JMX response for DiscoveryNodeManager"));
-            updateClusterStatsFromDiscoveryNodeManagerResponse(discoveryResponse, clusterStatsBuilder);
-        }
-        catch (NoSuchElementException e) {
-            clusterStatsBuilder.trinoStatus(TrinoStatus.UNHEALTHY);
-        }
+        clusterStatsBuilder.proxyTo(backend.getProxyTo())
+                .externalUrl(backend.getExternalUrl())
+                .routingGroup(backend.getRoutingGroup());
 
-        try {
-            JmxResponse queryResponse = queryJmx(backend, "trino.execution:name=QueryManager")
-                    .orElseThrow(() -> new NoSuchElementException("No JMX response for QueryManager"));
-            updateClusterStatsFromQueryManagerResponse(queryResponse, clusterStatsBuilder);
-        }
-        catch (NoSuchElementException e) {
+        Optional<JmxResponse> discoveryResponse = queryJmx(backend, "trino.metadata:name=DiscoveryNodeManager");
+        Optional<JmxResponse> queryResponse = queryJmx(backend, "trino.execution:name=QueryManager");
+
+        if (discoveryResponse.isEmpty() || queryResponse.isEmpty()) {
             clusterStatsBuilder.trinoStatus(TrinoStatus.UNHEALTHY);
+            return clusterStatsBuilder.build();
         }
 
-        clusterStatsBuilder.proxyTo(backend.getProxyTo())
-                .externalUrl(backend.getExternalUrl())
-                .routingGroup(backend.getRoutingGroup());
+        discoveryResponse.ifPresent(response -> updateClusterStatsFromDiscoveryNodeManagerResponse(response, clusterStatsBuilder));
+        queryResponse.ifPresent(response -> updateClusterStatsFromQueryManagerResponse(response, clusterStatsBuilder));
 
-        ClusterStats stats = clusterStatsBuilder.build();
-        log.debug("Completed monitoring for backend: %s. Stats: %s", backend.getProxyTo(), stats);
-        return stats;
+        return clusterStatsBuilder.build();
     }
 
     private Optional<JmxResponse> queryJmx(ProxyBackendConfiguration backend, String mbeanName)