Merge branch '1.13.x' into 1.14.x

jonatan-ivanov · jonatan-ivanov · commit e8fa90549099 · 2025-03-28T13:29:53.000-07:00
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
@@ -231,11 +231,10 @@ void checkAndBindMetrics(MeterRegistry registry) {
                             registeredMeterIds.remove(otherId);
                         }
                         // Check if already exists
-                        else if (tags.size() == meterTagsWithCommonTags.size())
+                        else if (tags.size() == meterTagsWithCommonTags.size()) {
                             if (tags.containsAll(meterTagsWithCommonTags))
                                 return;
-                            else
-                                break;
+                        }
                         else
                             hasLessTags = true;
                     }

Original file line number	Diff line number	Diff line change
`@@ -231,11 +231,10 @@ void checkAndBindMetrics(MeterRegistry registry) {`
`231`	`231`	`registeredMeterIds.remove(otherId);`
`232`	`232`	`}`
`233`	`233`	`// Check if already exists`
`234`		`- else if (tags.size() == meterTagsWithCommonTags.size())`
	`234`	`+ else if (tags.size() == meterTagsWithCommonTags.size()) {`
`235`	`235`	`if (tags.containsAll(meterTagsWithCommonTags))`
`236`	`236`	`return;`
`237`		`- else`
`238`		`- break;`
	`237`	`+ }`
`239`	`238`	`else`
`240`	`239`	`hasLessTags = true;`
`241`	`240`	`}`