Merge branch '1.9.x' into 1.11.x

Author: shakuzen

implementations/micrometer-registry-atlas/src/main/java/io/micrometer/atlas/AtlasMeterRegistry.java

@@ -107,9 +107,16 @@ protected io.micrometer.core.instrument.DistributionSummary newDistributionSumma
         com.netflix.spectator.api.DistributionSummary internalSummary;
 
         if (distributionStatisticConfig.isPercentileHistogram()) {
+            long min = distributionStatisticConfig.getMinimumExpectedValueAsDouble() == null ? 0
+                    : distributionStatisticConfig.getMinimumExpectedValueAsDouble().longValue();
+            long max = distributionStatisticConfig.getMaximumExpectedValueAsDouble() == null ? Long.MAX_VALUE
+                    : distributionStatisticConfig.getMaximumExpectedValueAsDouble().longValue();
             // This doesn't report the normal count/totalTime/max stats, so we treat it as
             // additive
-            internalSummary = PercentileDistributionSummary.get(registry, spectatorId(id));
+            internalSummary = PercentileDistributionSummary.builder(registry)
+                .withId(spectatorId(id))
+                .withRange(min, max)
+                .build();
         }
         else {
             internalSummary = registry.distributionSummary(spectatorId(id));
@@ -134,9 +141,16 @@ protected Timer newTimer(Meter.Id id, DistributionStatisticConfig distributionSt
         com.netflix.spectator.api.Timer internalTimer;
 
         if (distributionStatisticConfig.isPercentileHistogram()) {
+            long minNanos = distributionStatisticConfig.getMinimumExpectedValueAsDouble() == null ? 0
+                    : distributionStatisticConfig.getMinimumExpectedValueAsDouble().longValue();
+            long maxNanos = distributionStatisticConfig.getMaximumExpectedValueAsDouble() == null ? Long.MAX_VALUE
+                    : distributionStatisticConfig.getMaximumExpectedValueAsDouble().longValue();
             // This doesn't report the normal count/totalTime/max stats, so we treat it as
             // additive
-            internalTimer = PercentileTimer.get(registry, spectatorId(id));
+            internalTimer = PercentileTimer.builder(registry)
+                .withId(spectatorId(id))
+                .withRange(minNanos, maxNanos, TimeUnit.NANOSECONDS)
+                .build();
         }
         else {
             internalTimer = registry.timer(spectatorId(id));