Skip to content

Commit 33d1f7e

Browse files
Merge branch '1.13.x' into 1.14.x
2 parents 59a851a + 79939c3 commit 33d1f7e

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,15 @@ subprojects {
7979
"StringCaseLocaleUsage"
8080
)
8181
options.errorprone.disable(
82-
"StringConcatToTextBlock"
82+
"StringConcatToTextBlock" // Requires JDK 15+
8383
)
8484

85+
if (it.name == "compileJava" && !(it.project.name in ["micrometer-java11"])) {
86+
options.errorprone.disable(
87+
"JavaDurationGetSecondsToToSeconds" // Requires JDK 9+
88+
)
89+
}
90+
8591
if (!javaLanguageVersion.canCompileOrRun(17)) {
8692
// Error Prone does not work with JDK <17
8793
options.errorprone.enabled = false

implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpDeltaMeterRegistryTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ void distributionSummaryWithHistogram() {
313313

314314
stepOverNStep(1);
315315
ds.record(4);
316-
clock.addSeconds(otlpConfig().step().getSeconds() - 5);
316+
clock.addSeconds(otlpConfig().step().toSeconds() - 5);
317317

318318
metric = writeToMetric(ds);
319319
assertHistogram(writeToMetric(ds), TimeUnit.MINUTES.toNanos(2), TimeUnit.MINUTES.toNanos(3), BaseUnits.BYTES, 1,
@@ -386,7 +386,7 @@ void testMetricsStartAndEndTime() {
386386
Function<Meter, NumberDataPoint> getDataPoint = (meter) -> writeToMetric(meter).getSum().getDataPoints(0);
387387
assertThat(getDataPoint.apply(counter).getStartTimeUnixNano()).isEqualTo(0);
388388
assertThat(getDataPoint.apply(counter).getTimeUnixNano()).isEqualTo(60000000000L);
389-
clock.addSeconds(otlpConfig().step().getSeconds() - 1);
389+
clock.addSeconds(otlpConfig().step().toSeconds() - 1);
390390
assertThat(getDataPoint.apply(counter).getStartTimeUnixNano()).isEqualTo(0);
391391
assertThat(getDataPoint.apply(counter).getTimeUnixNano()).isEqualTo(60000000000L);
392392
clock.addSeconds(1);
@@ -428,15 +428,15 @@ void scheduledRollOver() {
428428
assertThat(writeToMetric(functionTimer).getHistogram().getDataPoints(0).getSum()).isEqualTo(16);
429429
assertThat(writeToMetric(functionTimer).getHistogram().getDataPoints(0).getCount()).isEqualTo(16);
430430

431-
clock.addSeconds(otlpConfig().step().getSeconds() / 2);
431+
clock.addSeconds(otlpConfig().step().toSeconds() / 2);
432432
// pollMeters should be idempotent within a time window
433433
registry.pollMetersToRollover();
434434
assertSum(writeToMetric(counter), TimeUnit.MINUTES.toNanos(1), TimeUnit.MINUTES.toNanos(2), 1);
435435
assertThat(writeToMetric(functionCounter).getSum().getDataPoints(0).getAsDouble()).isEqualTo(16);
436436
assertThat(writeToMetric(functionTimer).getHistogram().getDataPoints(0).getSum()).isEqualTo(16);
437437
assertThat(writeToMetric(functionTimer).getHistogram().getDataPoints(0).getCount()).isEqualTo(16);
438438

439-
clock.addSeconds(otlpConfig().step().getSeconds() / 2);
439+
clock.addSeconds(otlpConfig().step().toSeconds() / 2);
440440
registry.pollMetersToRollover();
441441
assertSum(writeToMetric(counter), TimeUnit.MINUTES.toNanos(2), TimeUnit.MINUTES.toNanos(3), 10);
442442
assertThat(writeToMetric(functionCounter).getSum().getDataPoints(0).getAsDouble()).isEqualTo(10);

implementations/micrometer-registry-otlp/src/test/java/io/micrometer/registry/otlp/OtlpMeterRegistryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ protected List<Metric> writeAllMeters() {
425425
}
426426

427427
protected void stepOverNStep(int numStepsToSkip) {
428-
clock.addSeconds(otlpConfig().step().getSeconds() * numStepsToSkip);
428+
clock.addSeconds(otlpConfig().step().toSeconds() * numStepsToSkip);
429429
}
430430

431431
@SuppressWarnings("deprecation")

micrometer-test/src/main/java/io/micrometer/core/tck/MeterRegistryCompatibilityKit.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,12 +594,12 @@ void multiGaugesCanBeRegisteredEffectivelyTwice() {
594594
gauges.register(Collections.singletonList(MultiGauge.Row.of(Tags.of("ignored", "true"), 4)));
595595

596596
// no re-registration since overwrite is false by default
597-
gauges.register(Collections.singletonList(MultiGauge.Row.of(Tags.of("ignored", "true"), 5)));
597+
gauges.register(Collections.singletonList(MultiGauge.Row.of(Tags.of("ignored", "false"), 5)));
598598
assertThat(registry.get("my.gauge").gauges()).hasSize(1);
599599
assertThat(registry.get("my.gauge").gauge().value()).isEqualTo(4);
600600

601601
// re-registration since overwrite is set to true
602-
gauges.register(Collections.singletonList(MultiGauge.Row.of(Tags.of("ignored", "true"), 6)), true);
602+
gauges.register(Collections.singletonList(MultiGauge.Row.of(Tags.of("ignored", "false"), 6)), true);
603603
assertThat(registry.get("my.gauge").gauges()).hasSize(1);
604604
assertThat(registry.get("my.gauge").gauge().value()).isEqualTo(6);
605605
}

0 commit comments

Comments
 (0)