Verify connection before binding metrics.

Author: michael-simons

neo4j-java-driver-spring-boot-autoconfigure/src/main/java/org/neo4j/driver/springframework/boot/autoconfigure/Neo4jDriverMetricsAutoConfiguration.java

@@ -23,6 +23,8 @@
 import java.util.Collections;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.springframework.boot.actuate.Neo4jDriverMetrics;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,15 +55,22 @@
 @ConditionalOnBean({ Driver.class, MeterRegistry.class })
 public class Neo4jDriverMetricsAutoConfiguration {
 
+	private static final Log logger = LogFactory.getLog(Neo4jDriverMetricsAutoConfiguration.class);
+
 	@Autowired
 	public void bindDataSourcesToRegistry(Map<String, Driver> drivers, MeterRegistry registry) {
 
 		drivers.forEach((name, driver) -> {
 			if (!Neo4jDriverMetrics.metricsAreEnabled(driver)) {
 				return;
 			}
-
-			new Neo4jDriverMetrics(name, driver, Collections.emptyList()).bindTo(registry);
+			driver
+				.verifyConnectivityAsync()
+				.thenRunAsync(() -> new Neo4jDriverMetrics(name, driver, Collections.emptyList()).bindTo(registry))
+				.exceptionally(e -> {
+					logger.warn("Could not verify connection for " + driver + " and thus not bind to metrics.", e);
+					return null;
+				});
 		});
 	}
 }

neo4j-java-driver-spring-boot-autoconfigure/src/test/java/org/neo4j/driver/springframework/boot/test/Neo4jDriverMocks.java

@@ -22,6 +22,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 import org.neo4j.driver.ConnectionPoolMetrics;
 import org.neo4j.driver.Driver;
@@ -47,6 +48,8 @@ public static Driver mockDriverWithMetrics() {
 		Driver driver = mock(Driver.class);
 		when(driver.metrics()).thenReturn(metrics);
 
+		when(driver.verifyConnectivityAsync()).thenReturn(CompletableFuture.completedFuture(null));
+
 		return driver;
 	}