diff --git a/.baseline/checkstyle/checkstyle-suppressions.xml b/.baseline/checkstyle/checkstyle-suppressions.xml
index 13245fda6..99b9f815d 100644
--- a/.baseline/checkstyle/checkstyle-suppressions.xml
+++ b/.baseline/checkstyle/checkstyle-suppressions.xml
@@ -12,10 +12,8 @@
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VariableDeclarationUsageDistance" />
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="VisibilityModifier" />
     <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" checks="AvoidStaticImport" />
-
-    <!-- Copied Guava classes. -->
-    <suppress files="[/\\]src[/\\].*(WrappingExecutorService.java)" checks="." />
-    <suppress files="[/\\]src[/\\].*(WrappingScheduledExecutorService.java)" checks="." />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemOut" />
+    <suppress files="[/\\]src[/\\].*[Tt]est[/\\](java|groovy)[/\\]" id="BanSystemErr" />
 
     <!-- JavadocStyle enforces existence of package-info.java package-level Javadoc; we consider this a bug. -->
     <suppress files="package-info.java" checks="JavadocStyle" />
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index a1401f5c0..8d251af56 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -48,13 +48,13 @@
         <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
     </module>
     <module name="SuppressWarningsFilter"/> <!-- baseline-gradle: README.md -->
-    <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
-        <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
-        <property name="checkFormat" value="$1"/>
-    </module>
     <module name="TreeWalker">
+        <module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+            <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+            <property name="checkFormat" value="$1"/>
+        </module>
         <module name="AbbreviationAsWordInName"> <!-- Java Style Guide: Camel case : defined -->
             <property name="ignoreFinal" value="false"/>
             <property name="allowedAbbreviationLength" value="1"/>
@@ -105,7 +105,6 @@
         <module name="EmptyStatement"/> <!-- Java Style Guide: One statement per line -->
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/> <!-- Java Style Guide: Fall-through: commented -->
-        <module name="FileContentsHolder"/> <!-- Required for SuppressionCommentFilter -->
         <module name="FinalClass"/> <!-- Java Coding Guidelines: Private constructors -->
         <module name="GenericWhitespace"> <!-- Java Style Guide: Horizontal whitespace -->
             <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
@@ -124,11 +123,17 @@
             <message key="import.illegal" value="Use JUnit 4-style (org.junit.*) test classes and assertions instead of JUnit 3 (junit.framework.*)."/>
         </module>
         <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
-            <property name="illegalPkgs" value="org.elasticsearch.common.base, jersey.repackaged.com.google.common, com.google.api.client.repackaged, org.apache.hadoop.thirdparty.guava, com.clearspring.analytics.util, org.spark_project.guava"/>
+            <property name="illegalPkgs" value="org.elasticsearch.common.base, com.clearspring.analytics.util, org.spark_project.guava"/>
+            <message key="import.illegal" value="Must not import repackaged classes."/>
+        </module>
+        <module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
+            <property name="illegalPkgs" value=".*\.(repackaged|shaded|thirdparty)"/>
+            <property name="regexp" value="true" />
             <message key="import.illegal" value="Must not import repackaged classes."/>
         </module>
         <module name="IllegalImport">
-            <property name="illegalPkgs" value="^org\.gradle\..*internal"/>
+            <property name="illegalPkgs" value="^org\.gradle\.(internal|.*\.internal)"/>
+            <property name="regexp" value="true" />
             <message key="import.illegal" value="Do not rely on gradle internal classes as these may change in minor releases - use org.gradle.api versions instead."/>
         </module>
         <module name="IllegalImport">
@@ -144,6 +149,7 @@
             <message key="import.illegal" value="math is deprecated, use math3 instead."/>
         </module>
         <module name="IllegalImport">
+            <property name="id" value="BanLoggingImplementations"/>
             <property name="illegalPkgs" value="org.apache.log4j, org.apache.logging.log4j, java.util.logging, ch.qos.logback"/>
             <message key="import.illegal" value="Use SLF4J instead of a logging framework directly."/>
         </module>
