Distinguish Jersey and OkHttp operation names (#58)

Author: markelliot

tracing-jersey/src/main/java/com/palantir/tracing/jersey/TraceEnrichingFilter.java

@@ -54,7 +54,7 @@ public void filter(ContainerRequestContext requestContext) throws IOException {
                 .map(Resource::getPath)
                 .orElse("(unknown)");
 
-        String operation = requestContext.getMethod() + " " + path;
+        String operation = "Jersey: " + requestContext.getMethod() + " " + path;
         // The following strings are all nullable
         String traceId = requestContext.getHeaderString(TraceHttpHeaders.TRACE_ID);
         String spanId = requestContext.getHeaderString(TraceHttpHeaders.SPAN_ID);

tracing-jersey/src/test/java/com/palantir/tracing/jersey/TraceEnrichingFilterTest.java

@@ -116,7 +116,7 @@ public void testTraceState_withHeaderUsesTraceId() {
         assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
         assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
         verify(observer).consume(spanCaptor.capture());
-        assertThat(spanCaptor.getValue().getOperation(), is("GET /trace"));
+        assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /trace"));
     }
 
     @Test
@@ -130,7 +130,7 @@ public void testTraceState_respectsMethod() {
         assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
         assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
         verify(observer).consume(spanCaptor.capture());
-        assertThat(spanCaptor.getValue().getOperation(), is("POST /trace"));
+        assertThat(spanCaptor.getValue().getOperation(), is("Jersey: POST /trace"));
     }
 
     @Test
@@ -144,7 +144,7 @@ public void testTraceState_doesNotIncludePathParams() {
         assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
         assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
         verify(observer).consume(spanCaptor.capture());
-        assertThat(spanCaptor.getValue().getOperation(), is("GET /trace/{param}"));
+        assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /trace/{param}"));
     }
 
     @Test
@@ -154,7 +154,7 @@ public void testTraceState_withoutRequestHeadersGeneratesValidTraceResponseHeade
         assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
         assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
         verify(observer).consume(spanCaptor.capture());
-        assertThat(spanCaptor.getValue().getOperation(), is("GET /trace"));
+        assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /trace"));
     }
 
     @Test
@@ -164,7 +164,7 @@ public void testTraceState_withoutRequestHeadersGeneratesValidTraceResponseHeade
         assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
         assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
         verify(observer).consume(spanCaptor.capture());
-        assertThat(spanCaptor.getValue().getOperation(), is("GET /failing-trace"));
+        assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /failing-trace"));
     }
 
     @Test
@@ -174,7 +174,7 @@ public void testTraceState_withoutRequestHeadersGeneratesValidTraceResponseHeade
         assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
         assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
         verify(observer).consume(spanCaptor.capture());
-        assertThat(spanCaptor.getValue().getOperation(), is("GET /streaming-trace"));
+        assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /streaming-trace"));
     }
 
     @Test
@@ -184,7 +184,7 @@ public void testTraceState_withoutRequestHeadersGeneratesValidTraceResponseHeade
         assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
         assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
         verify(observer).consume(spanCaptor.capture());
-        assertThat(spanCaptor.getValue().getOperation(), is("GET /failing-streaming-trace"));
+        assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /failing-streaming-trace"));
     }
 
     @Test
@@ -211,7 +211,7 @@ public void testTraceState_withEmptyTraceIdGeneratesValidTraceResponseHeaders()
         assertThat(response.getHeaderString(TraceHttpHeaders.PARENT_SPAN_ID), is(nullValue()));
         assertThat(response.getHeaderString(TraceHttpHeaders.SPAN_ID), is(nullValue()));
         verify(observer).consume(spanCaptor.capture());
-        assertThat(spanCaptor.getValue().getOperation(), is("GET /trace"));
+        assertThat(spanCaptor.getValue().getOperation(), is("Jersey: GET /trace"));
     }
 
     @Test

tracing-okhttp3/src/main/java/com/palantir/tracing/okhttp3/OkhttpTraceInterceptor.java

@@ -39,7 +39,7 @@ public Response intercept(Chain chain) throws IOException {
         String spanName = request.method();
         String httpRemotingPath = request.header(PATH_TEMPLATE_HEADER);
         if (httpRemotingPath != null) {
-            spanName = httpRemotingPath;
+            spanName = "OkHttp: " + httpRemotingPath;
             request = request.newBuilder().removeHeader(PATH_TEMPLATE_HEADER).build();
         }