feat(core): Remove instrumentation name

Author: PerfectSlayer

dd-java-agent/agent-bootstrap/src/jmh/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorBenchmark.java

@@ -59,7 +59,7 @@ public void setUp() {
             .build();
     GlobalTracer.forceRegister(tracer);
     decorator = new BenchmarkHttpServerDecorator();
-    Context context = decorator.startSpan("benchmark", Collections.emptyMap(), Context.root());
+    Context context = decorator.startSpan(Collections.emptyMap(), Context.root());
     span = fromContext(context);
   }
 
@@ -101,7 +101,7 @@ public BenchmarkHttpServerDecorator() {
 
     @Override
     protected String[] instrumentationNames() {
-      return new String[0];
+      return new String[] {"benchmark"};
     }
 
     @Override

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

@@ -139,10 +139,7 @@ public Context extract(REQUEST_CARRIER carrier) {
    * @param context The parent context of the span to create.
    * @return A new context bundling the span, child of the given parent context.
    */
-  public Context startSpan(
-      String unused, // TODO Remove
-      REQUEST_CARRIER carrier,
-      Context context) { // TODO Rename "context" to "parent"?
+  public Context startSpan(REQUEST_CARRIER carrier, Context context) {
     String instrumentationName =
         instrumentationNames().length == 0 ? "http-server" : instrumentationNames()[0];
     AgentSpanContext.Extracted spanContext = getExtractedSpanContext(context);

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecoratorTest.groovy

@@ -498,7 +498,7 @@ class HttpServerDecoratorTest extends ServerDecoratorTest {
     def decorator = newDecorator(mTracer, null)
 
     when:
-    decorator.startSpan("test", headers, root())
+    decorator.startSpan(headers, root())
 
     then:
     1 * mSpan.setMeasured(true) >> mSpan

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java

@@ -12,7 +12,7 @@
 public class DatadogWrapperHelper {
   public static ContextScope createSpan(final HttpRequest request) {
     final Context parentContext = DECORATE.extract(request);
-    final Context context = DECORATE.startSpan("akka-http", request, parentContext);
+    final Context context = DECORATE.startSpan(request, parentContext);
     final AgentSpan span = spanFromContext(context);
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, request, request, parentContext);

dd-java-agent/instrumentation/azure-functions/src/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java

@@ -68,7 +68,7 @@ public static ContextScope methodEnter(
         @Advice.Argument(0) final HttpRequestMessage<?> request,
         @Advice.Argument(1) final ExecutionContext executionContext) {
       final Context parentContext = DECORATE.extract(request);
-      final Context context = DECORATE.startSpan("azure-functions", request, parentContext);
+      final Context context = DECORATE.startSpan(request, parentContext);
       final AgentSpan span = spanFromContext(context);
       DECORATE.afterStart(span, executionContext.getFunctionName());
       DECORATE.onRequest(span, request, request, parentContext);

dd-java-agent/instrumentation/grizzly-2/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyHttpHandlerInstrumentation.java

@@ -73,7 +73,7 @@ public static class HandleAdvice {
       }
 
       final Context parentContext = DECORATE.extract(request);
-      final Context context = DECORATE.startSpan("grizzly", request, parentContext);
+      final Context context = DECORATE.startSpan(request, parentContext);
       final AgentSpan span = spanFromContext(context);
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, request, request, parentContext);

dd-java-agent/instrumentation/grizzly-http-2.3.20/src/main/java/datadog/trace/instrumentation/grizzlyhttp232/GrizzlyDecorator.java

@@ -115,7 +115,7 @@ public static NextAction onHttpCodecFilterExit(
     HttpRequestPacket httpRequest = (HttpRequestPacket) httpHeader;
     HttpResponsePacket httpResponse = httpRequest.getResponse();
     Context parentContext = DECORATE.extract(httpRequest);
-    Context context = DECORATE.startSpan("grizzly", httpRequest, parentContext);
+    Context context = DECORATE.startSpan(httpRequest, parentContext);
     ContextScope scope = context.attach();
     AgentSpan span = spanFromContext(context);
     DECORATE.afterStart(span);

dd-java-agent/instrumentation/jetty-11/src/main/java11/datadog/trace/instrumentation/jetty11/JettyServerAdvice.java

@@ -27,7 +27,7 @@ public static ContextScope onEnter(
       }
 
       final Context parentContext = DECORATE.extract(req);
-      final Context context = DECORATE.startSpan("jetty", req, parentContext);
+      final Context context = DECORATE.startSpan(req, parentContext);
       final ContextScope scope = context.attach();
       span = spanFromContext(context);
       span.setMeasured(true);

dd-java-agent/instrumentation/jetty-12/src/main/java17/datadog/trace/instrumentation/jetty12/JettyServerAdvice.java

@@ -29,8 +29,8 @@ public static void onExit(
       }
 
       final Context parentContext = DECORATE.extract(req);
-      final Context context = DECORATE.startSpan("jetty", req, parentContext);
-      try (final ContextScope scope = context.attach()) {
+      final Context context = DECORATE.startSpan(req, parentContext);
+      try (final ContextScope ignored = context.attach()) {
         final AgentSpan span = spanFromContext(context);
         span.setMeasured(true);
         DECORATE.afterStart(span);

dd-java-agent/instrumentation/jetty-7.0/src/main/java/datadog/trace/instrumentation/jetty70/JettyServerInstrumentation.java

@@ -156,7 +156,7 @@ public static ContextScope onEnter(
       }
 
       final Context parentContext = DECORATE.extract(req);
-      final Context context = DECORATE.startSpan("jetty", req, parentContext);
+      final Context context = DECORATE.startSpan(req, parentContext);
       final ContextScope scope = context.attach();
       span = spanFromContext(context);
       DECORATE.afterStart(span);