Remove deprecated internal spanBuilder methods (#11287)

Remove deprecated internal spanBuilder methods

Fix missing callsites in tests

change name for dynamic-instrumentation

Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>

Author: amarziali

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTracer.java

@@ -25,7 +25,10 @@ public DebuggerSpan createSpan(String encodedProbeId, String resourceName, Strin
       return DebuggerSpan.NOOP_SPAN;
     }
     AgentSpan dynamicSpan =
-        tracerAPI.buildSpan(OPERATION_NAME).withResourceName(resourceName).start();
+        tracerAPI
+            .buildSpan("dynamic-instrumentation", OPERATION_NAME)
+            .withResourceName(resourceName)
+            .start();
     if (tags != null) {
       for (String tag : tags) {
         int idx = tag.indexOf(':');

dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot20.java

@@ -24,7 +24,7 @@ public class CapturedSnapshot20 {
 
   public static int main(String arg) {
     AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-    AgentSpan span = tracerAPI.buildSpan("process").start();
+    AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process").start();
     try (AgentScope scope = tracerAPI.activateManualSpan(span)) {
       if (arg.equals("exception") || arg.equals("illegal")) {
         return new CapturedSnapshot20().processWithException(arg);

dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot21.java

@@ -24,7 +24,7 @@ public class CapturedSnapshot21 {
 
   public static int main(String arg) {
     AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-    AgentSpan span = tracerAPI.buildSpan("rootProcess").start();
+    AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "rootProcess").start();
     try (AgentScope scope = tracerAPI.activateManualSpan(span)) {
       return new CapturedSnapshot21().rootProcess(arg);
     } finally {
@@ -34,7 +34,7 @@ public static int main(String arg) {
 
   private int rootProcess(String arg) {
     AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-    AgentSpan span = tracerAPI.buildSpan("process1").start();
+    AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process1").start();
     try (AgentScope scope = tracerAPI.activateManualSpan(span)) {
       return process1(arg) + 1;
     } finally {
@@ -44,7 +44,7 @@ private int rootProcess(String arg) {
 
   private int process1(String arg) {
     AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-    AgentSpan span = tracerAPI.buildSpan("process2").start();
+    AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process2").start();
     try (AgentScope scope = tracerAPI.activateManualSpan(span)) {
       return process2(arg) + 1;
     } finally {
@@ -54,7 +54,7 @@ private int process1(String arg) {
 
   private int process2(String arg) {
     AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-    AgentSpan span = tracerAPI.buildSpan("process3").start();
+    AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process3").start();
     try (AgentScope scope = tracerAPI.activateManualSpan(span)) {
       return process3(arg) + 1;
     } finally {

dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot28.java

@@ -25,7 +25,7 @@ public class CapturedSnapshot28 {
 
   public static int main(String arg) {
     AgentTracer.TracerAPI tracerAPI = AgentTracer.get();
-    AgentSpan span = tracerAPI.buildSpan("process").start();
+    AgentSpan span = tracerAPI.buildSpan("dynamic-instrumentation", "process").start();
     try (AgentScope scope = tracerAPI.activateManualSpan(span)) {
       return new CapturedSnapshot28().process(arg);
     } finally {

dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java

@@ -50,7 +50,7 @@ public RequestSpan requestSpan(String requestName, RequestSpan requestParent) {
       seedNodes = parent.getTag(InstrumentationTags.COUCHBASE_SEED_NODES);
     }
 
-    AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder(spanName);
+    AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName);
     if (null != parent) {
       builder.asChildOf(parent.context());
     }

dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java

@@ -54,7 +54,7 @@ public RequestSpan requestSpan(String requestName, RequestSpan requestParent) {
       }
     }
     if (requestSpan == null) {
-      AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder(spanName);
+      AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName);
       if (null != parent) {
         builder.asChildOf(parent.context());
       }

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java

@@ -86,7 +86,11 @@ public static AgentScope onEnter(@Advice.This final Statement statement) {
             // The span ID is pre-determined so that we can reference it when setting the context
             final long spanID = DECORATE.setContextInfo(connection, dbInfo);
             // we then force that pre-determined span ID for the span covering the actual query
-            span = AgentTracer.get().singleSpanBuilder(DATABASE_QUERY).withSpanId(spanID).start();
+            span =
+                AgentTracer.get()
+                    .singleSpanBuilder("java-jdbc-prepared_statement", DATABASE_QUERY)
+                    .withSpanId(spanID)
+                    .start();
             span.setTag(DBM_TRACE_INJECTED, true);
           } else if (DECORATE.isPostgres(dbInfo) && DBM_TRACE_PREPARED_STATEMENTS) {
             span = startSpan("java-jdbc-prepared_statement", DATABASE_QUERY);

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java

@@ -336,7 +336,7 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {
     // potentially get build span like here
     AgentSpan instrumentationSpan =
         AgentTracer.get()
-            .singleSpanBuilder("set context_info")
+            .singleSpanBuilder("java-jdbc", "set context_info")
             .withTag("dd.instrumentation", true)
             .start();
     DECORATE.afterStart(instrumentationSpan);

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java

@@ -98,7 +98,11 @@ public static AgentScope onEnter(
             // The span ID is pre-determined so that we can reference it when setting the context
             final long spanID = DECORATE.setContextInfo(connection, dbInfo);
             // we then force that pre-determined span ID for the span covering the actual query
-            span = AgentTracer.get().singleSpanBuilder(DATABASE_QUERY).withSpanId(spanID).start();
+            span =
+                AgentTracer.get()
+                    .singleSpanBuilder("java-jdbc-statement", DATABASE_QUERY)
+                    .withSpanId(spanID)
+                    .start();
           } else if (isOracle) {
             span = startSpan("java-jdbc-statement", DATABASE_QUERY);
             DECORATE.setAction(span, connection);

dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/kotlin/datadog/trace/instrumentation/kotlin/coroutines/CoreKotlinCoroutineTests.kt

@@ -364,7 +364,7 @@ abstract class CoreKotlinCoroutineTests(private val dispatcher: CoroutineDispatc
     activeSpan().setSpanName(opName)
   }
 
-  protected fun childSpan(opName: String): AgentSpan = get().buildSpan(opName)
+  protected fun childSpan(opName: String): AgentSpan = get().buildSpan("kotlin_coroutine", opName)
     .withResourceName("coroutines-test-span")
     .start()