Skip default Micrometer registries if the application provides a diff…

…erent implementation.
roguexz · Feb 21, 2021 · 043b1ec · 043b1ec
1 parent 2b56bc6
commit 043b1ec
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/...ns/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java b/...ns/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java
@@ -29,8 +29,10 @@
 import io.micrometer.core.instrument.binder.system.FileDescriptorMetrics;
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
 import io.micrometer.core.instrument.binder.system.UptimeMetrics;
+import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.InjectableBean;
 import io.quarkus.micrometer.runtime.binder.HttpBinderConfiguration;
 import io.quarkus.micrometer.runtime.binder.JVMInfoBinder;
 import io.quarkus.micrometer.runtime.binder.vertx.VertxMeterBinderAdapter;
@@ -83,7 +85,25 @@ public void configureRegistries(MicrometerConfig config,
 
         // Find and configure MeterRegistry beans (includes runtime config)
         Set<Bean<?>> beans = new HashSet<>(beanManager.getBeans(MeterRegistry.class, Any.Literal.INSTANCE));
-        beans.removeIf(bean -> bean.getBeanClass().equals(CompositeRegistryCreator.class));
+        List<Bean<?>> defaultBeans = new ArrayList<>();
+        // Separate the "default bean" implementations from the collection.
+        beans.removeIf(bean -> {
+            if (bean.getBeanClass().equals(CompositeMeterRegistry.class)) {
+                return true;
+            }
+            if (bean instanceof InjectableBean) {
+                InjectableBean<?> qBean = (InjectableBean<?>) bean;
+                if (qBean.isDefaultBean()) {
+                    defaultBeans.add(qBean);
+                    return true;
+                }
+            }
+            return false;
+        });
+        // Check if we the application has provided any concrete implementation for the default beans
+        defaultBeans.removeIf(defBean -> beans.stream().anyMatch(b -> b.getTypes().containsAll(defBean.getTypes())));
+        // Merge the default beans that have not been overridden.
+        beans.addAll(defaultBeans);
 
         for (Bean<?> i : beans) {
             MeterRegistry registry = (MeterRegistry) beanManager