[undertow] Use the tracing handler implementation from tracing-java (#…

…217)
palantir · Feb 1, 2019 · 3610114 · 3610114
1 parent 84cf861
commit 3610114
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 286 deletions.
diff --git a/conjure-java-undertow-runtime/build.gradle b/conjure-java-undertow-runtime/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 
     implementation 'com.google.guava:guava'
     implementation 'com.palantir.conjure.java.runtime:conjure-java-jackson-serialization'
-    implementation 'com.palantir.tracing:tracing'
+    implementation 'com.palantir.tracing:tracing-undertow'
     implementation 'org.slf4j:slf4j-api'
 
     testImplementation 'com.squareup.okhttp3:okhttp'

diff --git a/...rtow-runtime/src/main/java/com/palantir/conjure/java/undertow/runtime/ConjureHandler.java b/...rtow-runtime/src/main/java/com/palantir/conjure/java/undertow/runtime/ConjureHandler.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.ImmutableList;
 import com.palantir.conjure.java.undertow.lib.Endpoint;
 import com.palantir.conjure.java.undertow.lib.EndpointRegistry;
+import com.palantir.tracing.undertow.TracedOperationHandler;
 import io.undertow.Handlers;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
@@ -55,7 +56,8 @@ public final class ConjureHandler implements HttpHandler, EndpointRegistry {
             // Logging context and trace handler must execute prior to the exception
             // to provide user and trace information on exceptions.
             (endpoint, handler) -> new LoggingContextHandler(handler),
-            (endpoint, handler) -> new TraceHandler(endpoint.method() + " " + endpoint.template(), handler),
+            (endpoint, handler) -> new TracedOperationHandler(
+                    handler, endpoint.method() + " " + endpoint.template()),
             (endpoint, handler) -> new ConjureExceptionHandler(handler)
     ).reverse();
 

diff --git a/...dertow-runtime/src/main/java/com/palantir/conjure/java/undertow/runtime/TraceHandler.java b/...dertow-runtime/src/main/java/com/palantir/conjure/java/undertow/runtime/TraceHandler.java
diff --git a/...ow-runtime/src/test/java/com/palantir/conjure/java/undertow/runtime/TraceHandlerTest.java b/...ow-runtime/src/test/java/com/palantir/conjure/java/undertow/runtime/TraceHandlerTest.java
diff --git a/versions.props b/versions.props
@@ -15,7 +15,7 @@ com.palantir.conjure:* = 4.2.2
 com.palantir.ri:resource-identifier = 1.0.1
 com.palantir.syntactic-paths:syntactic-paths = 0.6.1
 com.palantir.tokens:* = 3.5.1
-com.palantir.tracing:tracing = 2.3.0
+com.palantir.tracing:* = 2.3.0
 com.palantir.websecurity:dropwizard-web-security = 1.1.0
 com.squareup.okhttp3:* = 3.12.1
 com.squareup:javapoet = 1.11.1
@@ -42,4 +42,3 @@ org.slf4j:* = 1.7.25
 # conflict resolution
 com.palantir.safe-logging:* = 1.8.1
 org.jboss.logging:jboss-logging = 3.3.2.Final
-com.palantir.tracing:tracing-okhttp3 = 2.3.0