@@ -165,9 +171,15 @@
         <module name="IllegalType"> <!-- Java Coding Guide: Limit coupling on concrete classes -->
             <property name="illegalClassNames" value="java.util.ArrayList, java.util.HashSet, java.util.HashMap, java.util.LinkedList, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeSet, java.util.TreeMap, com.google.common.collect.ArrayListMultimap, com.google.common.collect.ForwardingListMultimap, com.google.common.collect.ForwardingMultimap, com.google.common.collect.ForwardingSetMultimap, com.google.common.collect.ForwardingSortedSetMultimap, com.google.common.collect.HashMultimap, com.google.common.collect.LinkedHashMultimap, com.google.common.collect.LinkedListMultimap, com.google.common.collect.TreeMultimap"/>
         </module>
+        <module name="IllegalType">
+            <property name="id" value="BanGuavaCaches"/>
+            <property name="illegalClassNames" value="com.google.common.cache.CacheBuilder, com.google.common.cache.Cache, com.google.common.cache.LoadingCache"/>
+            <message key="illegal.type" value="Do not use Guava caches, they are outperformed by and harder to use than Caffeine caches"/>
+        </module>
         <module name="ImportOrder"> <!-- Java Style Guide: Ordering and spacing -->
             <property name="groups" value="/.*/"/>
             <property name="option" value="top"/>
+            <property name="separated" value="true"/>
             <property name="sortStaticImportsAlphabetically" value="true"/>
         </module>
         <module name="Indentation"> <!-- Java Style Guide: Block indentation: +4 spaces -->
@@ -175,9 +187,7 @@
             <property name="lineWrappingIndentation" value="8"/>
         </module>
         <module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used -->
-        <module name="LeftCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
-            <property name="maxLineLength" value="120"/>
-        </module>
+        <module name="LeftCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style -->
         <module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
             <property name="max" value="120"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
@@ -265,6 +275,11 @@
             <property name="format" value="CoreMatchers\.equalTo"/>
             <property name="message" value="Use Assert.assertEquals()."/>
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanJacksonFindAndRegisterModulesMethod"/>
+            <property name="format" value="findAndRegisterModules"/>
+            <property name="message" value="Use ObjectMapper#registerModule(&lt;yourModule&gt;) explicitly. ObjectMapper#findAndRegisterModules() is dangerous because it will change behaviour depending on which modules are on your classpath (including transitive dependencies)."/>
+        </module>
         <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
             <property name="format" value="CoreMatchers\.notNull"/>
             <property name="message" value="Use better assertion method(s): Assert.assertEquals(), assertNull(), assertSame(), etc."/>
@@ -315,6 +330,18 @@
             <property name="message" value="printStackTrace is not generally allowed."/>
             <property name="ignoreComments" value="true"/>
         </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanSystemOut"/>
+            <property name="format" value="System\.out\."/>
+            <property name="message" value="Logging with System.out is not allowed because it has no metadata and can't be configured at runtime. Please use an SLF4J logger instead, e.g. log.info(&quot;Message&quot;)."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
+        <module name="RegexpSinglelineJava">
+            <property name="id" value="BanSystemErr"/>
+            <property name="format" value="System\.err\."/>
+            <property name="message" value="Logging with System.err is not allowed because it has no metadata and can't be configured at runtime. Please use an SLF4J logger instead, e.g. log.info(&quot;Message&quot;)."/>
+            <property name="ignoreComments" value="true"/>
+        </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\bCharsets\."/>
             <property name="message" value="Use JDK StandardCharsets instead of alternatives."/>
@@ -333,7 +360,7 @@
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
-            <property name="message" value="TODO format: // TODO(flastname): explanation"/>
+            <property name="message" value="TODO format: // TODO(#issue): explanation"/>
         </module>
         <module name="RegexpSinglelineJava">
             <property name="format" value="(void setUp\(\))|(void setup\(\))|(void setupStatic\(\))|(void setUpStatic\(\))|(void beforeTest\(\))|(void teardown\(\))|(void tearDown\(\))|(void beforeStatic\(\))|(void afterStatic\(\))"/>
@@ -392,7 +419,9 @@
             <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
         </module>
         <module name="CyclomaticComplexity"/> <!-- Java Coding Guidelines: Reduce Cyclomatic Complexity -->
