move shared sql commenter to bootstrap package

Author: na-ji

.github/CODEOWNERS

@@ -137,6 +137,9 @@ dd-java-agent/agent-llmobs/                          @DataDog/ml-observability
 dd-trace-core/src/main/java/datadog/trace/llmobs/    @DataDog/ml-observability
 dd-trace-core/src/test/groovy/datadog/trace/llmobs/  @DataDog/ml-observability
 
+# @DataDog/database-monitoring
+datadog/trace/bootstrap/instrumentation/dbm @DataDog/database-monitoring @DataDog/apm-idm-java
+
 # @DataDog/rum
 /internal-api/src/main/java/datadog/trace/api/rum/   @DataDog/rum
 /internal-api/src/test/groovy/datadog/trace/api/rum/ @DataDog/rum

…ace/core/database/SharedDBCommenter.java …strumentation/dbm/SharedDBCommenter.javadd-trace-core/src/main/java/datadog/trace/core/database/SharedDBCommenter.java renamed to dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java dd-trace-core/src/main/java/datadog/trace/core/database/SharedDBCommenter.java renamed to dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/dbm/SharedDBCommenter.java

@@ -1,4 +1,4 @@
-package datadog.trace.core.database;
+package datadog.trace.bootstrap.instrumentation.dbm;
 
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
 

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

@@ -80,7 +80,7 @@ public String[] helperClassNames() {
     return new String[] {
       packageName + ".JDBCDecorator",
       packageName + ".SQLCommenter",
-      "datadog.trace.core.database.SharedDBCommenter",
+      "datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter",
     };
   }
 

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

@@ -1,11 +1,8 @@
 package datadog.trace.instrumentation.jdbc;
 
-import datadog.trace.core.database.SharedDBCommenter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter;
 
 public class SQLCommenter {
-  private static final Logger log = LoggerFactory.getLogger(SQLCommenter.class);
   // SQL-specific constants, rest defined in SharedDBCommenter
   private static final char SPACE = ' ';
   private static final String OPEN_COMMENT = "/*";

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

@@ -61,7 +61,7 @@ public String[] helperClassNames() {
     return new String[] {
       packageName + ".JDBCDecorator",
       packageName + ".SQLCommenter",
-      "datadog.trace.core.database.SharedDBCommenter",
+      "datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter",
     };
   }
 

dd-java-agent/instrumentation/mongo/common/src/main/java/datadog/trace/instrumentation/mongo/MongoCommentInjector.java

@@ -5,7 +5,7 @@
 
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
-import datadog.trace.core.database.SharedDBCommenter;
+import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonString;

dd-java-agent/instrumentation/mongo/driver-3.1/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection31Instrumentation.java

@@ -13,7 +13,7 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
-import datadog.trace.core.database.SharedDBCommenter;
+import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter;
 import net.bytebuddy.asm.Advice;
 import org.bson.BsonDocument;
 

dd-java-agent/instrumentation/mongo/driver-4.0/src/main/java/datadog/trace/instrumentation/mongo/DefaultServerConnection40Instrumentation.java

@@ -13,7 +13,7 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
-import datadog.trace.core.database.SharedDBCommenter;
+import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter;
 import net.bytebuddy.asm.Advice;
 import org.bson.BsonDocument;
 

dd-java-agent/instrumentation/mongo/driver-4.0/src/test/groovy/MongoDBMCommentTest.groovy

@@ -1,4 +1,4 @@
-import datadog.trace.core.database.SharedDBCommenter
+import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter
 import spock.lang.Specification
 
 class MongoDBMCommentTest extends Specification {

dd-trace-core/src/test/groovy/datadog/trace/core/database/SharedDBCommenterTest.groovy

@@ -1,5 +1,6 @@
 package datadog.trace.core.database
 
+import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter
 import spock.lang.Specification
 
 class SharedDBCommenterTest extends Specification {
@@ -139,4 +140,4 @@ class SharedDBCommenterTest extends Specification {
       assert part.contains("'")
     }
   }
-}
+}