Merge branch '1.7.x'

tmarszal · Aug 31, 2021 · faedc1c · faedc1c
2 parents df8a65c + 8e2fb63
commit faedc1c
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaMetrics.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaMetrics.java
@@ -34,6 +34,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 import java.util.function.ToDoubleFunction;
+import java.util.stream.Collectors;
 
 import io.micrometer.core.lang.Nullable;
 import io.micrometer.core.util.internal.logging.InternalLogger;
@@ -158,6 +159,10 @@ void checkAndBindMetrics(MeterRegistry registry) {
 
         if (!currentMeters.equals(metrics.keySet())) {
             currentMeters = new HashSet<>(metrics.keySet());
+
+            Map<String, List<Meter>> registryMetersByNames = registry.getMeters().stream()
+                    .collect(Collectors.groupingBy(meter -> meter.getId().getName()));
+
             metrics.forEach((name, metric) -> {
                 // Filter out non-numeric values
                 // Filter out metrics from groups that include metadata
@@ -172,7 +177,7 @@ void checkAndBindMetrics(MeterRegistry registry) {
                 // Kafka has metrics with lower number of tags (e.g. with/without topic or partition tag)
                 // Remove meters with lower number of tags
                 boolean hasLessTags = false;
-                for (Meter other : registry.find(meterName).meters()) {
+                for (Meter other : registryMetersByNames.getOrDefault(meterName, emptyList())) {
                     List<Tag> tags = other.getId().getTags();
                     List<Tag> meterTagsWithCommonTags = meterTags(metric, true);
                     if (tags.size() < meterTagsWithCommonTags.size()) {
@@ -186,9 +191,12 @@ else if (tags.size() == meterTagsWithCommonTags.size())
                     else hasLessTags = true;
                 }
                 if (hasLessTags) return;
+
                 List<Tag> tags = meterTags(metric);
                 try {
-                    bindMeter(registry, metric, meterName, tags);
+                    Meter meter = bindMeter(registry, metric, meterName, tags);
+                    List<Meter> meters = registryMetersByNames.computeIfAbsent(meterName, k -> new ArrayList<>());
+                    meters.add(meter);
                 }
                 catch (Exception ex) {
                     String message = ex.getMessage();
@@ -204,9 +212,10 @@ else if (tags.size() == meterTagsWithCommonTags.size())
         }
     }
 
-    private void bindMeter(MeterRegistry registry, Metric metric, String name, Iterable<Tag> tags) {
+    private Meter bindMeter(MeterRegistry registry, Metric metric, String name, Iterable<Tag> tags) {
         Meter meter = registerMeter(registry, metric, name, tags);
         registeredMeters.add(meter);
+        return meter;
     }
 
     private Meter registerMeter(MeterRegistry registry, Metric metric, String name, Iterable<Tag> tags) {