Merge pull request #7849 from DataDog/nenadnoveljic/dbm-trace-injected-sqlserver

Add DBM_TRACE_INJECTED tag to SQL Server

Author: nenadnoveljic

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

@@ -103,10 +103,12 @@ public static AgentScope onEnter(
         if (span != null && INJECT_COMMENT) {
           String traceParent = null;
 
-          if (injectTraceContext && !isSqlServer) {
+          if (injectTraceContext) {
             Integer priority = span.forceSamplingDecision();
             if (priority != null) {
-              traceParent = DECORATE.traceParent(span, priority);
+              if (!isSqlServer) {
+                traceParent = DECORATE.traceParent(span, priority);
+              }
               // set the dbm trace injected tag on the span
               span.setTag(DBM_TRACE_INJECTED, true);
             }

dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy

@@ -277,6 +277,9 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
               if (usingHikari) {
                 "$Tags.DB_POOL_NAME" String
               }
+              if (addDbmTag) {
+                "$InstrumentationTags.DBM_TRACE_INJECTED" true
+              }
               peerServiceFrom(Tags.DB_INSTANCE)
               defaultTags()
             }
@@ -765,6 +768,9 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase {
               // since Connection.getClientInfo will not provide the username
               "$Tags.DB_USER" { it == null || it == jdbcUserNames.get(driver) }
               "${Tags.DB_OPERATION}" operation
+              if (addDbmTag) {
+                "$InstrumentationTags.DBM_TRACE_INJECTED" true
+              }
               if (conPoolType == "hikari") {
                 "$Tags.DB_POOL_NAME" String
               }