Excavator: Upgrades Baseline to the latest version

atlasdb-cassandra/src/test/java/com/palantir/atlasdb/cassandra/CassandraReloadableKvsConfigTest.java

@@ -132,7 +132,7 @@ public void ifInstallAndRuntimeServersEmpty_failsInitialization() {
                         () -> new CassandraReloadableKvsConfig(config, Refreshable.only(Optional.of(runtimeConfig))))
                 .isInstanceOf(SafeIllegalArgumentException.class)
                 .hasLogMessage("'servers' must have at least one defined host")
-                .hasExactlyArgs();
+                .hasNoArgs();
     }
 
     @Test

atlasdb-client/src/main/java/com/palantir/atlasdb/util/SlidingWindowMetricsInvocationHandler.java

@@ -27,9 +27,9 @@
 import com.palantir.tritium.event.DefaultInvocationContext;
 import com.palantir.tritium.event.InvocationContext;
 import java.lang.reflect.Method;
+import java.time.Duration;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -65,7 +65,7 @@ public void onSuccess(@Nullable InvocationContext context, @Nullable Object resu
         long nanos = System.nanoTime() - context.getStartTimeNanos();
         Method method = context.getMethod();
         Timer timer = timers.computeIfAbsent(method, this::getTimer);
-        timer.update(nanos, TimeUnit.NANOSECONDS);
+        timer.update(Duration.ofNanos(nanos));
     }
 
     @Override

atlasdb-client/src/main/java/com/palantir/atlasdb/util/TaggedMetricsInvocationEventHandler.java

@@ -32,11 +32,11 @@
 import com.palantir.tritium.metrics.registry.MetricName;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
 import java.lang.reflect.Method;
