Prevent NPE when micrometer is disabled

Fixes: quarkusio#25099 (cherry picked from commit 037b780)
gsmet · May 18, 2022 · f485a52 · f485a52
1 parent 1b4086d
commit f485a52
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...ometer/deployment/src/main/java/io/quarkus/micrometer/deployment/MicrometerProcessor.java b/...ometer/deployment/src/main/java/io/quarkus/micrometer/deployment/MicrometerProcessor.java
@@ -75,6 +75,14 @@ public boolean getAsBoolean() {
 
     MicrometerConfig mConfig;
 
+    /**
+     * config objects are beans, but they are not unremoveable by default
+     */
+    @BuildStep
+    UnremovableBeanBuildItem mpConfigAsBean() {
+        return UnremovableBeanBuildItem.beanTypes(MicrometerConfig.class);
+    }
+
     @BuildStep(onlyIf = MicrometerEnabled.class)
     FeatureBuildItem feature() {
         return new FeatureBuildItem(Feature.MICROMETER);

diff --git a/...runtime/src/main/java/io/quarkus/micrometer/runtime/binder/RestClientMetricsListener.java b/...runtime/src/main/java/io/quarkus/micrometer/runtime/binder/RestClientMetricsListener.java
@@ -17,6 +17,7 @@
 import io.micrometer.core.instrument.Tags;
 import io.micrometer.core.instrument.Timer;
 import io.quarkus.arc.Arc;
+import io.quarkus.micrometer.runtime.config.MicrometerConfig;
 
 /**
  * This is initialized via ServiceFactory (static/non-CDI initialization)
@@ -35,6 +36,10 @@ public class RestClientMetricsListener implements RestClientListener {
 
     @Override
     public void onNewClient(Class<?> serviceInterface, RestClientBuilder builder) {
+        MicrometerConfig micrometerConfig = Arc.container().instance(MicrometerConfig.class).get();
+        if (!micrometerConfig.enabled) {
+            return;
+        }
         if (prepClientMetrics()) {
             // This must run AFTER the OpenTelmetry client request filter
             builder.register(this.clientRequestFilter, Priorities.HEADER_DECORATOR + 1);