-        <module name="DesignForExtension"/> <!-- Java Coding Guidelines: Design for extension -->
+        <module name="DesignForExtension"> <!-- Java Coding Guidelines: Design for extension -->
+            <property name="ignoredAnnotations" value="Test, Before, BeforeEach, After, AfterEach, BeforeClass, BeforeAll, AfterClass, AfterAll"/>
+        </module>
         <module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
             <property name="scope" value="public"/>
             <property name="allowMissingParamTags" value="true"/>
diff --git a/build.gradle b/build.gradle
index b3d6fd3ff..aac24b97c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,56 +17,36 @@
 buildscript {
     repositories {
         jcenter()
+        maven { url "https://plugins.gradle.org/m2/" }
         maven { url "http://palantir.bintray.com/releases" }
     }
 
     dependencies {
-        classpath 'gradle.plugin.com.palantir:gradle-circle-style:1.1.2'
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.3'
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:4.9.5'
-        classpath 'com.netflix.nebula:nebula-dependency-recommender:6.0.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:5.1.5'
-        classpath 'com.palantir.baseline:gradle-baseline-java:0.24.0'
-        classpath 'com.palantir.configurationresolver:gradle-configuration-resolver-plugin:0.3.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:0.37.4'
+        classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.11.0'
+        classpath 'gradle.plugin.org.inferred:gradle-processors:2.0.0'
     }
 }
 
-plugins {
-    id 'com.palantir.git-version' version '0.11.0'
-    id 'org.inferred.processors' version '1.2.15'
-}
-
-apply plugin: 'com.palantir.baseline-config' // provides baselineUpdateConfig task
-apply plugin: 'com.palantir.baseline-idea'
-apply plugin: 'com.palantir.circle.style'
+apply plugin: 'com.palantir.git-version'
+apply plugin: 'com.palantir.baseline'
 
 repositories {
     maven { url  "http://palantir.bintray.com/releases" }
 }
 
-dependencies {
-    baseline "com.palantir.baseline:gradle-baseline-java-config:0.24.0@zip"
-}
-
 allprojects {
     version gitVersion()
     group 'com.palantir.tracing'
-
-    apply plugin: 'com.palantir.configuration-resolver'
-    apply plugin: 'nebula.dependency-recommender'
-    dependencyRecommendations {
-        strategy OverrideTransitives
-        propertiesFile file: project.rootProject.file('versions.props')
-    }
 }
 
 subprojects {
     apply plugin: 'java'
-    apply plugin: 'com.palantir.baseline-checkstyle'
-    apply plugin: 'com.palantir.baseline-eclipse'
-    apply plugin: 'com.palantir.baseline-idea'
-    apply plugin: 'com.palantir.baseline-error-prone'
+    apply plugin: "org.inferred.processors"
 
     repositories {
         jcenter()
@@ -105,14 +85,4 @@ subprojects {
         }
     }
     tasks.check.dependsOn(javadoc)
-
-    configurations.errorprone {
-        resolutionStrategy {
-            force 'com.google.guava:guava:21.0'
-        }
-    }
-
-    tasks.withType(JavaCompile) {
-        options.compilerArgs += ['-XepDisableWarningsInGeneratedCode']
-    }
 }
