Skip to content

remove flakiness on kafka tests #11972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Jul 16, 2026
Merged

remove flakiness on kafka tests #11972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff84d2
remove flakiness on kafka tests
amarziali Jul 16, 2026
937a1b7
fix codex/autotest issues
amarziali Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...trumentation/kafka/kafka-clients-0.11/src/latestDepTest/groovy/KafkaClientTestBase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records.add(record)
}
})
Expand Down
8 changes: 0 additions & 8 deletions ...on/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,31 +97,27 @@ class KafkaClientCustomPropagationConfigTest extends InstrumentationSpecificatio
container1.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records1.add(record)
}
})

container2.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records2.add(record)
}
})

container3.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records3.add(record)
}
})

container4.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records4.add(record)
}
})
Expand Down Expand Up @@ -202,31 +198,27 @@ class KafkaClientCustomPropagationConfigTest extends InstrumentationSpecificatio
container1.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records1.add(activeSpan())
}
})

container2.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records2.add(activeSpan())
}
})

container3.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records3.add(activeSpan())
}
})

container4.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records4.add(activeSpan())
}
})
Expand Down
12 changes: 5 additions & 7 deletions ...agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy
View file
Open in desktop
Comment thread
amarziali marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records.add(record)
}
})
Expand Down Expand Up @@ -420,7 +419,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records.add(record)
Comment thread
amarziali marked this conversation as resolved.
}
})
Expand Down Expand Up @@ -471,10 +469,13 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
}
}

// sort a snapshot so the producer trace is deterministically first, regardless of write order
def sortedTraces = new ArrayList<>(TEST_WRITER)
sortedTraces.sort(SORT_TRACES_BY_ID)
def headers = received.headers()
headers.iterator().hasNext()
new String(headers.headers("x-datadog-trace-id").iterator().next().value()) == "${TEST_WRITER[0][2].traceId}"
new String(headers.headers("x-datadog-parent-id").iterator().next().value()) == "${TEST_WRITER[0][2].spanId}"
new String(headers.headers("x-datadog-trace-id").iterator().next().value()) == "${sortedTraces[0][2].traceId}"
new String(headers.headers("x-datadog-parent-id").iterator().next().value()) == "${sortedTraces[0][2].spanId}"

if (isDataStreamsEnabled()) {
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
Expand Down Expand Up @@ -553,7 +554,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records.add(record)
}
})
Expand Down Expand Up @@ -889,7 +889,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new BatchMessageListener<String, String>() {
@Override
void onMessage(List<ConsumerRecord<String, String>> consumerRecords) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
consumerRecords.each {
records.add(it)
}
Expand Down Expand Up @@ -1026,7 +1025,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records.add(record)
if (isDataStreamsEnabled()) {
// even if header propagation is disabled, we want data streams to work.
Expand Down
8 changes: 0 additions & 8 deletions ...ion/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientCustomPropagationConfigTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,31 +101,27 @@ class KafkaClientCustomPropagationConfigTest extends InstrumentationSpecificatio
container1.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records1.add(record)
}
})

container2.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records2.add(record)
}
})

container3.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records3.add(record)
}
})

container4.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records4.add(record)
}
})
Expand Down Expand Up @@ -205,31 +201,27 @@ class KafkaClientCustomPropagationConfigTest extends InstrumentationSpecificatio
container1.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records1.add(activeSpan())
}
})

container2.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records2.add(activeSpan())
}
})

container3.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records3.add(activeSpan())
}
})

container4.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records4.add(activeSpan())
}
})
Expand Down
11 changes: 5 additions & 6 deletions ...-agent/instrumentation/kafka/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy
View file
Open in desktop
Comment thread
amarziali marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records.add(record)
}
})
Expand Down Expand Up @@ -349,7 +348,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records.add(record)
Comment thread
amarziali marked this conversation as resolved.
}
})
Expand Down Expand Up @@ -404,10 +402,13 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
}
}

// sort a snapshot so the producer trace is deterministically first, regardless of write order
def sortedTraces = new ArrayList<>(TEST_WRITER)
sortedTraces.sort(SORT_TRACES_BY_ID)
def headers = received.headers()
headers.iterator().hasNext()
new String(headers.headers("x-datadog-trace-id").iterator().next().value()) == "${TEST_WRITER[0][2].traceId}"
new String(headers.headers("x-datadog-parent-id").iterator().next().value()) == "${TEST_WRITER[0][2].spanId}"
new String(headers.headers("x-datadog-trace-id").iterator().next().value()) == "${sortedTraces[0][2].traceId}"
new String(headers.headers("x-datadog-parent-id").iterator().next().value()) == "${sortedTraces[0][2].spanId}"

if (isDataStreamsEnabled()) {
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
Expand Down Expand Up @@ -480,7 +481,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records.add(record)
}
})
Expand Down Expand Up @@ -824,7 +824,6 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
container.setupMessageListener(new MessageListener<String, String>() {
@Override
void onMessage(ConsumerRecord<String, String> record) {
TEST_WRITER.waitForTraces(1) // ensure consistent ordering of traces
records.add(record)
if (isDataStreamsEnabled()) {
// even if header propagation is disabled, we want data streams to work.
Expand Down