Skip to content

Fix flaky KafkaClientDataStreamsDisabledForkedTest batch consume test #10797

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

Open
bm1549 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix flaky KafkaClientDataStreamsDisabledForkedTest batch consume test #10797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions ...agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,14 +923,17 @@ abstract class KafkaClientTestBase extends VersionedNamingTestBase {
queueSpan(it, trace(0)[2])
}
} else {
trace(1) {
consumerSpan(it, consumerProperties, trace(0)[6], 0..0)
}
trace(1) {
consumerSpan(it, consumerProperties, trace(0)[4], 0..1)
}
trace(1) {
consumerSpan(it, consumerProperties, trace(0)[2], 0..1)
// Consumer traces are sorted by random span ID, so we can't assume a fixed
// mapping between consumer trace index and producer span index. Instead, find
// the actual parent producer span for each consumer trace dynamically.
def producerSpans = [trace(0)[2], trace(0)[4], trace(0)[6]]
(1..3).each { traceIdx ->
def consumerSpanParentId = trace(traceIdx)[0].parentId
def parentProducerSpan = producerSpans.find { it.spanId == consumerSpanParentId }
assert parentProducerSpan != null : "Consumer trace $traceIdx has no matching producer span"
trace(1) {
consumerSpan(it, consumerProperties, parentProducerSpan, 0..1)
}
}
}
}
Expand Down
Loading