Attempt to fix SQL injection tests

Author: Yoone

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

@@ -78,7 +78,9 @@ public DBMCompatibleConnectionInstrumentation() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      packageName + ".JDBCDecorator", packageName + ".SQLCommenter",
+      packageName + ".JDBCDecorator",
+      packageName + ".SQLCommenter",
+      "datadog.trace.core.database.SharedDBCommenter",
     };
   }
 

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

@@ -58,7 +58,11 @@ public Map<String, String> contextStore() {
 
   @Override
   public String[] helperClassNames() {
-    return new String[] {packageName + ".JDBCDecorator", packageName + ".SQLCommenter"};
+    return new String[] {
+      packageName + ".JDBCDecorator",
+      packageName + ".SQLCommenter",
+      "datadog.trace.core.database.SharedDBCommenter",
+    };
   }
 
   @Override

dd-smoke-tests/appsec/src/main/groovy/datadog/smoketest/appsec/AbstractAppSecServerSmokeTest.groovy

@@ -56,8 +56,6 @@ abstract class AbstractAppSecServerSmokeTest extends AbstractServerSmokeTest {
     "-Ddd.appsec.trace.rate.limit=-1",
     // disable http client sampling
     "-Ddd.api-security.downstream.request.analysis.sample_rate=1"
-    // enable DBM propagation for RASP SQL injection detection
-    "-Ddd.dbm.propagation.mode=service"
   ] + (System.getProperty('smoke_test.appsec.enabled') == 'inactive' ?
   // enable remote config so that appsec is partially enabled (rc is now enabled by default)
   [