Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Excavator: Upgrades Baseline to the latest version #1453

Merged
merged 1 commit into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.31.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.32.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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
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;
Expand Down Expand Up @@ -49,7 +50,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);
private final RateLimiter loggingRateLimiter = RateLimiter.create(2, Duration.ZERO);
/**
* 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
RateLimiter rateLimiter = RateLimiter.create(permitsPerSecond, Duration.ZERO);

undertowHandler = exchange -> {
// These thread.sleep times are taken from a prod instance of internal-ski-product.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
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;
Expand All @@ -41,7 +42,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);
private static final RateLimiter VALIDATION_FAILED_LOGGING_LIMITER = RateLimiter.create(1, Duration.ZERO);

private final Channel delegate;
private final Set<String> hosts;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@
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);
private static final RateLimiter unknownThrowableLoggingRateLimiter = RateLimiter.create(1, Duration.ZERO);

private final EndpointChannel delegate;
private final Timer successTimer;
Expand Down