Excavator: Upgrades Baseline to the latest version (#878)

Co-authored-by: svc-excavator-bot <[email protected]>

Author: svc-excavator-bot

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath 'com.netflix.nebula:gradle-info-plugin:9.1.1'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:17.3.2'
-        classpath 'com.palantir.baseline:gradle-baseline-java:3.40.1'
+        classpath 'com.palantir.baseline:gradle-baseline-java:3.43.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.26.1'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
         classpath 'com.palantir.metricschema:gradle-metric-schema:0.5.13'

tritium-lib/src/main/java/com/palantir/tritium/proxy/Instrumentation.java

@@ -173,12 +173,11 @@ public Builder<T, U> withLogging(
                 Logger logger,
                 LoggingLevel loggingLevel,
                 com.palantir.tritium.api.functions.LongPredicate durationPredicate) {
-            return withLogging(logger, loggingLevel, (java.util.function.LongPredicate) durationPredicate);
+            return withLogging(logger, loggingLevel, (LongPredicate) durationPredicate);
         }
 
         @SuppressWarnings("FunctionalInterfaceClash")
-        public Builder<T, U> withLogging(
-                Logger logger, LoggingLevel loggingLevel, java.util.function.LongPredicate durationPredicate) {
+        public Builder<T, U> withLogging(Logger logger, LoggingLevel loggingLevel, LongPredicate durationPredicate) {
             this.handlers.add(new LoggingInvocationEventHandler(logger, loggingLevel, durationPredicate));
             return this;
         }

tritium-test/src/main/java/com/palantir/tritium/test/event/ThrowingInvocationEventHandler.java

@@ -33,7 +33,7 @@ public ThrowingInvocationEventHandler(boolean isEnabled) {
     }
 
     @Override
-    public com.palantir.tritium.event.InvocationContext preInvocation(
+    public InvocationContext preInvocation(
             @Nonnull Object _instance, @Nonnull Method _method, @Nonnull Object[] _args) {
         throw new SafeIllegalStateException("preInvocation always throws");
     }

tritium-tracing/src/test/java/com/palantir/tritium/tracing/TracingInvocationEventHandlerTest.java

@@ -64,7 +64,7 @@ public void before() throws Exception {
         executor = MoreExecutors.newDirectExecutorService();
         handler = TracingInvocationEventHandler.create("testComponent");
         assertThat(handler).isInstanceOf(TracingInvocationEventHandler.class);
-        com.palantir.tracing.Tracer.setSampler(AlwaysSampler.INSTANCE);
+        Tracer.setSampler(AlwaysSampler.INSTANCE);
         Tracer.subscribe("sysout", System.out::println);
         Tracer.subscribe("mock", mockSpanObserver);
         Tracer.subscribe("slf4j", AsyncSlf4jSpanObserver.of("test", executor));