Merge pull request #38959 from gsmet/filter-health-checks

Agroal - Only generate health checks for JDBC datasources

extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/health/DataSourceHealthCheck.java

@@ -18,6 +18,7 @@
 import org.eclipse.microprofile.health.Readiness;
 
 import io.agroal.api.AgroalDataSource;
+import io.quarkus.agroal.runtime.AgroalDataSourceSupport;
 import io.quarkus.agroal.runtime.DataSources;
 import io.quarkus.arc.Arc;
 import io.quarkus.datasource.common.runtime.DataSourceUtil;
@@ -40,9 +41,10 @@ protected void init() {
         }
         DataSourceSupport support = Arc.container().instance(DataSourceSupport.class)
                 .get();
-        Set<String> names = support.getConfiguredNames();
+        AgroalDataSourceSupport agroalSupport = Arc.container().instance(AgroalDataSourceSupport.class)
+                .get();
         Set<String> excludedNames = support.getInactiveOrHealthCheckExcludedNames();
-        for (String name : names) {
+        for (String name : agroalSupport.entries.keySet()) {
             if (excludedNames.contains(name)) {
                 continue;
             }

extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRecorder.java

@@ -15,20 +15,12 @@ public class DataSourceRecorder {
     public RuntimeValue<DataSourceSupport> createDataSourceSupport(
             DataSourcesBuildTimeConfig buildTimeConfig,
             DataSourcesRuntimeConfig runtimeConfig) {
-        Stream.Builder<String> configured = Stream.builder();
         Stream.Builder<String> excludedForHealthChecks = Stream.builder();
         for (Map.Entry<String, DataSourceBuildTimeConfig> dataSource : buildTimeConfig.dataSources().entrySet()) {
-            // TODO this is wrong, as the default datasource could be configured without db-kind being set:
-            //  it's inferred automatically for the default datasource when possible.
-            //  See https://github.com/quarkusio/quarkus/issues/37779
-            if (dataSource.getValue().dbKind().isPresent()) {
-                configured.add(dataSource.getKey());
-            }
             if (dataSource.getValue().healthExclude()) {
                 excludedForHealthChecks.add(dataSource.getKey());
             }
         }
-        Set<String> names = configured.build().collect(toUnmodifiableSet());
         Set<String> excludedNames = excludedForHealthChecks.build().collect(toUnmodifiableSet());
 
         Stream.Builder<String> inactive = Stream.builder();
@@ -39,6 +31,6 @@ public RuntimeValue<DataSourceSupport> createDataSourceSupport(
         }
         Set<String> inactiveNames = inactive.build().collect(toUnmodifiableSet());
 
-        return new RuntimeValue<>(new DataSourceSupport(names, excludedNames, inactiveNames));
+        return new RuntimeValue<>(new DataSourceSupport(excludedNames, inactiveNames));
     }
 }

extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceSupport.java

@@ -12,26 +12,17 @@
  */
 public class DataSourceSupport {
 
-    private final Set<String> configuredNames;
     private final Set<String> inactiveNames;
     private final Set<String> inactiveOrHealthCheckExcludedNames;
 
-    public DataSourceSupport(Set<String> configuredNames, Set<String> healthCheckExcludedNames,
+    public DataSourceSupport(Set<String> healthCheckExcludedNames,
             Set<String> inactiveNames) {
-        this.configuredNames = configuredNames;
         this.inactiveOrHealthCheckExcludedNames = new HashSet<>();
         inactiveOrHealthCheckExcludedNames.addAll(inactiveNames);
         inactiveOrHealthCheckExcludedNames.addAll(healthCheckExcludedNames);
         this.inactiveNames = inactiveNames;
     }
 
-    // TODO careful when using this, as it might (incorrectly) not include the default datasource.
-    //   See TODO in code that calls the constructor of this class.
-    //   See https://github.com/quarkusio/quarkus/issues/37779
-    public Set<String> getConfiguredNames() {
-        return configuredNames;
-    }
-
     public Set<String> getInactiveNames() {
         return inactiveNames;
     }