From 1621addad097dcbcab5f67e610b9ce206fdb4eb2 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Thu, 27 May 2021 12:39:10 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- .../com/palantir/dialogue/core/HostMetricsChannelTest.java | 2 +- .../main/java/com/palantir/dialogue/core/CodahaleClock.java | 3 ++- .../core/NanosecondPrecisionDeterministicScheduler.java | 3 ++- .../palantir/dialogue/core/SimulationMetricsReporter.java | 5 +++-- .../test/java/com/palantir/dialogue/core/SimulationTest.java | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index a24a0dc210..efa4ff1b4c 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ buildscript { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.2.1' classpath 'com.palantir.gradle.revapi:gradle-revapi:1.4.4' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.0.1' - classpath 'com.palantir.baseline:gradle-baseline-java:3.83.0' + classpath 'com.palantir.baseline:gradle-baseline-java:3.87.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3' classpath 'gradle.plugin.org.inferred:gradle-processors:3.3.0' classpath 'com.palantir.metricschema:gradle-metric-schema:0.5.22' diff --git a/dialogue-core/src/test/java/com/palantir/dialogue/core/HostMetricsChannelTest.java b/dialogue-core/src/test/java/com/palantir/dialogue/core/HostMetricsChannelTest.java index be39f29b66..31d1ce6538 100644 --- a/dialogue-core/src/test/java/com/palantir/dialogue/core/HostMetricsChannelTest.java +++ b/dialogue-core/src/test/java/com/palantir/dialogue/core/HostMetricsChannelTest.java @@ -103,7 +103,7 @@ public void record( assertThat(hostname).isEqualTo("foo"); assertThat(port).isEqualTo(1001); assertThat(statusCode).isEqualTo(200); - assertThat(micros).isEqualTo(TimeUnit.MICROSECONDS.convert(3, TimeUnit.SECONDS)); + assertThat(micros).isEqualTo(TimeUnit.MICROSECONDS.convert(Duration.ofSeconds(3))); recorded.set(true); } diff --git a/simulation/src/main/java/com/palantir/dialogue/core/CodahaleClock.java b/simulation/src/main/java/com/palantir/dialogue/core/CodahaleClock.java index aa5827cc69..ee66440b52 100644 --- a/simulation/src/main/java/com/palantir/dialogue/core/CodahaleClock.java +++ b/simulation/src/main/java/com/palantir/dialogue/core/CodahaleClock.java @@ -18,6 +18,7 @@ import com.codahale.metrics.Clock; import com.github.benmanes.caffeine.cache.Ticker; +import java.time.Duration; import java.util.concurrent.TimeUnit; final class CodahaleClock extends Clock { @@ -34,6 +35,6 @@ public long getTick() { @Override public long getTime() { - return TimeUnit.MILLISECONDS.convert(getTick(), TimeUnit.NANOSECONDS); + return TimeUnit.MILLISECONDS.convert(Duration.ofNanos(getTick())); } } diff --git a/simulation/src/main/java/com/palantir/dialogue/core/NanosecondPrecisionDeterministicScheduler.java b/simulation/src/main/java/com/palantir/dialogue/core/NanosecondPrecisionDeterministicScheduler.java index 190cbf0fc8..9f2e0efe8e 100644 --- a/simulation/src/main/java/com/palantir/dialogue/core/NanosecondPrecisionDeterministicScheduler.java +++ b/simulation/src/main/java/com/palantir/dialogue/core/NanosecondPrecisionDeterministicScheduler.java @@ -16,6 +16,7 @@ package com.palantir.dialogue.core; +import java.time.Duration; import java.util.Collection; import java.util.List; import java.util.concurrent.Callable; @@ -274,7 +275,7 @@ public boolean repeats() { @Override public long getDelay(TimeUnit unit) { - return unit.convert(deltaQueue.delay(this), TimeUnit.NANOSECONDS); + return unit.convert(Duration.ofNanos(deltaQueue.delay(this))); } @Override diff --git a/simulation/src/main/java/com/palantir/dialogue/core/SimulationMetricsReporter.java b/simulation/src/main/java/com/palantir/dialogue/core/SimulationMetricsReporter.java index 91735d6b32..2f8923cba4 100644 --- a/simulation/src/main/java/com/palantir/dialogue/core/SimulationMetricsReporter.java +++ b/simulation/src/main/java/com/palantir/dialogue/core/SimulationMetricsReporter.java @@ -25,6 +25,7 @@ import com.palantir.logsafe.SafeArg; import com.palantir.tritium.metrics.registry.MetricName; import java.io.IOException; +import java.time.Duration; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -93,7 +94,7 @@ public void report() { }); long nanos = simulation.clock().read(); - double seconds = TimeUnit.MILLISECONDS.convert(nanos, TimeUnit.NANOSECONDS) / 1000d; + double seconds = TimeUnit.MILLISECONDS.convert(Duration.ofNanos(nanos)) / 1000d; measurements.get(X_AXIS).add(seconds); } @@ -140,7 +141,7 @@ public XYChart chart(Pattern metricNameRegex) { if (!simulation.events().getEvents().isEmpty()) { double[] eventXs = simulation.events().getEvents().keySet().stream() - .mapToDouble(nanos -> TimeUnit.MILLISECONDS.convert(nanos, TimeUnit.NANOSECONDS) / 1000d) + .mapToDouble(nanos -> TimeUnit.MILLISECONDS.convert(Duration.ofNanos(nanos)) / 1000d) .toArray(); double[] eventYs = new double[eventXs.length]; String[] strings = simulation.events().getEvents().values().stream().toArray(String[]::new); diff --git a/simulation/src/test/java/com/palantir/dialogue/core/SimulationTest.java b/simulation/src/test/java/com/palantir/dialogue/core/SimulationTest.java index 3756e40cce..98056d7270 100644 --- a/simulation/src/test/java/com/palantir/dialogue/core/SimulationTest.java +++ b/simulation/src/test/java/com/palantir/dialogue/core/SimulationTest.java @@ -582,7 +582,7 @@ public void after(TestInfo testInfo) throws IOException { Duration serverCpu = Duration.ofNanos( MetricNames.globalServerTimeNanos(simulation.taggedMetrics()).getCount()); long clientMeanNanos = (long) result.clientHistogram().getMean(); - double clientMeanMillis = TimeUnit.MILLISECONDS.convert(clientMeanNanos, TimeUnit.NANOSECONDS); + double clientMeanMillis = TimeUnit.MILLISECONDS.convert(Duration.ofNanos(clientMeanNanos)); // intentionally using tabs so that opening report.txt with 'cat' aligns columns nicely String longSummary = String.format(