Fix

Author: pkoenig10

tritium-jmh/build.gradle

@@ -40,7 +40,6 @@ dependencies {
     jmh project(':tritium-tracing')
     jmh 'com.google.code.findbugs:jsr305'
     jmh 'com.google.guava:guava'
-    jmh 'com.palantir.remoting3:tracing'
     jmh 'com.palantir.safe-logging:preconditions'
     jmh 'com.palantir.safe-logging:safe-logging'
     jmh 'com.palantir.tracing:tracing'

tritium-jmh/src/jmh/java/com/palantir/tritium/microbenchmarks/ProxyBenchmark.java

@@ -27,7 +27,6 @@
 import com.palantir.tritium.metrics.MetricRegistries;
 import com.palantir.tritium.metrics.registry.DefaultTaggedMetricRegistry;
 import com.palantir.tritium.proxy.Instrumentation;
-import com.palantir.tritium.tracing.RemotingCompatibleTracingInvocationEventHandler;
 import com.palantir.tritium.tracing.TracingInvocationEventHandler;
 import java.util.concurrent.TimeUnit;
 import java.util.function.LongPredicate;
@@ -140,11 +139,6 @@ public void before(Blackhole blackhole) {
                         .collect(ImmutableList.toImmutableList()))
                 .build();
 
-        instrumentedWithRemoting = Instrumentation.builder(serviceInterface, raw)
-                .withHandler(new RemotingCompatibleTracingInvocationEventHandler(
-                        serviceInterface.getName(), Remoting3Tracer.INSTANCE))
-                .build();
-
         instrumentedWithEverything = Instrumentation.builder(serviceInterface, raw)
                 .withMetrics(MetricRegistries.createWithHdrHistogramReservoirs())
                 // similar to .withPerformanceTraceLogging() but always log
@@ -225,11 +219,6 @@ public String instrumentedWithTracingNested() {
         return instrumentedWithTracingNested.echo("test");
     }
 
-    // @Benchmark
-    public String instrumentedWithRemoting() {
-        return instrumentedWithRemoting.echo("test");
-    }
-
     @Benchmark
     public String instrumentedWithEverything() {
         return instrumentedWithEverything.echo("test");
@@ -286,18 +275,4 @@ public static void main(String[] _args) throws Exception {
                 .build();
         new Runner(options).run();
     }
-
-    public enum Remoting3Tracer implements com.palantir.tritium.tracing.Tracer {
-        INSTANCE;
-
-        @Override
-        public void startSpan(String operationName) {
-            com.palantir.remoting3.tracing.Tracer.startSpan(operationName);
-        }
-
-        @Override
-        public void completeSpan() {
-            com.palantir.remoting3.tracing.Tracer.fastCompleteSpan();
-        }
-    }
 }

tritium-tracing/build.gradle

@@ -6,8 +6,6 @@ dependencies {
     api project(':tritium-api')
     api project(':tritium-core')
 
-    compileOnly 'com.palantir.remoting3:tracing'
-
     implementation 'com.google.code.findbugs:jsr305'
     implementation 'com.google.guava:guava'
     implementation 'com.palantir.safe-logging:preconditions'

versions.lock

@@ -1,28 +1,22 @@
 # Run ./gradlew --write-locks to regenerate this file
-com.fasterxml.jackson.core:jackson-annotations:2.11.3 (3 constraints: c335090b)
-com.fasterxml.jackson.core:jackson-core:2.11.3 (7 constraints: 9c9183fd)
-com.fasterxml.jackson.core:jackson-databind:2.11.3 (9 constraints: 99ab184d)
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.3 (1 constraints: a310d0ae)
-com.fasterxml.jackson.datatype:jackson-datatype-guava:2.11.3 (2 constraints: fa1dc35d)
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3 (3 constraints: c82af8e6)
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3 (1 constraints: a310d0ae)
-com.fasterxml.jackson.module:jackson-module-afterburner:2.11.3 (3 constraints: c82af8e6)
+com.fasterxml.jackson.core:jackson-annotations:2.11.3 (2 constraints: 551f37f7)
+com.fasterxml.jackson.core:jackson-core:2.11.3 (4 constraints: d04c6dab)
+com.fasterxml.jackson.core:jackson-databind:2.11.3 (3 constraints: 4a3a2999)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.3 (1 constraints: cf0c0316)
+com.fasterxml.jackson.module:jackson-module-afterburner:2.11.3 (1 constraints: cf0c0316)
 com.github.ben-manes.caffeine:caffeine:2.9.0 (1 constraints: 0d051036)
 com.google.auto:auto-common:0.11 (2 constraints: 18142b68)
 com.google.auto.service:auto-service:1.0-rc4 (1 constraints: db05b241)
 com.google.code.findbugs:jsr305:3.0.2 (4 constraints: 5b3585ed)
 com.google.errorprone:error_prone_annotations:2.5.1 (5 constraints: c43c4398)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
-com.google.guava:guava:30.1-jre (6 constraints: be5513ea)
+com.google.guava:guava:30.1-jre (4 constraints: 673213a7)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
 com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0)
 com.palantir.jvm.diagnostics:jvm-diagnostics:0.0.2 (1 constraints: 0405ed35)
-com.palantir.remoting-api:tracing:1.9.0 (1 constraints: 520d0e26)
-com.palantir.remoting3:jackson-support:3.46.0 (1 constraints: 850d9c33)
-com.palantir.remoting3:tracing:3.46.0 (1 constraints: 3f05533b)
 com.palantir.safe-logging:preconditions:1.14.0 (2 constraints: da117b05)
-com.palantir.safe-logging:safe-logging:1.14.0 (4 constraints: 563084bb)
-com.palantir.tracing:tracing:4.12.0 (2 constraints: 8312d12c)
+com.palantir.safe-logging:safe-logging:1.14.0 (3 constraints: 0b23aa52)
+com.palantir.tracing:tracing:4.12.0 (1 constraints: 3905413b)
 com.palantir.tracing:tracing-api:4.12.0 (2 constraints: 0712b117)
 io.dropwizard.metrics:metrics-core:3.2.6 (2 constraints: 0d1b5355)
 io.dropwizard.metrics:metrics-jvm:3.2.6 (1 constraints: 0c050536)
@@ -31,7 +25,7 @@ org.checkerframework:checker-qual:3.10.0 (3 constraints: 4b1f441d)
 org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 3805313b)
 org.immutables:value:2.8.8 (1 constraints: 14051536)
 org.mpierce.metrics.reservoir:hdrhistogram-metrics-reservoir:1.1.2 (1 constraints: 0605f535)
-org.slf4j:slf4j-api:1.7.30 (7 constraints: f15ab3d6)
+org.slf4j:slf4j-api:1.7.30 (6 constraints: 6f4d418a)
 
 [Test dependencies]
 com.squareup.okhttp3:okhttp:4.0.0 (1 constraints: 0605ff35)

versions.props

@@ -6,7 +6,6 @@ com.google.code.findbugs:jsr305 = 3.0.2
 com.google.errorprone:* = 2.5.1
 com.google.guava:guava = 30.1-jre
 com.palantir.jvm.diagnostics:* = 0.0.2
-com.palantir.remoting3:* = 3.46.0
 com.palantir.safe-logging:* = 1.14.0
 com.palantir.tracing:* = 4.12.0
 com.squareup.okhttp3:okhttp = 4.0.0