address review comments

DataDog · May 14, 2020 · ca7ab34 · ca7ab34
1 parent dc170af
commit ca7ab34
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 8 deletions.
diff --git a/...agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Pair.java b/...agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Pair.java
@@ -1,6 +1,6 @@
 package datadog.trace.bootstrap.instrumentation.api;
 
-public class Pair<T, U> {
+public final class Pair<T, U> {
 
   public static <T, U> Pair<T, U> of(T left, U right) {
     return new Pair<>(left, right);

diff --git a/...rc/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java b/...rc/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java
@@ -3,6 +3,7 @@
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
+import static datadog.trace.bootstrap.instrumentation.api.DDSpanNames.GRIZZLY_REQUEST;
 import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_SPAN_ATTRIBUTE;
 import static datadog.trace.instrumentation.grizzly.GrizzlyDecorator.DECORATE;
 import static datadog.trace.instrumentation.grizzly.GrizzlyRequestExtractAdapter.GETTER;
@@ -71,7 +72,7 @@ public static AgentScope methodEnter(@Advice.Argument(0) final Request request)
       }
 
       final Context parentContext = propagate().extract(request, GETTER);
-      final AgentSpan span = startSpan("grizzly.request", parentContext);
+      final AgentSpan span = startSpan(GRIZZLY_REQUEST, parentContext);
       DECORATE.afterStart(span);
       DECORATE.onConnection(span, request);
       DECORATE.onRequest(span, request);

diff --git a/dd-java-agent/instrumentation/grizzly-2/src/test/groovy/GrizzlyTest.groovy b/dd-java-agent/instrumentation/grizzly-2/src/test/groovy/GrizzlyTest.groovy
@@ -1,4 +1,5 @@
 import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.bootstrap.instrumentation.api.DDSpanNames
 import datadog.trace.instrumentation.grizzly.GrizzlyDecorator
 import org.glassfish.grizzly.http.server.HttpServer
 import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory
@@ -43,7 +44,7 @@ class GrizzlyTest extends HttpServerTest<HttpServer> {
 
   @Override
   String expectedOperationName() {
-    return "grizzly.request"
+    return DDSpanNames.GRIZZLY_REQUEST;
   }
 
   static class SimpleExceptionMapper implements ExceptionMapper<Throwable> {

diff --git a/...src/main/java/datadog/trace/instrumentation/mulehttpconnector/client/ClientDecorator.java b/...src/main/java/datadog/trace/instrumentation/mulehttpconnector/client/ClientDecorator.java
@@ -1,5 +1,7 @@
 package datadog.trace.instrumentation.mulehttpconnector.client;
 
+import static datadog.trace.bootstrap.instrumentation.api.DDComponents.GRIZZLY_HTTP_ASYNC_CLIENT;
+
 import com.ning.http.client.Request;
 import com.ning.http.client.Response;
 import datadog.trace.bootstrap.instrumentation.decorator.HttpClientDecorator;
@@ -17,7 +19,7 @@ protected String[] instrumentationNames() {
 
   @Override
   protected String component() {
-    return "grizzly-http-async-client";
+    return GRIZZLY_HTTP_ASYNC_CLIENT;
   }
 
   @Override

diff --git a/...main/java/datadog/trace/instrumentation/mulehttpconnector/client/ClientRequestAdvice.java b/...main/java/datadog/trace/instrumentation/mulehttpconnector/client/ClientRequestAdvice.java
@@ -4,6 +4,7 @@
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
+import static datadog.trace.bootstrap.instrumentation.api.DDSpanNames.GRIZZLY_REQUEST;
 import static datadog.trace.instrumentation.mulehttpconnector.client.ClientDecorator.DECORATE;
 import static datadog.trace.instrumentation.mulehttpconnector.client.InjectAdapter.SETTER;
 
@@ -23,7 +24,7 @@ public static AgentScope onEnter(
       @Advice.Argument(0) final Request request,
       @Advice.Argument(1) final AsyncHandler<?> handler) {
     AgentSpan parentSpan = activeSpan();
-    AgentSpan span = startSpan("http.request");
+    AgentSpan span = startSpan(GRIZZLY_REQUEST);
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, request);
     propagate().inject(span, request, SETTER);

diff --git a/...src/main/java/datadog/trace/instrumentation/mulehttpconnector/server/ServerDecorator.java b/...src/main/java/datadog/trace/instrumentation/mulehttpconnector/server/ServerDecorator.java
@@ -3,6 +3,8 @@
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.propagate;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
+import static datadog.trace.bootstrap.instrumentation.api.DDComponents.GRIZZLY_FILTER_CHAIN_SERVER;
+import static datadog.trace.bootstrap.instrumentation.api.DDSpanNames.GRIZZLY_REQUEST;
 import static datadog.trace.instrumentation.mulehttpconnector.server.ExtractAdapter.GETTER;
 
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -58,7 +60,7 @@ protected String[] instrumentationNames() {
 
   @Override
   protected String component() {
-    return "grizzly-filterchain-server";
+    return GRIZZLY_FILTER_CHAIN_SERVER;
   }
 
   public static void onHttpCodecFilterExit(FilterChainContext ctx, HttpHeader httpHeader) {
@@ -70,7 +72,7 @@ public static void onHttpCodecFilterExit(FilterChainContext ctx, HttpHeader http
     }
     HttpRequestPacket httpRequest = (HttpRequestPacket) httpHeader;
     HttpResponsePacket httpResponse = httpRequest.getResponse();
-    AgentSpan span = startSpan("http.request", propagate().extract(httpHeader, GETTER));
+    AgentSpan span = startSpan(GRIZZLY_REQUEST, propagate().extract(httpHeader, GETTER));
     AgentScope scope = activateSpan(span);
     scope.setAsyncPropagation(true);
     DECORATE.afterStart(span);

diff --git a/...strumentation/mule-http-connector-1.0/src/test/groovy/GrizzlyFilterchainServerTest.groovy b/...strumentation/mule-http-connector-1.0/src/test/groovy/GrizzlyFilterchainServerTest.groovy
@@ -1,4 +1,5 @@
 import datadog.trace.agent.test.base.HttpServerTest
+import datadog.trace.bootstrap.instrumentation.api.DDSpanNames
 import datadog.trace.instrumentation.mulehttpconnector.server.ServerDecorator
 import org.glassfish.grizzly.filterchain.BaseFilter
 import org.glassfish.grizzly.filterchain.FilterChain
@@ -60,7 +61,7 @@ class GrizzlyFilterchainServerTest extends HttpServerTest<HttpServer> {
 
   @Override
   String expectedOperationName() {
-    return "http.request"
+    return DDSpanNames.GRIZZLY_REQUEST
   }
 
   @Override

diff --git a/dd-trace-core/src/main/java/datadog/trace/core/StringTables.java b/dd-trace-core/src/main/java/datadog/trace/core/StringTables.java
@@ -4,6 +4,7 @@
 
 import datadog.trace.api.DDSpanTypes;
 import datadog.trace.bootstrap.instrumentation.api.DDComponents;
+import datadog.trace.bootstrap.instrumentation.api.DDSpanNames;
 import datadog.trace.bootstrap.instrumentation.api.Tags;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -36,6 +37,7 @@ public class StringTables {
     internConstantsUTF8(Tags.class);
     internConstantsUTF8(DDSpanTypes.class);
     internConstantsUTF8(DDComponents.class);
+    internConstantsUTF8(DDSpanNames.class);
   }
 
   public static byte[] getBytesUTF8(String value) {

diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/DDComponents.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/DDComponents.java
@@ -49,4 +49,6 @@ public class DDComponents {
   public static final String SPRING_SCHEDULING = "spring-scheduling";
   public static final String SPRING_WEB_CONTROLLER = "spring-web-controller";
   public static final String JAVA_SPY_MEMCACHED = "java-spymemcached";
+  public static final String GRIZZLY_HTTP_ASYNC_CLIENT = "grizzly-http-async-client";
+  public static final String GRIZZLY_FILTER_CHAIN_SERVER = "grizzly-filterchain-server";
 }
diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/DDSpanNames.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/DDSpanNames.java
@@ -0,0 +1,6 @@
+package datadog.trace.bootstrap.instrumentation.api;
+
+public class DDSpanNames {
+  public static final String HTTP_REQUEST = "http.request";
+  public static final String GRIZZLY_REQUEST = "grizzly.request";
+}