Merge pull request quarkusio#45523 from geoand/quarkusio#45482

Fix Mongo health checks

extensions/mongodb-client/deployment/pom.xml

@@ -101,6 +101,11 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-deployment</artifactId>

extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoClientConfigTest.java

@@ -1,11 +1,13 @@
 package io.quarkus.mongodb;
 
+import static io.restassured.RestAssured.when;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.concurrent.TimeUnit;
 
 import jakarta.inject.Inject;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -97,4 +99,11 @@ public void testReactiveClientConfiuration() {
         assertThat(clientImpl.getSettings().getReadConcern()).isEqualTo(new ReadConcern(ReadConcernLevel.SNAPSHOT));
         assertThat(clientImpl.getSettings().getReadPreference()).isEqualTo(ReadPreference.primary());
     }
+
+    @Test
+    public void healthCheck() {
+        when().get("/q/health/ready")
+                .then()
+                .body("status", CoreMatchers.equalTo("UP"));
+    }
 }

extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/NoConnectionHealthCheckTest.java

@@ -0,0 +1,52 @@
+package io.quarkus.mongodb;
+
+import static io.restassured.RestAssured.when;
+
+import jakarta.inject.Inject;
+
+import org.bson.Document;
+import org.hamcrest.CoreMatchers;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import com.mongodb.MongoClientException;
+import com.mongodb.client.MongoClient;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class NoConnectionHealthCheckTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest()
+            .overrideConfigKey("quarkus.devservices.enabled", "false")
+            .overrideConfigKey("quarkus.mongodb.connection-string", "mongodb://localhost:9999")
+            // timeouts set to the test doesn't take too long to run
+            .overrideConfigKey("quarkus.mongodb.connect-timeout", "2s")
+            .overrideConfigKey("quarkus.mongodb.server-selection-timeout", "2s")
+            .overrideConfigKey("quarkus.mongodb.read-timeout", "2s");
+
+    @Inject
+    MongoClient mongo;
+
+    @Order(1) // done to ensure the health check runs before any application code touches the database
+    @Test
+    public void healthCheck() {
+        when().get("/q/health/ready")
+                .then()
+                .body("status", CoreMatchers.equalTo("DOWN"));
+    }
+
+    @Order(2)
+    @Test
+    public void tryConnection() {
+        Assertions.assertThrows(MongoClientException.class, () -> {
+            mongo.getDatabase("admin").runCommand(new Document("ping", 1));
+        });
+    }
+
+}

extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/health/MongoHealthCheck.java

@@ -42,7 +42,7 @@ public class MongoHealthCheck implements HealthCheck {
 
     private static final Document COMMAND = new Document("ping", 1);
 
-    public void configure(MongodbConfig config) {
+    public MongoHealthCheck(MongodbConfig config) {
         Iterable<InstanceHandle<MongoClient>> handle = Arc.container().select(MongoClient.class, Any.Literal.INSTANCE)
                 .handles();
         Iterable<InstanceHandle<ReactiveMongoClient>> reactiveHandlers = Arc.container()
@@ -61,7 +61,7 @@ public void configure(MongodbConfig config) {
             }
         }
 
-        config.mongoClientConfigs.forEach(new BiConsumer<String, MongoClientConfig>() {
+        config.mongoClientConfigs.forEach(new BiConsumer<>() {
             @Override
             public void accept(String name, MongoClientConfig cfg) {
                 MongoClient client = getClient(handle, name);
@@ -76,7 +76,6 @@ public void accept(String name, MongoClientConfig cfg) {
                 }
             }
         });
-
     }
 
     private MongoClient getClient(Iterable<InstanceHandle<MongoClient>> handle, String name) {

extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java

@@ -58,12 +58,9 @@
 import com.mongodb.event.ConnectionPoolListener;
 import com.mongodb.reactivestreams.client.ReactiveContextProvider;
 
-import io.quarkus.arc.Arc;
-import io.quarkus.arc.InstanceHandle;
 import io.quarkus.credentials.CredentialsProvider;
 import io.quarkus.credentials.runtime.CredentialsProviderFinder;
 import io.quarkus.mongodb.MongoClientName;
-import io.quarkus.mongodb.health.MongoHealthCheck;
 import io.quarkus.mongodb.impl.ReactiveMongoClientImpl;
 import io.quarkus.mongodb.reactive.ReactiveMongoClient;
 
@@ -111,17 +108,6 @@ public MongoClients(MongodbConfig mongodbConfig, MongoClientSupport mongoClientS
             Class.forName("sun.net.ext.ExtendedSocketOptions", true, ClassLoader.getSystemClassLoader());
         } catch (ClassNotFoundException ignored) {
         }
-
-        try {
-            Class.forName("org.eclipse.microprofile.health.HealthCheck");
-            InstanceHandle<MongoHealthCheck> instance = Arc.container()
-                    .instance(MongoHealthCheck.class, Any.Literal.INSTANCE);
-            if (instance.isAvailable()) {
-                instance.get().configure(mongodbConfig);
-            }
-        } catch (ClassNotFoundException e) {
-            // Ignored - no health check
-        }
     }
 
     public MongoClient createMongoClient(String clientName) throws MongoException {