Fix tests

micrometer-metrics · Jul 1, 2024 · 60a3a76 · 60a3a76
1 parent 573e52c
commit 60a3a76
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/...istry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpCumulativeMeterRegistryTest.java b/...istry-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/...r-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java b/...r-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/...heus-simpleclient/src/test/java/io/micrometer/prometheus/PrometheusMeterRegistryTest.java b/...heus-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/...prometheus/src/test/java/io/micrometer/prometheusmetrics/PrometheusMeterRegistryTest.java b/...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/...icrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryTest.java b/...icrometer-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/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/...core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowRotationTest.java b/...core/src/test/java/io/micrometer/core/instrument/distribution/TimeWindowRotationTest.java
@@ -54,7 +54,7 @@ private static void expectValidationFailure(Class<? extends AbstractTimeWindowHi
     @MethodSource("histogramTypes")
     void rotationIntervalValidation(Class<? extends AbstractTimeWindowHistogram<?, ?>> histogramType) {
         expectValidationFailure(histogramType,
-                DistributionStatisticConfig.builder().expiry(Duration.ofMillis(9)).bufferLength(10).build());
+                DistributionStatisticConfig.builder().expiry(Duration.ofMillis(-10)).build());
     }
 
 }
diff --git a/...e/src/test/java/io/micrometer/core/instrument/dropwizard/DropwizardMeterRegistryTest.java b/...e/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/...eter-core/src/test/java/io/micrometer/core/instrument/simple/SimpleMeterRegistryTest.java b/...eter-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
@@ -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);