Test on 3.8 are just flaky

amarziali · amarziali · commit eaa58153a9af · 2024-11-06T15:43:29.000+01:00
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/build.gradle b/dd-java-agent/instrumentation/kafka-clients-3.8/build.gradle
@@ -39,11 +39,9 @@ dependencies {
   main_java17Implementation project(':dd-java-agent:instrumentation:kafka-common')
 
   testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.8.0'
-  // the first supporting 3.6.0 (it's ok with 3.8.0)
-  testImplementation group: 'io.projectreactor.kafka', name: 'reactor-kafka', version: '1.3.21'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.1.0'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '3.1.0'
-  testImplementation group: 'org.testcontainers', name: 'kafka', version: libs.versions.testcontainers.get()
+  testImplementation group: 'org.testcontainers', name: 'kafka', version: '1.17.0'
   testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
   testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
   testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
@@ -54,7 +52,6 @@ dependencies {
   // This seems to help with jar compatibility hell.
   latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '2.+'
   latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '3.+'
-  latestDepTestImplementation group: 'io.projectreactor.kafka', name: 'reactor-kafka', version: '+'
   latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '3.+'
   latestDepTestImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '3.+'
   latestDepTestImplementation group: 'org.assertj', name: 'assertj-core', version: '3.19.+'
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy
@@ -71,7 +71,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
   public static final LinkedHashMap<String, String> PRODUCER_PATHWAY_EDGE_TAGS
 
   // filter out Kafka poll, since the function is called in a loop, giving inconsistent results
-  static final ListWriter.Filter DROP_KAFKA_POLL = new ListWriter.Filter() {
+  final ListWriter.Filter dropKafkaPoll = new ListWriter.Filter() {
     @Override
     boolean accept(List<DDSpan> trace) {
       return !(trace.size() == 1 &&
@@ -117,7 +117,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
   }
 
   def setup() {
-    TEST_WRITER.setFilter(DROP_KAFKA_POLL)
+    TEST_WRITER.setFilter(dropKafkaPoll)
   }
 
   @Override
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaReactorForkedTest.groovy b/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaReactorForkedTest.groovy
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ commons = "3.2"
 mockito = '4.4.0'
 jctools = '3.3.0'
 moshi = '1.11.0'
-testcontainers = '1.20.3'
+testcontainers = '1.20.1'
 jmc = "8.1.0"
 autoservice = "1.0-rc7"
 ddprof = "1.16.0"

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {`
`71`	`71`	`public static final LinkedHashMap<String, String> PRODUCER_PATHWAY_EDGE_TAGS`
`72`	`72`
`73`	`73`	`// filter out Kafka poll, since the function is called in a loop, giving inconsistent results`
`74`		`- static final ListWriter.Filter DROP_KAFKA_POLL = new ListWriter.Filter() {`
	`74`	`+ final ListWriter.Filter dropKafkaPoll = new ListWriter.Filter() {`
`75`	`75`	`@Override`
`76`	`76`	`boolean accept(List<DDSpan> trace) {`
`77`	`77`	`return !(trace.size() == 1 &&`
`@@ -117,7 +117,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`def setup() {`
`120`		`- TEST_WRITER.setFilter(DROP_KAFKA_POLL)`
	`120`	`+ TEST_WRITER.setFilter(dropKafkaPoll)`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`@Override`