Merge branch 'master' into dougqh/basedecorator-entry-reuse

Author: dougqh

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java

@@ -80,6 +80,20 @@ public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE, REQUEST
   private final boolean traceClientIpResolverEnabled =
       Config.get().isTraceClientIpResolverEnabled();
 
+  private final String primaryInstrumentationName;
+
+  protected HttpServerDecorator() {
+    String[] instrumentationNames = instrumentationNames();
+    this.primaryInstrumentationName =
+        instrumentationNames != null && instrumentationNames.length > 0
+            ? instrumentationNames[0]
+            : DEFAULT_INSTRUMENTATION_NAME;
+  }
+
+  protected final String primaryInstrumentationName() {
+    return primaryInstrumentationName;
+  }
+
   protected abstract AgentPropagation.ContextVisitor<REQUEST_CARRIER> getter();
 
   protected abstract AgentPropagation.ContextVisitor<RESPONSE> responseGetter();
@@ -152,11 +166,7 @@ public Context extract(REQUEST_CARRIER carrier) {
    * @return A new context bundling the span, child of the given parent context.
    */
   public Context startSpan(REQUEST_CARRIER carrier, Context parentContext) {
-    String[] instrumentationNames = instrumentationNames();
-    String instrumentationName =
-        instrumentationNames != null && instrumentationNames.length > 0
-            ? instrumentationNames[0]
-            : DEFAULT_INSTRUMENTATION_NAME;
+    String instrumentationName = primaryInstrumentationName();
     AgentSpanContext extracted = getExtractedSpanContext(parentContext);
     // Call IG callbacks
     extracted = callIGCallbackStart(extracted);

dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy

@@ -287,7 +287,8 @@ abstract class AbstractSmokeTest extends ProcessManager {
     }
   }
 
-  def setupSpec() {
+  @Override
+  protected void setupTracesConsumer() {
     startServer()
   }
 

dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy

@@ -71,6 +71,7 @@ abstract class ProcessManager extends Specification {
     assert Files.isDirectory(Paths.get(buildDirectory))
     assert Files.isRegularFile(Paths.get(shadowJarPath))
 
+    setupTracesConsumer()
     beforeProcessBuilders()
 
     (0..<numberOfProcesses).each { idx ->
@@ -237,6 +238,8 @@ abstract class ProcessManager extends Specification {
     outputThreads.processTestLogLines { return checker(it) }
   }
 
+  protected abstract void setupTracesConsumer()
+
   protected void beforeProcessBuilders() {}
 
   protected ProcessBuilder createProcessBuilder() {