From 6334317d9f57c72545b9ee7f81124e4c513e9bb9 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Fri, 5 Nov 2021 09:02:48 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- .../InactivityValidationAwareConnectionKeepAliveStrategy.java | 3 +-- .../test/java/com/palantir/verification/IntegrationTest.java | 2 +- .../palantir/dialogue/core/RetryOtherValidatingChannel.java | 3 +-- .../java/com/palantir/dialogue/core/TimingEndpointChannel.java | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 99fe2c86f..fd9c16be9 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.5.0' classpath 'com.palantir.gradle.revapi:gradle-revapi:1.5.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.5.0' - classpath 'com.palantir.baseline:gradle-baseline-java:4.36.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.38.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3' classpath 'gradle.plugin.org.inferred:gradle-processors:3.6.0' classpath 'com.palantir.metricschema:gradle-metric-schema:0.8.0' diff --git a/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/InactivityValidationAwareConnectionKeepAliveStrategy.java b/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/InactivityValidationAwareConnectionKeepAliveStrategy.java index e0d89d944..cabc5c841 100644 --- a/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/InactivityValidationAwareConnectionKeepAliveStrategy.java +++ b/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/InactivityValidationAwareConnectionKeepAliveStrategy.java @@ -20,7 +20,6 @@ import com.palantir.logsafe.SafeArg; import com.palantir.logsafe.logger.SafeLogger; import com.palantir.logsafe.logger.SafeLoggerFactory; -import java.time.Duration; import java.util.Iterator; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; @@ -50,7 +49,7 @@ final class InactivityValidationAwareConnectionKeepAliveStrategy implements Conn private final PoolingHttpClientConnectionManager connectionManager; private final String clientName; private final TimeValue defaultValidateAfterInactivity; - private final RateLimiter loggingRateLimiter = RateLimiter.create(2, Duration.ZERO); + private final RateLimiter loggingRateLimiter = RateLimiter.create(2); /** * This field is used for observability. It's possible, though unlikely, that the value can get out of sync * with the connection manager in some scenarios. diff --git a/dialogue-client-verifier/src/test/java/com/palantir/verification/IntegrationTest.java b/dialogue-client-verifier/src/test/java/com/palantir/verification/IntegrationTest.java index feebe9a45..e7e75d232 100644 --- a/dialogue-client-verifier/src/test/java/com/palantir/verification/IntegrationTest.java +++ b/dialogue-client-verifier/src/test/java/com/palantir/verification/IntegrationTest.java @@ -201,7 +201,7 @@ public void when_thread_is_interrupted_no_requests_are_made() { @Test public void concurrency_limiters_can_effectively_infer_server_side_ratelimits() throws Exception { int permitsPerSecond = 300; - RateLimiter rateLimiter = RateLimiter.create(permitsPerSecond, Duration.ZERO); + RateLimiter rateLimiter = RateLimiter.create(permitsPerSecond); undertowHandler = exchange -> { // These thread.sleep times are taken from a prod instance of internal-ski-product. diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/RetryOtherValidatingChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/RetryOtherValidatingChannel.java index 991a804d3..a0545e1d2 100644 --- a/dialogue-core/src/main/java/com/palantir/dialogue/core/RetryOtherValidatingChannel.java +++ b/dialogue-core/src/main/java/com/palantir/dialogue/core/RetryOtherValidatingChannel.java @@ -33,7 +33,6 @@ import com.palantir.logsafe.logger.SafeLoggerFactory; import java.net.MalformedURLException; import java.net.URL; -import java.time.Duration; import java.util.Optional; import java.util.Set; import java.util.function.Consumer; @@ -42,7 +41,7 @@ final class RetryOtherValidatingChannel implements Channel { private static final SafeLogger log = SafeLoggerFactory.get(RetryOtherValidatingChannel.class); - private static final RateLimiter VALIDATION_FAILED_LOGGING_LIMITER = RateLimiter.create(1, Duration.ZERO); + private static final RateLimiter VALIDATION_FAILED_LOGGING_LIMITER = RateLimiter.create(1); private final Channel delegate; private final Set hosts; diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/TimingEndpointChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/TimingEndpointChannel.java index 2362dbd23..1dc7fd4eb 100644 --- a/dialogue-core/src/main/java/com/palantir/dialogue/core/TimingEndpointChannel.java +++ b/dialogue-core/src/main/java/com/palantir/dialogue/core/TimingEndpointChannel.java @@ -31,13 +31,12 @@ import com.palantir.logsafe.logger.SafeLoggerFactory; import com.palantir.tritium.metrics.registry.TaggedMetricRegistry; import java.io.IOException; -import java.time.Duration; import java.util.concurrent.TimeUnit; final class TimingEndpointChannel implements EndpointChannel { private static final SafeLogger log = SafeLoggerFactory.get(TimingEndpointChannel.class); - private static final RateLimiter unknownThrowableLoggingRateLimiter = RateLimiter.create(1, Duration.ZERO); + private static final RateLimiter unknownThrowableLoggingRateLimiter = RateLimiter.create(1); private final EndpointChannel delegate; private final Timer successTimer;