diff --git a/driver/src/main/java/org/neo4j/driver/Config.java b/driver/src/main/java/org/neo4j/driver/Config.java index 2330ba5b87..114045beab 100644 --- a/driver/src/main/java/org/neo4j/driver/Config.java +++ b/driver/src/main/java/org/neo4j/driver/Config.java @@ -37,7 +37,6 @@ import org.neo4j.driver.internal.RoutingSettings; import org.neo4j.driver.internal.SecuritySettings; import org.neo4j.driver.internal.observation.DriverObservationProvider; -import org.neo4j.driver.internal.observation.NoopObservationProvider; import org.neo4j.driver.internal.retry.ExponentialBackoffRetryLogic; import org.neo4j.driver.net.ServerAddressResolver; import org.neo4j.driver.observation.ObservationProvider; @@ -749,11 +748,10 @@ public ConfigBuilder withResolver(ServerAddressResolver resolver) { */ @Preview(name = "Observability") public ConfigBuilder withObservationProvider(ObservationProvider observationProvider) { - this.observationProvider = - Objects.requireNonNullElseGet(observationProvider, NoopObservationProvider::getInstance); - if (!(observationProvider instanceof DriverObservationProvider)) { + if (observationProvider != null && !(observationProvider instanceof DriverObservationProvider)) { throw new IllegalArgumentException("Unssupported observation provider"); } + this.observationProvider = observationProvider; return this; } diff --git a/driver/src/test/java/org/neo4j/driver/ConfigTest.java b/driver/src/test/java/org/neo4j/driver/ConfigTest.java index f4f4c2adc4..e50481cb5c 100644 --- a/driver/src/test/java/org/neo4j/driver/ConfigTest.java +++ b/driver/src/test/java/org/neo4j/driver/ConfigTest.java @@ -562,4 +562,11 @@ void shouldRejectUnknownObservationProvider() { assertThrows( IllegalArgumentException.class, () -> Config.builder().withObservationProvider(observationProvider)); } + + @Test + void shouldAllowNullObservationProvider() { + var config = Config.builder().withObservationProvider(null).build(); + + assertTrue(config.observationProvider().isEmpty()); + } } diff --git a/observation/micrometer/pom.xml b/observation/micrometer/pom.xml index 60037c0ae5..8fc7e4f0cf 100644 --- a/observation/micrometer/pom.xml +++ b/observation/micrometer/pom.xml @@ -142,27 +142,25 @@ generate-html - - - - org.asciidoctor - asciidoctor-maven-plugin - - - asciidoc-to-html - prepare-package - - process-asciidoc - - - ${project.build.directory}/docs - ${project.build.directory}/html - - - - - - + + + org.asciidoctor + asciidoctor-maven-plugin + + + asciidoc-to-html + prepare-package + + process-asciidoc + + + ${project.build.directory}/docs + ${project.build.directory}/html + + + + +