Merge pull request #26871 from radcortez/fix-26216

Additional check if Micrometer Metrics Tracer is available
quarkusio · Jul 25, 2022 · 093af57 · 093af57
2 parents f0d0d92 + a12ca3c
commit 093af57
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/...deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/TracerProcessor.java b/...deployment/src/main/java/io/quarkus/opentelemetry/deployment/tracing/TracerProcessor.java
@@ -11,6 +11,7 @@
 import java.util.Set;
 import java.util.function.BooleanSupplier;
 
+import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.jandex.AnnotationInstance;
 import org.jboss.jandex.AnnotationTarget;
@@ -61,8 +62,19 @@ static class MetricsExtensionAvailable implements BooleanSupplier {
 
         @Override
         public boolean getAsBoolean() {
-            return IS_MICROMETER_EXTENSION_AVAILABLE && ConfigProvider.getConfig()
-                    .getOptionalValue("quarkus.micrometer.binder.http-server.enabled", Boolean.class).orElse(true);
+            Config config = ConfigProvider.getConfig();
+            if (IS_MICROMETER_EXTENSION_AVAILABLE) {
+                if (config.getOptionalValue("quarkus.micrometer.enabled", Boolean.class).orElse(true)) {
+                    Optional<Boolean> httpServerEnabled = config
+                            .getOptionalValue("quarkus.micrometer.binder.http-server.enabled", Boolean.class);
+                    if (httpServerEnabled.isPresent()) {
+                        return httpServerEnabled.get();
+                    } else {
+                        return config.getOptionalValue("quarkus.micrometer.binder-enabled-default", Boolean.class).orElse(true);
+                    }
+                }
+            }
+            return false;
         }
     }
 

diff --git a/integration-tests/opentelemetry-vertx/src/main/resources/application.properties b/integration-tests/opentelemetry-vertx/src/main/resources/application.properties
@@ -1 +1,2 @@
-quarkus.micrometer.binder.http-server.enabled=false
+quarkus.micrometer.enabled=true
+quarkus.micrometer.binder-enabled-default=false