Skip to content

Commit 79939c3

Browse files
authored
Fix JavaDurationGetSecondsToToSeconds warnings for tests (#6207)
This commit also disables JavaDurationGetSecondsToToSeconds for tasks that are not applicable. Signed-off-by: Johnny Lim <[email protected]>
1 parent 915710a commit 79939c3

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
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
@@ -292,7 +292,7 @@ void distributionSummaryWithHistogram() {
292292

293293
stepOverNStep(1);
294294
ds.record(4);
295-
clock.addSeconds(otlpConfig().step().getSeconds() - 5);
295+
clock.addSeconds(otlpConfig().step().toSeconds() - 5);
296296

297297
metric = writeToMetric(ds);
298298
assertHistogram(writeToMetric(ds), TimeUnit.MINUTES.toNanos(2), TimeUnit.MINUTES.toNanos(3), BaseUnits.BYTES, 1,
@@ -365,7 +365,7 @@ void testMetricsStartAndEndTime() {
365365
Function<Meter, NumberDataPoint> getDataPoint = (meter) -> writeToMetric(meter).getSum().getDataPoints(0);
366366
assertThat(getDataPoint.apply(counter).getStartTimeUnixNano()).isEqualTo(0);
367367
assertThat(getDataPoint.apply(counter).getTimeUnixNano()).isEqualTo(60000000000L);
368-
clock.addSeconds(otlpConfig().step().getSeconds() - 1);
368+
clock.addSeconds(otlpConfig().step().toSeconds() - 1);
369369
assertThat(getDataPoint.apply(counter).getStartTimeUnixNano()).isEqualTo(0);
370370
assertThat(getDataPoint.apply(counter).getTimeUnixNano()).isEqualTo(60000000000L);
371371
clock.addSeconds(1);
@@ -407,15 +407,15 @@ void scheduledRollOver() {
407407
assertThat(writeToMetric(functionTimer).getHistogram().getDataPoints(0).getSum()).isEqualTo(16);
408408
assertThat(writeToMetric(functionTimer).getHistogram().getDataPoints(0).getCount()).isEqualTo(16);
409409

410-
clock.addSeconds(otlpConfig().step().getSeconds() / 2);
410+
clock.addSeconds(otlpConfig().step().toSeconds() / 2);
411411
// pollMeters should be idempotent within a time window
412412
registry.pollMetersToRollover();
413413
assertSum(writeToMetric(counter), TimeUnit.MINUTES.toNanos(1), TimeUnit.MINUTES.toNanos(2), 1);
414414
assertThat(writeToMetric(functionCounter).getSum().getDataPoints(0).getAsDouble()).isEqualTo(16);
415415
assertThat(writeToMetric(functionTimer).getHistogram().getDataPoints(0).getSum()).isEqualTo(16);
416416
assertThat(writeToMetric(functionTimer).getHistogram().getDataPoints(0).getCount()).isEqualTo(16);
417417

418-
clock.addSeconds(otlpConfig().step().getSeconds() / 2);
418+
clock.addSeconds(otlpConfig().step().toSeconds() / 2);
419419
registry.pollMetersToRollover();
420420
assertSum(writeToMetric(counter), TimeUnit.MINUTES.toNanos(2), TimeUnit.MINUTES.toNanos(3), 10);
421421
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
@@ -331,7 +331,7 @@ protected List<Metric> writeAllMeters() {
331331
}
332332

333333
protected void stepOverNStep(int numStepsToSkip) {
334-
clock.addSeconds(otlpConfig().step().getSeconds() * numStepsToSkip);
334+
clock.addSeconds(otlpConfig().step().toSeconds() * numStepsToSkip);
335335
}
336336

337337
@SuppressWarnings("deprecation")

0 commit comments

Comments
 (0)