From 79313d7cfee7a7cf5887762988e846dfef4db015 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Wed, 3 Nov 2021 21:06:55 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- .../conjure/java/okhttp/DeprecationWarningInterceptor.java | 3 ++- .../java/com/palantir/conjure/java/okhttp/FlowControlTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 49126d748b..40926ca995 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.5.0' classpath 'com.palantir.gradle.revapi:gradle-revapi:1.5.0' classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1' - classpath 'com.palantir.baseline:gradle-baseline-java:4.31.0' + classpath 'com.palantir.baseline:gradle-baseline-java:4.33.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3' classpath 'com.palantir.metricschema:gradle-metric-schema:0.8.0' classpath 'gradle.plugin.org.inferred:gradle-processors:3.6.0' diff --git a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/DeprecationWarningInterceptor.java b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/DeprecationWarningInterceptor.java index 0c58e4af3d..4e13618180 100644 --- a/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/DeprecationWarningInterceptor.java +++ b/okhttp-clients/src/main/java/com/palantir/conjure/java/okhttp/DeprecationWarningInterceptor.java @@ -21,6 +21,7 @@ import com.palantir.logsafe.logger.SafeLogger; import com.palantir.logsafe.logger.SafeLoggerFactory; import java.io.IOException; +import java.time.Duration; import okhttp3.Interceptor; import okhttp3.Response; @@ -34,7 +35,7 @@ final class DeprecationWarningInterceptor implements Interceptor { private static final SafeLogger log = SafeLoggerFactory.get(DeprecationWarningInterceptor.class); // log at most once per minute - private final RateLimiter loggingRateLimiter = RateLimiter.create(1.0 / 60.0); + private final RateLimiter loggingRateLimiter = RateLimiter.create(1.0 / 60.0, Duration.ZERO); private final ClientMetrics clientMetrics; private final String serviceClassName; diff --git a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/FlowControlTest.java b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/FlowControlTest.java index 6a41409050..38403ee4c0 100644 --- a/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/FlowControlTest.java +++ b/okhttp-clients/src/test/java/com/palantir/conjure/java/okhttp/FlowControlTest.java @@ -103,7 +103,7 @@ public void test16ThreadsRateLimit20() throws ExecutionException, InterruptedExc private Stream createWorkers( Meter rate, Histogram avgRetries, int numThreads, int rateLimit, Duration delay) { - RateLimiter rateLimiter = RateLimiter.create(rateLimit); + RateLimiter rateLimiter = RateLimiter.create(rateLimit, Duration.ZERO); return IntStream.range(0, numThreads) .mapToObj(_unused -> new Worker( () -> new ExponentialBackoff(4, Duration.ofMillis(250)),