Remove deprecated startSpan and use integration name for telemetry

Author: amarziali

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/httpurlconnection/HttpUrlState.java

@@ -16,7 +16,7 @@ public class HttpUrlState {
   private volatile boolean finished = false;
 
   public AgentSpan start(final HttpURLConnection connection) {
-    span = startSpan(DECORATE.operationName());
+    span = startSpan("httpurlconnection", DECORATE.operationName());
     try (final AgentScope scope = activateSpan(span)) {
       DECORATE.afterStart(span);
       DECORATE.onRequest(span, connection);

dd-java-agent/agent-installer/src/main/java/datadog/trace/agent/tooling/AgentCLI.java

@@ -65,7 +65,7 @@ public static void sendSampleTraces(final int count, final double interval) thro
 
     int numTraces = 0;
     while (++numTraces <= count || count < 0) {
-      AgentSpan span = AgentTracer.startSpan("sample");
+      AgentSpan span = AgentTracer.startSpan("datadog", "sample");
       try {
         Thread.sleep(Math.max((long) (1000.0 * interval), 1L));
       } catch (InterruptedException ignore) {

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

@@ -94,7 +94,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/apache-httpclient/apache-httpasyncclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpasyncclient/ApacheHttpAsyncClientInstrumentation.java

@@ -102,7 +102,7 @@ public static AgentSpan methodEnter(
       }
 
       final AgentScope.Continuation parentContinuation = captureActiveSpan();
-      final AgentSpan clientSpan = startSpan(HTTP_REQUEST);
+      final AgentSpan clientSpan = startSpan("httpasyncclient", HTTP_REQUEST);
       DECORATE.afterStart(clientSpan);
       ((DelegatingRequestProducer) requestProducer).setSpan(clientSpan);
       futureCallback =

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

@@ -35,7 +35,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("httpclient", HTTP_REQUEST);
     final AgentScope scope = activateSpan(span);
 
     DECORATE.afterStart(span);

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

@@ -113,7 +113,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("httpasyncclient5", HTTP_REQUEST);
       final AgentScope clientScope = activateSpan(clientSpan);
       DECORATE.afterStart(clientSpan);
 

dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java

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

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java

@@ -211,7 +211,8 @@ public static AgentScope before() {
       AgentSpan clientSpan = activeSpan();
       if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) {
         AgentSpan messageSpan =
-            startSpan(GRPC_MESSAGE).setTag("message.type", clientSpan.getTag("response.type"));
+            startSpan("armeria-grpc-client", GRPC_MESSAGE)
+                .setTag("message.type", clientSpan.getTag("response.type"));
         DECORATE.afterStart(messageSpan);
         return activateSpan(messageSpan);
       }

dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java

@@ -93,9 +93,9 @@ static AgentScope enter(
       AgentSpanContext lambdaContext = AgentTracer.get().notifyLambdaStart(in, lambdaRequestId);
       final AgentSpan span;
       if (null == lambdaContext) {
-        span = startSpan(INVOCATION_SPAN_NAME);
+        span = startSpan("aws-sdk", INVOCATION_SPAN_NAME);
       } else {
-        span = startSpan(INVOCATION_SPAN_NAME, lambdaContext);
+        span = startSpan("aws-sdk", INVOCATION_SPAN_NAME, lambdaContext);
       }
       span.setSpanType(InternalSpanTypes.SERVERLESS);
       span.setTag("request_id", lambdaRequestId);

dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sns/SnsInterceptor.java

@@ -109,7 +109,7 @@ public AmazonWebServiceRequest beforeMarshalling(AmazonWebServiceRequest request
   }
 
   private AgentSpan newSpan(AmazonWebServiceRequest request) {
-    final AgentSpan span = AgentTracer.startSpan("aws.sns.send");
+    final AgentSpan span = AgentTracer.startSpan("aws-sdk", "aws.sns.send");
     // pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched &
     // activated
     // TODO If DSM is enabled, add DSM context here too