diff --git a/build.gradle b/build.gradle
index c14e68fd4..2b23b3650 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ buildscript {
         classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.37.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.42.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.13.1'
diff --git a/tracing/src/main/java/com/palantir/tracing/DeferredTracer.java b/tracing/src/main/java/com/palantir/tracing/DeferredTracer.java
index 089345aa8..221af284c 100644
--- a/tracing/src/main/java/com/palantir/tracing/DeferredTracer.java
+++ b/tracing/src/main/java/com/palantir/tracing/DeferredTracer.java
@@ -146,6 +146,7 @@ public void close() {
         }
     }
 
+    @SuppressWarnings("UnnecessaryLambda") // this library is allocation sensitive
     private static final Function<Trace, CloseableTrace> CLOSEABLE_TRACE_FUNCTION = originalTrace -> () -> {
         DefaultCloseableTrace.INSTANCE.close();
         Tracer.setTrace(originalTrace);
diff --git a/tracing/src/main/java/com/palantir/tracing/InetAddressSupplier.java b/tracing/src/main/java/com/palantir/tracing/InetAddressSupplier.java
index ea5e0b2bf..1d78b7f17 100644
--- a/tracing/src/main/java/com/palantir/tracing/InetAddressSupplier.java
+++ b/tracing/src/main/java/com/palantir/tracing/InetAddressSupplier.java
@@ -19,6 +19,7 @@
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
+import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.Enumeration;
 import java.util.function.Supplier;
@@ -67,7 +68,7 @@ public InetAddress get() {
                 return Inet4Address.getByAddress(new byte[] {0, 0, 0, 0});
             }
             return jdkSuppliedAddress;
-        } catch (Exception e) {
+        } catch (RuntimeException | UnknownHostException | SocketException e) {
             try {
                 return Inet4Address.getByAddress(new byte[] {0, 0, 0, 0});
             } catch (UnknownHostException e1) {
diff --git a/tracing/src/test/java/com/palantir/tracing/TracersTest.java b/tracing/src/test/java/com/palantir/tracing/TracersTest.java
index a8ee27bb6..140536233 100644
--- a/tracing/src/test/java/com/palantir/tracing/TracersTest.java
+++ b/tracing/src/test/java/com/palantir/tracing/TracersTest.java
@@ -528,10 +528,7 @@ public void testWrapCallableWithAlternateTraceId_traceStateInsideCallableUsesGiv
         String traceIdBeforeConstruction = Tracer.getTraceId();
         String traceIdToUse = "someTraceId";
         Callable<String> wrappedCallable = Tracers.wrapWithAlternateTraceId(
-                traceIdToUse,
-                "operation",
-                Observability.UNDECIDED,
-                () -> Tracer.getTraceId());
+                traceIdToUse, "operation", Observability.UNDECIDED, Tracer::getTraceId);
 
         String traceIdInsideCallable = wrappedCallable.call();