Skip to content

Fix flaky kafka tests by flushing producer before ending sender transactions #2619

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
xrmx merged 5 commits into from
Apr 24, 2026
Merged

Fix flaky kafka tests by flushing producer before ending sender transactions #2619

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb6f53f
Initial plan
Copilot Apr 20, 2026
8467071
fix: add producer.flush() to kafka tests to prevent race conditions
Copilot Apr 20, 2026
059906f
fix: wait for kafka send futures in flaky consumer tests
Copilot Apr 21, 2026
d2bad11
fix: flush kafka producer before ending sender transaction
Copilot Apr 23, 2026
69e0990
Merge branch 'main' into copilot/investigate-flaky-kafka-test
xrmx Apr 23, 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
6 changes: 6 additions & 0 deletions tests/instrumentation/kafka_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ def delayed_send():
producer.send("test", key=b"foo", value=b"bar")
producer.send("test", key=b"baz", value=b"bazzinga")
elasticapm_client.end_transaction("foo")
producer.flush()

thread = threading.Thread(target=delayed_send)
thread.start()
Expand All @@ -140,6 +141,7 @@ def delayed_send():
producer.send("test", key=b"foo", value=b"bar")
producer.send("test", key=b"baz", value=b"bazzinga")
elasticapm_client.end_transaction("foo")
producer.flush()

thread = threading.Thread(target=delayed_send)
thread.start()
Expand All @@ -166,6 +168,7 @@ def delayed_send():
producer.send(topic="foo", key=b"foo", value=b"bar")
producer.send("bar", key=b"foo", value=b"bar")
producer.send("test", key=b"foo", value=b"bar")
producer.flush()

thread = threading.Thread(target=delayed_send)
thread.start()
Expand All @@ -186,6 +189,7 @@ def delayed_send():
producer.send(topic="foo", key=b"foo", value=b"bar")
producer.send("bar", key=b"foo", value=b"bar")
producer.send("test", key=b"foo", value=b"bar")
producer.flush()

thread = threading.Thread(target=delayed_send)
thread.start()
Expand All @@ -205,6 +209,7 @@ def delayed_send():
time.sleep(0.2)
producer.send("test", key=b"foo", value=b"bar")
producer.send("test", key=b"baz", value=b"bazzinga")
producer.flush()

thread = threading.Thread(target=delayed_send)
thread.start()
Expand Down Expand Up @@ -249,6 +254,7 @@ def test_kafka_consumer_unsampled_transaction_handles_stop_iteration(
def delayed_send():
time.sleep(0.2)
producer.send("test", key=b"foo", value=b"bar")
producer.flush()

thread = threading.Thread(target=delayed_send)
thread.start()
Expand Down
Loading