+import java.time.Duration;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -130,7 +130,7 @@ public void onFailure(Throwable t) {
 
     public void update(InvocationContext context) {
         long nanos = System.nanoTime() - context.getStartTimeNanos();
-        getSuccessTimer(context).update(nanos, TimeUnit.NANOSECONDS);
+        getSuccessTimer(context).update(Duration.ofNanos(nanos));
     }
 
     private Timer getSuccessTimer(InvocationContext context) {

atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/SnapshotTransaction.java

@@ -138,6 +138,8 @@
 import com.palantir.util.AssertUtils;
 import com.palantir.util.paging.TokenBackedBasicResultsPage;
 import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -1885,7 +1887,7 @@ private void commitWrites(TransactionService transactionService) {
                         () -> putCommitTimestamp(commitTimestamp, commitLocksToken, transactionService));
 
                 long microsSinceCreation = TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis() - timeCreated);
-                getTimer("commitTotalTimeSinceTxCreation").update(microsSinceCreation, TimeUnit.MICROSECONDS);
+                getTimer("commitTotalTimeSinceTxCreation").update(Duration.of(microsSinceCreation, ChronoUnit.MICROS));
                 getHistogram(AtlasDbMetricNames.SNAPSHOT_TRANSACTION_BYTES_WRITTEN)
                         .update(byteCount.get());
             } finally {

atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/pue/InstrumentedConsensusForgettingStoreTest.java

@@ -34,6 +34,7 @@
 import com.palantir.common.streams.KeyedStream;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import com.palantir.tritium.metrics.registry.TaggedMetricRegistry;
+import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CountDownLatch;
@@ -82,7 +83,7 @@ public void timesCheckAndTouchOperations() {
         assertThat(metrics.checkAndTouch().getCount()).isEqualTo(2);
 
         doAnswer(invocation -> {
-                    Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
+                    Uninterruptibles.sleepUninterruptibly(Duration.ofMillis(100));
                     return null;
                 })
                 .when(delegate)

atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/pue/ResilientCommitTimestampPutUnlessExistsTableIntegrationTest.java

@@ -25,6 +25,7 @@
 import com.google.common.util.concurrent.Uninterruptibles;
 import com.palantir.atlasdb.transaction.encoding.TwoPhaseEncodingStrategy;
 import com.palantir.common.concurrent.PTExecutors;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -84,7 +85,7 @@ private void submitWriteTask(
             try {
                 writeExecutionLatch.await();
                 Uninterruptibles.sleepUninterruptibly(
-                        ThreadLocalRandom.current().nextInt(10), TimeUnit.MILLISECONDS);
+                        Duration.ofMillis(ThreadLocalRandom.current().nextInt(10)));
                 pueTable.putUnlessExists(startTimestamp, startTimestamp + writerIndex);
             } catch (RuntimeException e) {
                 // Expected - some failures will happen as part of our test.

atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/sweep/queue/TargetedSweepTest.java

@@ -38,8 +38,8 @@
 import com.palantir.atlasdb.transaction.api.Transaction;
 import com.palantir.atlasdb.transaction.api.TransactionConflictException;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -338,8 +338,8 @@ private void sweepNextBatch(ShardAndStrategy shardStrategy) {
      */
     private void waitForImmutableTimestampToBeStrictlyGreaterThan(long timestampToBePassed) {
         Awaitility.await()
-                .atMost(5, TimeUnit.SECONDS)
-                .pollInterval(10, TimeUnit.MILLISECONDS)
+                .atMost(Duration.ofSeconds(5))
+                .pollInterval(Duration.ofMillis(10))
                 .until(() -> timestampToBePassed < serializableTxManager.getImmutableTimestamp());
     }
 }

atlasdb-tests-shared/src/test/java/com/palantir/atlasdb/transaction/impl/SnapshotTransactionTest.java

@@ -118,6 +118,7 @@
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -384,8 +385,8 @@ public void testImmutableTs() throws Exception {
 
         // Immutable timestamp may not be cleared immediately.
         Awaitility.await("immutable timestamp should advance past our transaction's start timestamp")
-                .atMost(5, TimeUnit.SECONDS)
-                .pollInterval(10, TimeUnit.MILLISECONDS)
+                .atMost(Duration.ofSeconds(5))
+                .pollInterval(Duration.ofMillis(10))
                 .until(() -> startTs < txManager.getImmutableTimestamp());
     }
 

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         classpath 'com.netflix.nebula:gradle-info-plugin:10.1.3'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:17.3.3'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.4.0'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.38.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:4.53.0'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:5.13.0'
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.9.0'
         classpath 'com.palantir.metricschema:gradle-metric-schema:0.8.0'
@@ -24,7 +24,7 @@ buildscript {
 
 plugins {
     id 'com.github.johnrengelman.shadow' version '6.1.0'
-    id 'com.palantir.consistent-versions' version '2.0.0'
+    id 'com.palantir.consistent-versions' version '2.5.0'
     id 'org.unbroken-dome.test-sets' version '4.0.0'
     id 'com.google.protobuf' version '0.8.17'
 }

lock-api/src/main/java/com/palantir/lock/client/LeaderElectionReportingTimelockService.java

@@ -52,7 +52,6 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -261,7 +260,7 @@ private void clearOldLongTermLeaders(List<UUID> sortedLongTermLeaders) {
     }
 
     private void updateMetrics(Duration timeTaken) {
-        metrics.observedDuration().update(timeTaken.toNanos(), TimeUnit.NANOSECONDS);
+        metrics.observedDuration().update(timeTaken);
     }
 
     private static Set<UUID> leadersWithBothBounds(Map<UUID, Instant> lowerBounds, Map<UUID, Instant> upperBounds) {

lock-api/src/test/java/com/palantir/lock/client/LeaderElectionReportingTimelockServiceTest.java

@@ -18,7 +18,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
@@ -120,7 +119,7 @@ public void reportMetricsOnLeaderElection() {
         timelockService.startTransactions(startTransactionsRequest);
         timelockService.startTransactions(startTransactionsRequest);
         verify(mockedRegistry, atLeast(1)).timer(any());
-        verify(mockedTimer, times(2)).update(anyLong(), any());
+        verify(mockedTimer, times(2)).update(any());
     }
 
     @Test
@@ -130,7 +129,7 @@ public void leaderIsInitialisedForAllMethods() {
         timelockService.getCommitTimestamps(commitTimestampsRequest);
         timelockService.startTransactions(startTransactionsRequest);
         verify(mockedRegistry).timer(any());
-        verify(mockedTimer).update(anyLong(), any());
+        verify(mockedTimer).update(any());
     }
 
     @Test
@@ -378,15 +377,15 @@ public void statisticsCausesMetricRegistryToBeReset() {
         timelockService.getStatisticsAndSetRegistryTo(newMockedRegistry);
 
         verify(mockedRegistry, atLeastOnce()).timer(any());
-        verify(mockedTimer).update(anyLong(), any());
+        verify(mockedTimer).update(any());
         verify(mockedTimer).getSnapshot();
         verify(mockedSnapshot).size();
 
         timelockService.startTransactions(startTransactionsRequest);
         timelockService.startTransactions(startTransactionsRequest);
 
         verify(newMockedRegistry, atLeastOnce()).timer(any());
-        verify(newMockedTimer).update(anyLong(), any());
+        verify(newMockedTimer).update(any());
         verifyNoMoreInteractions(mockedRegistry);
         verifyNoMoreInteractions(mockedTimer);
     }

timelock-impl/src/main/java/com/palantir/atlasdb/timelock/lock/LoggingLockEvents.java

@@ -24,9 +24,9 @@
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.logsafe.logger.SafeLogger;
 import com.palantir.logsafe.logger.SafeLoggerFactory;
+import java.time.Duration;
 import java.util.Collection;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 public class LoggingLockEvents implements LockEvents {
@@ -54,7 +54,7 @@ public void registerRequest(RequestInfo request) {
 
     @Override
     public void timedOut(RequestInfo request, long acquisitionTimeMillis) {
-        requestTimer.update(acquisitionTimeMillis, TimeUnit.MILLISECONDS);
+        requestTimer.update(Duration.ofMillis(acquisitionTimeMillis));
         if (!isSlowAcquisition(acquisitionTimeMillis)) {
             return;
         }
@@ -70,7 +70,7 @@ public void timedOut(RequestInfo request, long acquisitionTimeMillis) {
 
     @Override
     public void successfulAcquisition(RequestInfo request, long acquisitionTimeMillis) {
-        requestTimer.update(acquisitionTimeMillis, TimeUnit.MILLISECONDS);
+        requestTimer.update(Duration.ofMillis(acquisitionTimeMillis));
         if (!isSlowAcquisition(acquisitionTimeMillis)) {
             return;
         }