This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit f4cb93e6963f8f17c5e8bb2119fc806036edd7e4 Author: Claus Ibsen <[email protected]> AuthorDate: Wed Oct 26 13:29:45 2022 +0200 CAMEL-18650: camel-micrometer - Fix sorting --- .../apache/camel/component/micrometer/json/MicrometerModule.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/json/MicrometerModule.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/json/MicrometerModule.java index 26a271b07e1..f499fda1cc5 100644 --- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/json/MicrometerModule.java +++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/json/MicrometerModule.java @@ -19,6 +19,7 @@ package org.apache.camel.component.micrometer.json; import java.io.IOException; import java.util.Arrays; import java.util.Comparator; +import java.util.LinkedHashSet; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; @@ -128,8 +129,8 @@ public class MicrometerModule extends Module { json.writeNumberField("total", snapshot.total(timeUnit)); ValueAtPercentile[] percentiles = snapshot.percentileValues(); for (ValueAtPercentile percentile : percentiles) { - // TODO format "p%0.3d" is incorrect - json.writeNumberField(String.format("p%0.3d", percentile.percentile()), percentile.value(timeUnit)); + int p = (int) percentile.percentile() * 100; + json.writeNumberField("p" + p, percentile.value(timeUnit)); } } } @@ -278,12 +279,12 @@ public class MicrometerModule extends Module { return ((CompositeMeterRegistry) meterRegistry).getRegistries().stream() .flatMap(reg -> meters(reg, clazz, matchingNames, matchingTags).stream()) .sorted(Comparator.comparing(o -> o.getId().getName())) - .collect(Collectors.toSet()); + .collect(Collectors.toCollection(LinkedHashSet::new)); } return Search.in(meterRegistry).name(matchingNames).tags(matchingTags).meters().stream() .filter(clazz::isInstance) .sorted(Comparator.comparing(o -> o.getId().getName())) - .collect(Collectors.toSet()); + .collect(Collectors.toCollection(LinkedHashSet::new)); } }
