From 557cbfc3a9c5d665c61cf9e3b1d0a9b875790999 Mon Sep 17 00:00:00 2001 From: Igor Kravchenko Date: Tue, 22 Jul 2025 12:41:01 -0500 Subject: [PATCH 1/2] Fixed flaky test --- .../src/latestDepTest/groovy/KafkaClientTestBase.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy index 14e5029357d..0c64d6bd9ab 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy @@ -247,7 +247,7 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase { "type:kafka" ) } - def sorted = new ArrayList(TEST_DATA_STREAMS_WRITER.backlogs).sort() + def sorted = new ArrayList(TEST_DATA_STREAMS_WRITER.backlogs).sort({it.type+it.partition}) verifyAll(sorted) { size() == 2 get(0).hasAllTags("consumer_group:sender", From 69efa017162569207f53399219a0b0bcafb6a9db Mon Sep 17 00:00:00 2001 From: Igor Kravchenko Date: Tue, 22 Jul 2025 15:18:35 -0500 Subject: [PATCH 2/2] Removed kafka cluster id check, as it's sometimes equal to empty string --- .../src/test/groovy/ConnectWorkerInstrumentationTest.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/kafka-connect-0.11/src/test/groovy/ConnectWorkerInstrumentationTest.groovy b/dd-java-agent/instrumentation/kafka-connect-0.11/src/test/groovy/ConnectWorkerInstrumentationTest.groovy index 031242c592e..6ae945113fb 100644 --- a/dd-java-agent/instrumentation/kafka-connect-0.11/src/test/groovy/ConnectWorkerInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/kafka-connect-0.11/src/test/groovy/ConnectWorkerInstrumentationTest.groovy @@ -280,12 +280,12 @@ class ConnectWorkerInstrumentationTest extends AgentTestRunner { StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 } verifyAll(first) { - tags.hasAllTags("direction:out", "topic:test-topic", "type:kafka", "kafka_cluster_id:" + clusterId) + tags.hasAllTags("direction:out", "topic:test-topic", "type:kafka") } StatsGroup second = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == first.hash } verifyAll(second) { - tags.hasAllTags("direction:in", "group:connect-file-sink-connector", "topic:test-topic", "type:kafka", "kafka_cluster_id:" + clusterId) + tags.hasAllTags("direction:in", "group:connect-file-sink-connector", "topic:test-topic", "type:kafka") } TEST_DATA_STREAMS_WRITER.getServices().contains('file-sink-connector')