From 19047f1c53c1c833736a353f507aa7338004b46e Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 17 Jun 2019 15:37:30 +0900 Subject: [PATCH] Rename DoubleFormat.decimalOrWhole() (#673) Co-Authored-By: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com> --- .../java/io/micrometer/atlas/AtlasMeterRegistry.java | 4 ++-- .../io/micrometer/newrelic/NewRelicMeterRegistry.java | 2 +- .../core/instrument/distribution/HistogramGauges.java | 4 ++-- .../micrometer/core/instrument/util/DoubleFormat.java | 11 +++++++++++ .../core/instrument/util/DoubleFormatTest.java | 10 +++++----- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java b/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java index 87467e9c91..6518fa1aac 100644 --- a/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java +++ b/implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java @@ -126,7 +126,7 @@ protected io.micrometer.core.instrument.DistributionSummary newDistributionSumma percentile -> Tags.concat(id.getTags(), "percentile", DoubleFormat.decimalOrNan(percentile.percentile())), ValueAtPercentile::value, bucket -> id.getName(), - bucket -> Tags.concat(id.getTags(), "sla", DoubleFormat.decimalOrWhole(bucket.bucket()))); + bucket -> Tags.concat(id.getTags(), "sla", DoubleFormat.wholeOrDecimal(bucket.bucket()))); return summary; } @@ -150,7 +150,7 @@ protected Timer newTimer(Meter.Id id, DistributionStatisticConfig distributionSt percentile -> Tags.concat(id.getTags(), "percentile", DoubleFormat.decimalOrNan(percentile.percentile())), percentile -> percentile.value(timer.baseTimeUnit()), bucket -> id.getName(), - bucket -> Tags.concat(id.getTags(), "sla", DoubleFormat.decimalOrWhole(bucket.bucket(timer.baseTimeUnit())))); + bucket -> Tags.concat(id.getTags(), "sla", DoubleFormat.wholeOrDecimal(bucket.bucket(timer.baseTimeUnit())))); return timer; } diff --git a/implementations/micrometer-registry-new-relic/src/main/java/io/micrometer/newrelic/NewRelicMeterRegistry.java b/implementations/micrometer-registry-new-relic/src/main/java/io/micrometer/newrelic/NewRelicMeterRegistry.java index 1591c9f3a0..6394d25285 100644 --- a/implementations/micrometer-registry-new-relic/src/main/java/io/micrometer/newrelic/NewRelicMeterRegistry.java +++ b/implementations/micrometer-registry-new-relic/src/main/java/io/micrometer/newrelic/NewRelicMeterRegistry.java @@ -230,7 +230,7 @@ private String event(Meter.Id id, Iterable extraTags, Attribute... attribut } return "{\"eventType\":\"" + getConventionName(id) + "\"" + - Arrays.stream(attributes).map(attr -> ",\"" + attr.getName() + "\":" + DoubleFormat.decimalOrWhole(attr.getValue().doubleValue())) + Arrays.stream(attributes).map(attr -> ",\"" + attr.getName() + "\":" + DoubleFormat.wholeOrDecimal(attr.getValue().doubleValue())) .collect(Collectors.joining("")) + tagsJson.toString() + "}"; } diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/HistogramGauges.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/HistogramGauges.java index dada6c13a8..2f08559f55 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/HistogramGauges.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/HistogramGauges.java @@ -50,7 +50,7 @@ public static HistogramGauges registerWithCommonFormat(Timer timer, MeterRegistr bucket -> id.getName() + ".histogram", // We look for Long.MAX_VALUE to ensure a sensible tag on our +Inf bucket bucket -> Tags.concat(id.getTags(), "le", bucket.bucket() != Long.MAX_VALUE - ? DoubleFormat.decimalOrWhole(bucket.bucket(timer.baseTimeUnit())) : "+Inf")); + ? DoubleFormat.wholeOrDecimal(bucket.bucket(timer.baseTimeUnit())) : "+Inf")); } public static HistogramGauges registerWithCommonFormat(DistributionSummary summary, MeterRegistry registry) { @@ -62,7 +62,7 @@ public static HistogramGauges registerWithCommonFormat(DistributionSummary summa bucket -> id.getName() + ".histogram", // We look for Long.MAX_VALUE to ensure a sensible tag on our +Inf bucket bucket -> Tags.concat(id.getTags(), "le", bucket.bucket() != Long.MAX_VALUE - ? DoubleFormat.decimalOrWhole(bucket.bucket()) : "+Inf")); + ? DoubleFormat.wholeOrDecimal(bucket.bucket()) : "+Inf")); } public static HistogramGauges register(HistogramSupport meter, MeterRegistry registry, diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/util/DoubleFormat.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/util/DoubleFormat.java index e7ffae1b50..3282d7c152 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/util/DoubleFormat.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/util/DoubleFormat.java @@ -69,8 +69,19 @@ public static String decimalOrNan(double d) { * @param d Number to format. * @return A stringified version of the number that only uses a decimal representation if the number is not * whole. + * @deprecated since 1.0.11 in favour of {@link #wholeOrDecimal(double)} */ + @Deprecated public static String decimalOrWhole(double d) { return WHOLE_OR_DECIMAL.get().format(d); } + + /** + * @param d Number to format. + * @return A stringified version of the number that only uses a decimal representation if the number is not + * whole. + */ + public static String wholeOrDecimal(double d) { + return WHOLE_OR_DECIMAL.get().format(d); + } } diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/util/DoubleFormatTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/util/DoubleFormatTest.java index 9dcfca8940..82092bac6b 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/util/DoubleFormatTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/util/DoubleFormatTest.java @@ -29,15 +29,15 @@ void decimalOrNan() { } @Test - void decimalOrWhole() { - assertThat(DoubleFormat.decimalOrWhole(123456.1234567)).isEqualTo("123456.123457"); - assertThat(DoubleFormat.decimalOrWhole(1)).isEqualTo("1"); + void wholeOrDecimal() { + assertThat(DoubleFormat.wholeOrDecimal(123456.1234567)).isEqualTo("123456.123457"); + assertThat(DoubleFormat.wholeOrDecimal(1)).isEqualTo("1"); } @Issue("#539") @Test void noScientificNotation() { - assertThat(DoubleFormat.decimalOrWhole(4.6875392E7)).isEqualTo("46875392"); + assertThat(DoubleFormat.wholeOrDecimal(4.6875392E7)).isEqualTo("46875392"); assertThat(DoubleFormat.decimalOrNan(4.6875392E7)).isEqualTo("46875392"); } -} \ No newline at end of file +}