POC; migrating java tests to dsmTest

Author: robcarlan-datadog

.github/CODEOWNERS

@@ -114,6 +114,8 @@
 /internal-api/src/test/groovy/datadog/trace/api/datastreams                  @DataDog/data-streams-monitoring
 **/datastreams/                                                              @DataDog/data-streams-monitoring
 **/DataStreams*                                                              @DataDog/data-streams-monitoring
+# DSM Integration Tests - all dsmTest directories owned by data-streams-monitoring
+**/dsmTest/**                                                                @DataDog/data-streams-monitoring
 
 # @DataDog/feature-flagging-and-experimentation-sdk
 /dd-smoke-tests/openfeature/                                    @DataDog/feature-flagging-and-experimentation-sdk

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle

@@ -17,6 +17,12 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+// DSM test suite - tests with Data Streams Monitoring enabled
+addTestSuite('dsmTest')
+addTestSuiteExtendingForDir('dsmForkedTest', 'dsmTest', 'dsmTest')
+addTestSuiteForDir('latestDsmTest', 'dsmTest')
+addTestSuiteExtendingForDir('latestDsmForkedTest', 'latestDsmTest', 'dsmTest')
+
 addTestSuite('latestDepTest')
 addTestSuite('iastLatestDepTest3')
 
@@ -37,6 +43,25 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:reactive-streams')
   testImplementation project(':dd-java-agent:agent-iast:iast-test-fixtures')
 
+  // DSM test dependencies - needs access to base test classes
+  dsmTestImplementation sourceSets.test.output
+  dsmTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.8.0'
+  dsmTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '2.8.0'
+  dsmTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '2.8.0'
+  dsmTestImplementation group: 'io.projectreactor.kafka', name: 'reactor-kafka', version: '1.3.+'
+  dsmTestRuntimeOnly project(':dd-java-agent:instrumentation:spring:spring-scheduling-3.1')
+  dsmTestRuntimeOnly project(':dd-java-agent:instrumentation:reactor-core-3.1')
+  dsmTestRuntimeOnly project(':dd-java-agent:instrumentation:reactive-streams')
+
+  latestDsmTestImplementation sourceSets.test.output
+  latestDsmTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.+'
+  latestDsmTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.+'
+  latestDsmTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '3.+'
+  latestDsmTestImplementation group: 'io.projectreactor.kafka', name: 'reactor-kafka', version: '1.+'
+  latestDsmTestRuntimeOnly project(':dd-java-agent:instrumentation:spring:spring-scheduling-3.1')
+  latestDsmTestRuntimeOnly project(':dd-java-agent:instrumentation:reactor-core-3.1')
+  latestDsmTestRuntimeOnly project(':dd-java-agent:instrumentation:reactive-streams')
+
   // IAST testing dependencies
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
   testRuntimeOnly project(':dd-java-agent:instrumentation:java:java-lang:java-lang-1.8')

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/dsmTest/groovy/KafkaClientDataStreamsTest.groovy

@@ -0,0 +1,39 @@
+import KafkaClientTestBase
+import datadog.trace.api.Config
+
+/**
+ * Data Streams Monitoring tests for Kafka clients.
+ * 
+ * This test class extends KafkaClientTestBase and runs all base test methods
+ * with Data Streams Monitoring enabled. The base class contains all the actual
+ * test logic; this class only configures DSM to be enabled.
+ */
+class KafkaClientDataStreamsDisabledForkedTest extends KafkaClientTestBase {
+  @Override
+  void configurePreAgent() {
+    super.configurePreAgent()
+    injectSysConfig("dd.service", "KafkaClientDataStreamsDisabledForkedTest")
+    injectSysConfig("dd.kafka.legacy.tracing.enabled", "true")
+  }
+
+  @Override
+  String service() {
+    return "kafka"
+  }
+
+  @Override
+  boolean hasQueueSpan() {
+    return false
+  }
+
+  @Override
+  boolean splitByDestination() {
+    return false
+  }
+
+  @Override
+  boolean isDataStreamsEnabled() {
+    return false
+  }
+}
+

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy

@@ -1337,31 +1337,3 @@ class KafkaClientLegacyTracingV1ForkedTest extends KafkaClientLegacyTracingForke
   }
 }
 
-class KafkaClientDataStreamsDisabledForkedTest extends KafkaClientTestBase {
-  @Override
-  void configurePreAgent() {
-    super.configurePreAgent()
-    injectSysConfig("dd.service", "KafkaClientDataStreamsDisabledForkedTest")
-    injectSysConfig("dd.kafka.legacy.tracing.enabled", "true")
-  }
-
-  @Override
-  String service() {
-    return "kafka"
-  }
-
-  @Override
-  boolean hasQueueSpan() {
-    return false
-  }
-
-  @Override
-  boolean splitByDestination() {
-    return false
-  }
-
-  @Override
-  boolean isDataStreamsEnabled() {
-    return false
-  }
-}