Merge pull request #139 from jplock/jp-gh134

Add @priority annotations to container request/response
openzipkin · Feb 23, 2016 · 6ce4ce0 · 6ce4ce0
2 parents fa962ad + 5e38ece
commit 6ce4ce0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/brave-jaxrs2/pom.xml b/brave-jaxrs2/pom.xml
@@ -36,6 +36,11 @@
             <artifactId>javax.inject</artifactId>
             <version>1</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.2</version>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

diff --git a/brave-jaxrs2/src/main/java/com/github/kristofa/brave/jaxrs2/BraveClientRequestFilter.java b/brave-jaxrs2/src/main/java/com/github/kristofa/brave/jaxrs2/BraveClientRequestFilter.java
@@ -5,7 +5,7 @@
 import com.github.kristofa.brave.http.HttpClientRequestAdapter;
 import com.github.kristofa.brave.http.ServiceNameProvider;
 import com.github.kristofa.brave.http.SpanNameProvider;
-
+import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientRequestFilter;
@@ -17,6 +17,7 @@
  * Also sends cs annotations.
  */
 @Provider
+@Priority(0)
 public class BraveClientRequestFilter implements ClientRequestFilter {
 
     private final ServiceNameProvider serviceNameProvider;

diff --git a/brave-jaxrs2/src/main/java/com/github/kristofa/brave/jaxrs2/BraveClientResponseFilter.java b/brave-jaxrs2/src/main/java/com/github/kristofa/brave/jaxrs2/BraveClientResponseFilter.java
@@ -5,7 +5,7 @@
 import com.github.kristofa.brave.http.HttpResponse;
 import com.github.kristofa.brave.http.ServiceNameProvider;
 import com.github.kristofa.brave.http.SpanNameProvider;
-
+import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientResponseContext;
@@ -17,6 +17,7 @@
  * Intercepts JAX-RS 2 client responses and sends cr annotations. Also submits the completed span.
  */
 @Provider
+@Priority(0)
 public class BraveClientResponseFilter implements ClientResponseFilter {
 
     private final ServiceNameProvider serviceNameProvider;

diff --git a/brave-jaxrs2/src/main/java/com/github/kristofa/brave/jaxrs2/BraveContainerRequestFilter.java b/brave-jaxrs2/src/main/java/com/github/kristofa/brave/jaxrs2/BraveContainerRequestFilter.java
@@ -6,22 +6,21 @@
 import com.github.kristofa.brave.http.SpanNameProvider;
 
 import java.io.IOException;
-import java.net.URI;
-import java.util.logging.Logger;
 
 import javax.inject.Inject;
+import javax.annotation.Priority;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.container.PreMatching;
 import javax.ws.rs.ext.Provider;
 
-import static java.lang.String.format;
-
 /**
  * Intercepts incoming container requests and extracts any trace information from the request header
  * Also sends sr annotations.
  */
 @Provider
+@PreMatching
+@Priority(0)
 public class BraveContainerRequestFilter implements ContainerRequestFilter {
 
     private final ServerRequestInterceptor requestInterceptor;

diff --git a/...e-jaxrs2/src/main/java/com/github/kristofa/brave/jaxrs2/BraveContainerResponseFilter.java b/...e-jaxrs2/src/main/java/com/github/kristofa/brave/jaxrs2/BraveContainerResponseFilter.java
@@ -1,11 +1,9 @@
 package com.github.kristofa.brave.jaxrs2;
 
-import com.github.kristofa.brave.ServerResponseAdapter;
 import com.github.kristofa.brave.ServerResponseInterceptor;
-import com.github.kristofa.brave.ServerTracer;
 import com.github.kristofa.brave.http.HttpResponse;
 import com.github.kristofa.brave.http.HttpServerResponseAdapter;
-
+import javax.annotation.Priority;
 import javax.inject.Inject;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
@@ -17,6 +15,7 @@
  * Intercepts outgoing container responses and sends ss annotations.
  */
 @Provider
+@Priority(0)
 public class BraveContainerResponseFilter implements ContainerResponseFilter {
 
     private final ServerResponseInterceptor responseInterceptor;