Add instrumentation name to spanStart (A-E)

Author: amarziali

dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientDecorator.java

@@ -93,7 +93,7 @@ public void withMethod(final AgentSpan span, final String methodName) {
   }
 
   public AgentSpan startAerospikeSpan(final String methodName) {
-    final AgentSpan span = startSpan(OPERATION_NAME);
+    final AgentSpan span = startSpan("aerospike", OPERATION_NAME);
     afterStart(span);
     withMethod(span, methodName);
     return span;

dd-java-agent/instrumentation/akka-concurrent/src/akka23Test/scala/AkkaActors.scala

@@ -130,7 +130,7 @@ class Greeter(message: String, receiverActor: ActorRef) extends Actor {
     case Greet =>
       receiverActor ! Greeting(greeting)
     case Leak(leak) =>
-      val span = startSpan(greeting)
+      val span = startSpan("akka-concurrent", greeting)
       span.setResourceName(leak)
       activateSpan(span)
       span.finish()

dd-java-agent/instrumentation/akka-concurrent/src/test/java/LinearTask.java

@@ -31,7 +31,7 @@ protected Integer compute() {
       return parent;
     } else {
       int next = parent + 1;
-      AgentSpan span = startSpan(Integer.toString(next));
+      AgentSpan span = startSpan("akka-concurrent", Integer.toString(next));
       try (AgentScope scope = activateSpan(span)) {
         LinearTask child = new LinearTask(next, depth);
         return child.fork().join();

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

@@ -17,7 +17,7 @@
 
 public class AkkaHttpServerDecorator
     extends HttpServerDecorator<HttpRequest, HttpRequest, HttpResponse, HttpRequest> {
-  private static final CharSequence AKKA_HTTP_SERVER = UTF8BytesString.create("akka-http-server");
+  public static final CharSequence AKKA_HTTP_SERVER = UTF8BytesString.create("akka-http-server");
 
   public static final AkkaHttpServerDecorator DECORATE = new AkkaHttpServerDecorator();
   public static final CharSequence AKKA_SERVER_REQUEST =

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

@@ -74,7 +74,8 @@ public static AgentScope methodEnter(
         return null;
       }
 
-      final AgentSpan span = startSpan(AKKA_CLIENT_REQUEST);
+      final AgentSpan span =
+          startSpan(AkkaHttpClientDecorator.AKKA_HTTP_CLIENT.toString(), AKKA_CLIENT_REQUEST);
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, request);
 

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

@@ -12,7 +12,9 @@
 public class DatadogWrapperHelper {
   public static AgentScope createSpan(final HttpRequest request) {
     final AgentSpanContext.Extracted extractedContext = DECORATE.extract(request);
-    final AgentSpan span = DECORATE.startSpan(request, extractedContext);
+    final AgentSpan span =
+        DECORATE.startSpan(
+            AkkaHttpServerDecorator.AKKA_HTTP_SERVER.toString(), request, extractedContext);
     DECORATE.afterStart(span);
     DECORATE.onRequest(span, request, request, extractedContext);
 

dd-java-agent/instrumentation/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java

@@ -24,7 +24,10 @@ public static AgentScope methodEnter(
       return null;
     }
 
-    final AgentSpan span = startSpan(AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST);
+    final AgentSpan span =
+        startSpan(
+            AkkaHttpClientDecorator.AKKA_HTTP_CLIENT.toString(),
+            AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST);
     AkkaHttpClientDecorator.DECORATE.afterStart(span);
     AkkaHttpClientDecorator.DECORATE.onRequest(span, request);
 

dd-java-agent/instrumentation/apache-httpasyncclient-4/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java

@@ -91,7 +91,7 @@ public static AgentSpan methodEnter(
         @Advice.Argument(value = 3, readOnly = false) FutureCallback<?> futureCallback) {
 
       final AgentScope.Continuation parentContinuation = captureActiveSpan();
-      final AgentSpan clientSpan = startSpan(HTTP_REQUEST);
+      final AgentSpan clientSpan = startSpan("apache-http-client", HTTP_REQUEST);
       DECORATE.afterStart(clientSpan);
 
       requestProducer = new DelegatingRequestProducer(clientSpan, requestProducer);

dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java

@@ -37,7 +37,7 @@ public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) {
   }
 
   private static AgentScope activateHttpSpan(final HttpUriRequest request) {
-    final AgentSpan span = startSpan(HTTP_REQUEST);
+    final AgentSpan span = startSpan("apache-http-client", HTTP_REQUEST);
     final AgentScope scope = activateSpan(span);
 
     DECORATE.afterStart(span);

dd-java-agent/instrumentation/apache-httpclient-5/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java

@@ -97,7 +97,7 @@ public static AgentScope methodEnter(
         @Advice.Argument(value = 4, readOnly = false) FutureCallback<?> futureCallback) {
 
       final AgentScope.Continuation parentContinuation = captureActiveSpan();
-      final AgentSpan clientSpan = startSpan(HTTP_REQUEST);
+      final AgentSpan clientSpan = startSpan("apache-http-client", HTTP_REQUEST);
       final AgentScope clientScope = activateSpan(clientSpan);
       DECORATE.afterStart(clientSpan);