In JDBC instrumentation, use singleSpanBuilder instead of buildSpan (#9927)

* Using singleSpanBuilder instead of buildSpan

* spotless

Author: dougqh

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

@@ -86,7 +86,7 @@ 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().buildSpan(DATABASE_QUERY).withSpanId(spanID).start();
+            span = AgentTracer.get().singleSpanBuilder(DATABASE_QUERY).withSpanId(spanID).start();
             span.setTag(DBM_TRACE_INJECTED, true);
           } else if (DECORATE.isPostgres(dbInfo) && DBM_TRACE_PREPARED_STATEMENTS) {
             span = startSpan(DATABASE_QUERY);

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

@@ -319,7 +319,10 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {
     final long spanID = Config.get().getIdGenerationStrategy().generateSpanId();
     // potentially get build span like here
     AgentSpan instrumentationSpan =
-        AgentTracer.get().buildSpan("set context_info").withTag("dd.instrumentation", true).start();
+        AgentTracer.get()
+            .singleSpanBuilder("set context_info")
+            .withTag("dd.instrumentation", true)
+            .start();
     DECORATE.afterStart(instrumentationSpan);
     DECORATE.onConnection(instrumentationSpan, dbInfo);
     try (AgentScope scope = activateSpan(instrumentationSpan)) {

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

@@ -94,7 +94,7 @@ 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().buildSpan(DATABASE_QUERY).withSpanId(spanID).start();
+            span = AgentTracer.get().singleSpanBuilder(DATABASE_QUERY).withSpanId(spanID).start();
           } else if (isOracle) {
             span = startSpan(DATABASE_QUERY);
             DECORATE.setAction(span, connection);

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java

@@ -373,6 +373,11 @@ default SpanBuilder buildSpan(CharSequence spanName) {
       return buildSpan(DEFAULT_INSTRUMENTATION_NAME, spanName);
     }
 
+    @Deprecated
+    default SpanBuilder singleSpanBuilder(CharSequence spanName) {
+      return singleSpanBuilder(DEFAULT_INSTRUMENTATION_NAME, spanName);
+    }
+
     /**
      * Returns a SpanBuilder that can be used to produce multiple spans. To minimize overhead, use
      * of {@link #singleSpanBuilder(String, CharSequence)} is preferred when only a single span is