diff --git a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java index 04d5c71626..f16e5addc2 100644 --- a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java +++ b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java @@ -482,12 +482,12 @@ void distributionSummaryWithPercentiles() { size.record(100); size.record(15); size.record(2233); - clock.add(otlpConfig().step()); + clock.add(otlpConfig().step().multipliedBy(3)); size.record(204); assertThat(writeToMetric(size).toString()) .isEqualTo("name: \"http.response.size\"\n" + "unit: \"bytes\"\n" + "summary {\n" + " data_points {\n" - + " start_time_unix_nano: 1000000\n" + " time_unix_nano: 60001000000\n" + " count: 4\n" + + " start_time_unix_nano: 1000000\n" + " time_unix_nano: 180001000000\n" + " count: 4\n" + " sum: 2552.0\n" + " quantile_values {\n" + " quantile: 0.5\n" + " value: 200.0\n" + " }\n" + " quantile_values {\n" + " quantile: 0.9\n" + " value: 200.0\n" + " }\n" + " quantile_values {\n" + " quantile: 0.99\n" + " value: 200.0\n" diff --git a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java index 93cc1b19a8..75bd59ff00 100644 --- a/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java +++ b/implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java @@ -316,7 +316,7 @@ void distributionSummaryWithPercentiles() { size.record(100); size.record(15); size.record(2233); - stepOverNStep(1); + stepOverNStep(3); size.record(204); Metric metric = writeToMetric(size); diff --git a/implementations/micrometer-registry-prometheus-simpleclient/src/test/java/io/micrometer/prometheus/PrometheusMeterRegistryTest.java b/implementations/micrometer-registry-prometheus-simpleclient/src/test/java/io/micrometer/prometheus/PrometheusMeterRegistryTest.java index 0bc53ffcec..decccf7eb9 100644 --- a/implementations/micrometer-registry-prometheus-simpleclient/src/test/java/io/micrometer/prometheus/PrometheusMeterRegistryTest.java +++ b/implementations/micrometer-registry-prometheus-simpleclient/src/test/java/io/micrometer/prometheus/PrometheusMeterRegistryTest.java @@ -428,7 +428,7 @@ void timerQuantilesAreBasedOffOfOnlyRecentSamples() { timer.record(5, TimeUnit.SECONDS); assertThat(timer.takeSnapshot().percentileValues()[0].value(TimeUnit.SECONDS)).isEqualTo(5.0, offset(0.1)); - clock.addSeconds(60); + clock.add(Duration.ofMinutes(2)); timer.record(2, TimeUnit.SECONDS); @@ -449,7 +449,7 @@ void summaryQuantilesAreBasedOffOfOnlyRecentSamples() { timer.record(5); assertThat(timer.takeSnapshot().percentileValues()[0].value()).isEqualTo(5.0, offset(0.2)); - clock.addSeconds(60); + clock.add(Duration.ofMinutes(2)); timer.record(2); diff --git a/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheusmetrics/PrometheusMeterRegistryTest.java b/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheusmetrics/PrometheusMeterRegistryTest.java index 40e0d1be33..82749c2051 100644 --- a/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheusmetrics/PrometheusMeterRegistryTest.java +++ b/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheusmetrics/PrometheusMeterRegistryTest.java @@ -461,7 +461,7 @@ void timerQuantilesAreBasedOffOfOnlyRecentSamples() { timer.record(5, TimeUnit.SECONDS); assertThat(timer.takeSnapshot().percentileValues()[0].value(TimeUnit.SECONDS)).isEqualTo(5.0, offset(0.1)); - clock.addSeconds(60); + clock.add(Duration.ofMinutes(2)); timer.record(2, TimeUnit.SECONDS); @@ -482,7 +482,7 @@ void summaryQuantilesAreBasedOffOfOnlyRecentSamples() { timer.record(5); assertThat(timer.takeSnapshot().percentileValues()[0].value()).isEqualTo(5.0, offset(0.2)); - clock.addSeconds(60); + clock.add(Duration.ofMinutes(2)); timer.record(2); diff --git a/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryTest.java b/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryTest.java index c3fc93166a..b8b4bc28e2 100644 --- a/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryTest.java +++ b/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryTest.java @@ -311,7 +311,7 @@ void serviceLevelObjectivesOnlyNoPercentileHistogram(StatsdFlavor flavor) { assertThat(timerHist1.value()).isEqualTo(1); assertThat(timerHist2.value()).isEqualTo(1); - clock.add(config.step()); + clock.add(config.step().multipliedBy(3)); assertThat(summaryHist1.value()).isEqualTo(0); assertThat(summaryHist2.value()).isEqualTo(0); diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/AbstractTimeWindowHistogram.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/AbstractTimeWindowHistogram.java index 40dd19561e..68352cd54d 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/AbstractTimeWindowHistogram.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/distribution/AbstractTimeWindowHistogram.java @@ -74,10 +74,10 @@ abstract class AbstractTimeWindowHistogram implements Histogram { ringBuffer = (T[]) Array.newInstance(bucketType, ageBuckets); - durationBetweenRotatesMillis = distributionStatisticConfig.getExpiry().toMillis() / ageBuckets; + durationBetweenRotatesMillis = distributionStatisticConfig.getExpiry().toMillis(); if (durationBetweenRotatesMillis <= 0) { - rejectHistogramConfig("expiry (" + distributionStatisticConfig.getExpiry().toMillis() - + "ms) / bufferLength (" + ageBuckets + ") must be greater than 0."); + rejectHistogramConfig( + "expiry (" + distributionStatisticConfig.getExpiry().toMillis() + "ms) must be greater than 0."); } currentBucket = 0; diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/DistributionSummaryTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/DistributionSummaryTest.java index ab836fe3d7..f48bafac0c 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/DistributionSummaryTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/DistributionSummaryTest.java @@ -37,7 +37,7 @@ void histogramsInCumulativeMode() { // Histogram bucket counts DO roll over at the step interval, so decay. assertThat(summary.takeSnapshot().histogramCounts()).containsExactly(new CountAtBucket(1.0, 1)); - clock.add(SimpleConfig.DEFAULT.step()); + clock.add(SimpleConfig.DEFAULT.step().multipliedBy(3)); assertThat(summary.takeSnapshot().histogramCounts()).containsExactly(new CountAtBucket(1.0, 0)); } @@ -63,7 +63,7 @@ public CountingMode mode() { summary.record(1); assertThat(summary.takeSnapshot().histogramCounts()).containsExactly(new CountAtBucket(1.0, 1)); - clock.add(SimpleConfig.DEFAULT.step()); + clock.add(SimpleConfig.DEFAULT.step().multipliedBy(3)); assertThat(summary.takeSnapshot().histogramCounts()).containsExactly(new CountAtBucket(1.0, 0)); } diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowPercentileHistogramTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowPercentileHistogramTest.java index 04764c32fd..f59fb7d0bb 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowPercentileHistogramTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowPercentileHistogramTest.java @@ -162,7 +162,7 @@ private boolean percentileValueIsApproximately(ValueAtPercentile vp, double perc void timeBasedSlidingWindow() { final DistributionStatisticConfig config = DistributionStatisticConfig.builder() .percentiles(0.0, 0.5, 0.75, 0.9, 0.99, 0.999, 1.0) - .expiry(Duration.ofSeconds(4)) + .expiry(Duration.ofSeconds(1)) .bufferLength(4) .build() .merge(DistributionStatisticConfig.DEFAULT); diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowRotationTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowRotationTest.java index b858f78626..cb395ce792 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowRotationTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowRotationTest.java @@ -54,7 +54,7 @@ private static void expectValidationFailure(Class> histogramType) { expectValidationFailure(histogramType, - DistributionStatisticConfig.builder().expiry(Duration.ofMillis(9)).bufferLength(10).build()); + DistributionStatisticConfig.builder().expiry(Duration.ofMillis(-10)).build()); } } diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/dropwizard/DropwizardMeterRegistryTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/dropwizard/DropwizardMeterRegistryTest.java index ba26eb2da2..95371d34c7 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/dropwizard/DropwizardMeterRegistryTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/dropwizard/DropwizardMeterRegistryTest.java @@ -95,7 +95,7 @@ void serviceLevelObjectivesOnlyNoPercentileHistogram() { assertThat(summaryHist2.value()).isEqualTo(1); assertThat(timerHist.value()).isEqualTo(1); - clock.add(config.step()); + clock.add(config.step().multipliedBy(3)); assertThat(summaryHist1.value()).isEqualTo(0); assertThat(summaryHist2.value()).isEqualTo(0); diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/simple/SimpleMeterRegistryTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/simple/SimpleMeterRegistryTest.java index def2adbfc0..d0ff18f480 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/simple/SimpleMeterRegistryTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/simple/SimpleMeterRegistryTest.java @@ -64,7 +64,7 @@ void serviceLevelObjectivesOnlyNoPercentileHistogram() { assertThat(summaryHist2.value()).isEqualTo(1); assertThat(timerHist.value()).isEqualTo(1); - clock.add(SimpleConfig.DEFAULT.step()); + clock.add(SimpleConfig.DEFAULT.step().multipliedBy(3)); assertThat(summaryHist1.value()).isEqualTo(0); assertThat(summaryHist2.value()).isEqualTo(0); diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/step/StepMeterRegistryTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/step/StepMeterRegistryTest.java index 2438f71301..95de9aa86d 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/step/StepMeterRegistryTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/step/StepMeterRegistryTest.java @@ -87,7 +87,7 @@ void serviceLevelObjectivesOnlyNoPercentileHistogram() { assertThat(summaryHist2.value()).isEqualTo(1); assertThat(timerHist.value()).isEqualTo(1); - clock.add(config.step()); + clock.add(config.step().multipliedBy(3)); assertThat(summaryHist1.value()).isEqualTo(0); assertThat(summaryHist2.value()).isEqualTo(0);