diff --git a/tracing-api/build.gradle b/tracing-api/build.gradle
index d29891b17..d3c22f9df 100644
--- a/tracing-api/build.gradle
+++ b/tracing-api/build.gradle
@@ -1,5 +1,3 @@
-apply plugin: "org.inferred.processors"
-
 apply from: "$rootDir/gradle/publish-jar.gradle"
 
 dependencies {
@@ -10,5 +8,6 @@ dependencies {
     testCompile "org.mockito:mockito-core"
     testCompile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
 
-    processor "org.immutables:value"
+    annotationProcessor "org.immutables:value"
+    compileOnly "org.immutables:value::annotations"
 }
diff --git a/tracing-api/versions.lock b/tracing-api/versions.lock
index e579ddc20..586703378 100644
--- a/tracing-api/versions.lock
+++ b/tracing-api/versions.lock
@@ -14,6 +14,9 @@
         },
         "com.fasterxml.jackson.core:jackson-databind": {
             "locked": "2.9.5"
+        },
+        "org.immutables:value": {
+            "locked": "2.3.10"
         }
     },
     "runtime": {
diff --git a/tracing-jaxrs/build.gradle b/tracing-jaxrs/build.gradle
index c2fd49a87..18650fd07 100644
--- a/tracing-jaxrs/build.gradle
+++ b/tracing-jaxrs/build.gradle
@@ -28,5 +28,6 @@ dependencies {
     testCompile "org.jmock:jmock"
     testCompile "org.mockito:mockito-core"
 
-    processor "org.immutables:value"
+    annotationProcessor "org.immutables:value"
+    compileOnly "org.immutables:value::annotations"
 }
diff --git a/tracing-jaxrs/src/test/java/com/palantir/tracing/jaxrs/JaxRsTracersTest.java b/tracing-jaxrs/src/test/java/com/palantir/tracing/jaxrs/JaxRsTracersTest.java
index 279589e2c..a14886329 100644
--- a/tracing-jaxrs/src/test/java/com/palantir/tracing/jaxrs/JaxRsTracersTest.java
+++ b/tracing-jaxrs/src/test/java/com/palantir/tracing/jaxrs/JaxRsTracersTest.java
@@ -28,7 +28,7 @@ public final class JaxRsTracersTest {
     @Test
     public void testWrappingStreamingOutput_streamingOutputTraceIsIsolated() throws Exception {
         Tracer.startSpan("outside");
-        StreamingOutput streamingOutput = JaxRsTracers.wrap((os) -> {
+        StreamingOutput streamingOutput = JaxRsTracers.wrap(os -> {
             Tracer.startSpan("inside"); // never completed
         });
         streamingOutput.write(new ByteArrayOutputStream());
@@ -38,7 +38,7 @@ public void testWrappingStreamingOutput_streamingOutputTraceIsIsolated() throws
     @Test
     public void testWrappingStreamingOutput_traceStateIsCapturedAtConstructionTime() throws Exception {
         Tracer.startSpan("before-construction");
-        StreamingOutput streamingOutput = JaxRsTracers.wrap((os) -> {
+        StreamingOutput streamingOutput = JaxRsTracers.wrap(os -> {
             assertThat(Tracer.completeSpan().get().getOperation()).isEqualTo("before-construction");
         });
         Tracer.startSpan("after-construction");
diff --git a/tracing-jaxrs/versions.lock b/tracing-jaxrs/versions.lock
index 00bb325e0..4fb9e2d83 100644
--- a/tracing-jaxrs/versions.lock
+++ b/tracing-jaxrs/versions.lock
@@ -43,13 +43,31 @@
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.code.findbugs:jsr305": {
+            "locked": "1.3.9",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "com.google.errorprone:error_prone_annotations": {
+            "locked": "2.1.3",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.google.guava:guava": {
-            "locked": "20.0",
+            "locked": "23.6.1-jre",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava",
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.j2objc:j2objc-annotations": {
+            "locked": "1.1",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.palantir.safe-logging:safe-logging": {
             "locked": "1.3.0",
             "transitive": [
@@ -68,6 +86,21 @@
         "javax.ws.rs:javax.ws.rs-api": {
             "locked": "2.0.1"
         },
+        "org.checkerframework:checker-compat-qual": {
+            "locked": "2.0.0",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.codehaus.mojo:animal-sniffer-annotations": {
+            "locked": "1.14",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.immutables:value": {
+            "locked": "2.3.10"
+        },
         "org.slf4j:slf4j-api": {
             "locked": "1.7.12",
             "transitive": [
@@ -119,13 +152,31 @@
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.code.findbugs:jsr305": {
+            "locked": "1.3.9",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "com.google.errorprone:error_prone_annotations": {
+            "locked": "2.1.3",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.google.guava:guava": {
-            "locked": "20.0",
+            "locked": "23.6.1-jre",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava",
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.j2objc:j2objc-annotations": {
+            "locked": "1.1",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.palantir.safe-logging:safe-logging": {
             "locked": "1.3.0",
             "transitive": [
@@ -144,6 +195,18 @@
         "javax.ws.rs:javax.ws.rs-api": {
             "locked": "2.0.1"
         },
+        "org.checkerframework:checker-compat-qual": {
+            "locked": "2.0.0",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.codehaus.mojo:animal-sniffer-annotations": {
+            "locked": "1.14",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "org.slf4j:slf4j-api": {
             "locked": "1.7.12",
             "transitive": [
diff --git a/tracing-jersey/build.gradle b/tracing-jersey/build.gradle
index e782c26bf..bea13a73b 100644
--- a/tracing-jersey/build.gradle
+++ b/tracing-jersey/build.gradle
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-
-apply plugin: 'org.inferred.processors'
-
 apply from: "${rootDir}/gradle/publish-jar.gradle"
 
 dependencies {
diff --git a/tracing-jersey/versions.lock b/tracing-jersey/versions.lock
index 7437af186..70892447c 100644
--- a/tracing-jersey/versions.lock
+++ b/tracing-jersey/versions.lock
@@ -43,13 +43,31 @@
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.code.findbugs:jsr305": {
+            "locked": "1.3.9",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "com.google.errorprone:error_prone_annotations": {
+            "locked": "2.1.3",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.google.guava:guava": {
-            "locked": "20.0",
+            "locked": "23.6.1-jre",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava",
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.j2objc:j2objc-annotations": {
+            "locked": "1.1",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.palantir.safe-logging:safe-logging": {
             "locked": "1.3.0",
             "transitive": [
@@ -93,6 +111,18 @@
                 "org.glassfish.jersey.core:jersey-server"
             ]
         },
+        "org.checkerframework:checker-compat-qual": {
+            "locked": "2.0.0",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.codehaus.mojo:animal-sniffer-annotations": {
+            "locked": "1.14",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "org.glassfish.hk2.external:aopalliance-repackaged": {
             "locked": "2.4.0-b34",
             "transitive": [
@@ -229,13 +259,31 @@
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.code.findbugs:jsr305": {
+            "locked": "1.3.9",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "com.google.errorprone:error_prone_annotations": {
+            "locked": "2.1.3",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.google.guava:guava": {
-            "locked": "20.0",
+            "locked": "23.6.1-jre",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava",
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.j2objc:j2objc-annotations": {
+            "locked": "1.1",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.palantir.safe-logging:safe-logging": {
             "locked": "1.3.0",
             "transitive": [
@@ -279,6 +327,18 @@
                 "org.glassfish.jersey.core:jersey-server"
             ]
         },
+        "org.checkerframework:checker-compat-qual": {
+            "locked": "2.0.0",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.codehaus.mojo:animal-sniffer-annotations": {
+            "locked": "1.14",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "org.glassfish.hk2.external:aopalliance-repackaged": {
             "locked": "2.4.0-b34",
             "transitive": [
diff --git a/tracing-okhttp3/build.gradle b/tracing-okhttp3/build.gradle
index ef9e80d9f..51bec5029 100644
--- a/tracing-okhttp3/build.gradle
+++ b/tracing-okhttp3/build.gradle
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-apply plugin: 'org.inferred.processors'
-
 apply from: "${rootDir}/gradle/publish-jar.gradle"
 
 dependencies {
diff --git a/tracing-okhttp3/versions.lock b/tracing-okhttp3/versions.lock
index 3cba80d37..3247883a6 100644
--- a/tracing-okhttp3/versions.lock
+++ b/tracing-okhttp3/versions.lock
@@ -43,13 +43,31 @@
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.code.findbugs:jsr305": {
+            "locked": "1.3.9",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "com.google.errorprone:error_prone_annotations": {
+            "locked": "2.1.3",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.google.guava:guava": {
-            "locked": "20.0",
+            "locked": "23.6.1-jre",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava",
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.j2objc:j2objc-annotations": {
+            "locked": "1.1",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.palantir.safe-logging:safe-logging": {
             "locked": "1.3.0",
             "transitive": [
@@ -74,6 +92,18 @@
                 "com.squareup.okhttp3:okhttp"
             ]
         },
+        "org.checkerframework:checker-compat-qual": {
+            "locked": "2.0.0",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.codehaus.mojo:animal-sniffer-annotations": {
+            "locked": "1.14",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "org.slf4j:slf4j-api": {
             "locked": "1.7.12",
             "transitive": [
@@ -125,13 +155,31 @@
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.code.findbugs:jsr305": {
+            "locked": "1.3.9",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "com.google.errorprone:error_prone_annotations": {
+            "locked": "2.1.3",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.google.guava:guava": {
-            "locked": "20.0",
+            "locked": "23.6.1-jre",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava",
                 "com.palantir.tracing:tracing"
             ]
         },
+        "com.google.j2objc:j2objc-annotations": {
+            "locked": "1.1",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.palantir.safe-logging:safe-logging": {
             "locked": "1.3.0",
             "transitive": [
@@ -156,6 +204,18 @@
                 "com.squareup.okhttp3:okhttp"
             ]
         },
+        "org.checkerframework:checker-compat-qual": {
+            "locked": "2.0.0",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.codehaus.mojo:animal-sniffer-annotations": {
+            "locked": "1.14",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "org.slf4j:slf4j-api": {
             "locked": "1.7.12",
             "transitive": [
diff --git a/tracing/build.gradle b/tracing/build.gradle
index a1315e6cd..489807fb1 100644
--- a/tracing/build.gradle
+++ b/tracing/build.gradle
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-apply plugin: 'org.inferred.processors'
-
 apply from: "${rootDir}/gradle/publish-jar.gradle"
 
 dependencies {
@@ -35,5 +33,6 @@ dependencies {
     testCompile "org.mockito:mockito-core"
     testCompile "io.zipkin.java:zipkin"
 
-    processor "org.immutables:value"
+    annotationProcessor "org.immutables:value"
+    compileOnly "org.immutables:value::annotations"
 }
diff --git a/tracing/src/main/java/com/palantir/tracing/WrappingExecutorService.java b/tracing/src/main/java/com/palantir/tracing/WrappingExecutorService.java
index 5a56ef9e7..c2aac9c13 100644
--- a/tracing/src/main/java/com/palantir/tracing/WrappingExecutorService.java
+++ b/tracing/src/main/java/com/palantir/tracing/WrappingExecutorService.java
@@ -77,7 +77,7 @@ protected Runnable wrapTask(Runnable command) {
      *
      * @throws NullPointerException if any element of {@code tasks} is null
      */
-    private final <T> ImmutableList<Callable<T>> wrapTasks(
+    private <T> ImmutableList<Callable<T>> wrapTasks(
             Collection<? extends Callable<T>> tasks) {
         ImmutableList.Builder<Callable<T>> builder = ImmutableList.builder();
         for (Callable<T> task : tasks) {
diff --git a/tracing/src/main/java/com/palantir/tracing/WrappingScheduledExecutorService.java b/tracing/src/main/java/com/palantir/tracing/WrappingScheduledExecutorService.java
index 117a97614..12b5b0b98 100644
--- a/tracing/src/main/java/com/palantir/tracing/WrappingScheduledExecutorService.java
+++ b/tracing/src/main/java/com/palantir/tracing/WrappingScheduledExecutorService.java
@@ -30,7 +30,7 @@
  */
 abstract class WrappingScheduledExecutorService extends WrappingExecutorService
         implements ScheduledExecutorService {
-    final ScheduledExecutorService delegate;
+    private final ScheduledExecutorService delegate;
 
     protected WrappingScheduledExecutorService(ScheduledExecutorService delegate) {
         super(delegate);
diff --git a/tracing/src/test/java/com/palantir/tracing/AsyncSlf4jSpanObserverTest.java b/tracing/src/test/java/com/palantir/tracing/AsyncSlf4jSpanObserverTest.java
index f1cd388fb..17dc2688b 100644
--- a/tracing/src/test/java/com/palantir/tracing/AsyncSlf4jSpanObserverTest.java
+++ b/tracing/src/test/java/com/palantir/tracing/AsyncSlf4jSpanObserverTest.java
@@ -16,6 +16,8 @@
 
 package com.palantir.tracing;
 
+// CHECKSTYLE:OFF
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.never;
@@ -23,15 +25,10 @@
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-// CHECKSTYLE:OFF
-
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Appender;
-
-// CHECKSTYLE:ON
-
 import com.google.common.collect.ImmutableMap;
 import com.palantir.tracing.api.Span;
 import com.palantir.tracing.api.SpanType;
@@ -55,6 +52,7 @@
 import zipkin.Codec;
 import zipkin.Endpoint;
 
+// CHECKSTYLE:ON
 
 public final class AsyncSlf4jSpanObserverTest {
 
diff --git a/tracing/src/test/java/com/palantir/tracing/TracerTest.java b/tracing/src/test/java/com/palantir/tracing/TracerTest.java
index 71ff22d76..01144d8a2 100644
--- a/tracing/src/test/java/com/palantir/tracing/TracerTest.java
+++ b/tracing/src/test/java/com/palantir/tracing/TracerTest.java
@@ -69,6 +69,7 @@ public void after() {
     public void testIdsMustBeNonNullAndNotEmpty() throws Exception {
         try {
             Tracer.initTrace(Optional.empty(), null);
+            fail("Didn't throw");
         } catch (IllegalArgumentException e) {
             assertThat(e).hasMessage("traceId must be non-empty: null");
         }
diff --git a/tracing/versions.lock b/tracing/versions.lock
index b8c8d670f..cf0dacb8d 100644
--- a/tracing/versions.lock
+++ b/tracing/versions.lock
@@ -33,18 +33,51 @@
         "com.fasterxml.jackson.module:jackson-module-afterburner": {
             "locked": "2.9.5"
         },
+        "com.google.code.findbugs:jsr305": {
+            "locked": "1.3.9",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "com.google.errorprone:error_prone_annotations": {
+            "locked": "2.1.3",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.google.guava:guava": {
-            "locked": "20.0",
+            "locked": "23.6.1-jre",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava"
             ]
         },
+        "com.google.j2objc:j2objc-annotations": {
+            "locked": "1.1",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.palantir.safe-logging:safe-logging": {
             "locked": "1.3.0"
         },
         "com.palantir.tracing:tracing-api": {
             "project": true
         },
+        "org.checkerframework:checker-compat-qual": {
+            "locked": "2.0.0",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.codehaus.mojo:animal-sniffer-annotations": {
+            "locked": "1.14",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.immutables:value": {
+            "locked": "2.3.10"
+        },
         "org.slf4j:slf4j-api": {
             "locked": "1.7.12"
         }
@@ -83,18 +116,48 @@
         "com.fasterxml.jackson.module:jackson-module-afterburner": {
             "locked": "2.9.5"
         },
+        "com.google.code.findbugs:jsr305": {
+            "locked": "1.3.9",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "com.google.errorprone:error_prone_annotations": {
+            "locked": "2.1.3",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.google.guava:guava": {
-            "locked": "20.0",
+            "locked": "23.6.1-jre",
             "transitive": [
                 "com.fasterxml.jackson.datatype:jackson-datatype-guava"
             ]
         },
+        "com.google.j2objc:j2objc-annotations": {
+            "locked": "1.1",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "com.palantir.safe-logging:safe-logging": {
             "locked": "1.3.0"
         },
         "com.palantir.tracing:tracing-api": {
             "project": true
         },
+        "org.checkerframework:checker-compat-qual": {
+            "locked": "2.0.0",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
+        "org.codehaus.mojo:animal-sniffer-annotations": {
+            "locked": "1.14",
+            "transitive": [
+                "com.google.guava:guava"
+            ]
+        },
         "org.slf4j:slf4j-api": {
             "locked": "1.7.12"
         }
diff --git a/versions.props b/versions.props
index 2a2d62a93..9f8549747 100644
--- a/versions.props
+++ b/versions.props
@@ -1,6 +1,6 @@
 ch.qos.logback:logback-classic = 1.1.7
 com.fasterxml.jackson.*:jackson-* = 2.9.5
-com.google.guava:guava = 20.0
+com.google.guava:guava = 23.6.1-jre
 com.palantir.safe-logging:* = 1.3.0
 com.squareup.okhttp3:okhttp = 3.9.0
 io.dropwizard:dropwizard-* = 1.3.1