Skip to content

fix(aiokafka): preserve partition=0 / offset=0 on consumer spans #18342

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
piochelepiotr wants to merge 5 commits into
base: main
Choose a base branch
from
+30 −21
Open

fix(aiokafka): preserve partition=0 / offset=0 on consumer spans #18342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb13467
fix(aiokafka): preserve partition=0 / offset=0 on consumer spans
piochelepiotr May 29, 2026
2aa724f
docs: clarify release note wording
piochelepiotr May 29, 2026
0220612
fix(aiokafka): omit partition/offset tags when value is None instead …
piochelepiotr Jun 2, 2026
2dcff6d
test(aiokafka): fix snapshot consumer spans to show real partition/of…
piochelepiotr Jun 2, 2026
a20daf5
Merge remote-tracking branch 'origin/main' into fix/aiokafka-falsy-pa…
piochelepiotr Jun 11, 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
10 changes: 6 additions & 4 deletions ddtrace/_trace/trace_handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,8 @@ def _on_aiokafka_send_start(
span._set_attribute(SPAN_KIND, SpanKind.PRODUCER)
span._set_attribute(TOMBSTONE, str(send_value is None))
span.set_tag(MESSAGE_KEY, send_key.decode("utf-8") if send_key else None)
span._set_attribute(PARTITION, partition or -1)
if partition is not None:
span._set_attribute(PARTITION, partition)
span._set_attribute(_SPAN_MEASURED_KEY, 1)

if config.aiokafka.distributed_tracing_enabled:
Expand Down Expand Up @@ -1396,16 +1397,17 @@ def _on_aiokafka_getone_message(

if message is not None:
message_key = message.key.decode("utf-8") if message.key else None
message_offset = message.offset or -1
topic = str(message.topic)
span._set_attribute(TOPIC, topic)
span._set_attribute(TOMBSTONE, str(message.value is None))

if isinstance(message_key, str):
span.set_tag(MESSAGE_KEY, message_key)

span._set_attribute(PARTITION, message.partition or -1)
span._set_attribute(MESSAGE_OFFSET, message_offset)
if message.partition is not None:
span._set_attribute(PARTITION, message.partition)
if message.offset is not None:
span._set_attribute(MESSAGE_OFFSET, message.offset)

if err is not None:
span.set_exc_info(type(err), err, err.__traceback__)
Expand Down
8 changes: 8 additions & 0 deletions releasenotes/notes/aiokafka-zero-partition-offset-50aa5b8c6766e3ff.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
fixes:
- |
aiokafka: Fixes ``kafka.partition`` and ``kafka.message_offset`` span tags
being incorrectly set to ``-1``. Consumer spans no longer misreport ``0``
(e.g. single-partition topics or the first message in a partition) due to
falsy evaluation. Producer spans and any span where the value is genuinely
unknown now omit these tags entirely rather than emitting a misleading ``-1``.
4 changes: 2 additions & 2 deletions ...snapshots/tests.contrib.aiokafka.test_aiokafka.test_send_and_wait_commit_with_offset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"_dd.top_level": 1.0,
"_dd.tracer_kr": 1.0,
"_sampling_priority_v1": 1.0,
"kafka.message_offset": -1.0,
"kafka.partition": -1.0,
"kafka.message_offset": 0.0,
"kafka.partition": 0.0,
"process_id": 510.0
},
"duration": 5840561,
Expand Down
1 change: 0 additions & 1 deletion tests/snapshots/tests.contrib.aiokafka.test_aiokafka.test_send_and_wait_failure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"_dd.top_level": 1.0,
"_dd.tracer_kr": 1.0,
"_sampling_priority_v1": 1.0,
"kafka.partition": -1.0,
"process_id": 510.0
},
"duration": 104618323,
Expand Down
4 changes: 2 additions & 2 deletions tests/snapshots/tests.contrib.aiokafka.test_aiokafka.test_send_and_wait_key[None].json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"_dd.top_level": 1.0,
"_dd.tracer_kr": 1.0,
"_sampling_priority_v1": 1.0,
"kafka.message_offset": -1.0,
"kafka.partition": -1.0,
"kafka.message_offset": 0.0,
"kafka.partition": 0.0,
"process_id": 510.0
},
"duration": 2732458,
Expand Down
4 changes: 2 additions & 2 deletions tests/snapshots/tests.contrib.aiokafka.test_aiokafka.test_send_and_wait_key[test_key].json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"_dd.top_level": 1.0,
"_dd.tracer_kr": 1.0,
"_sampling_priority_v1": 1.0,
"kafka.message_offset": -1.0,
"kafka.partition": -1.0,
"kafka.message_offset": 0.0,
"kafka.partition": 0.0,
"process_id": 510.0
},
"duration": 4094210,
Expand Down
4 changes: 2 additions & 2 deletions tests/snapshots/tests.contrib.aiokafka.test_aiokafka.test_send_and_wait_value[None].json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"_dd.top_level": 1.0,
"_dd.tracer_kr": 1.0,
"_sampling_priority_v1": 1.0,
"kafka.message_offset": -1.0,
"kafka.partition": -1.0,
"kafka.message_offset": 0.0,
"kafka.partition": 0.0,
"process_id": 510.0
},
"duration": 3528046,
Expand Down
4 changes: 2 additions & 2 deletions ...pshots/tests.contrib.aiokafka.test_aiokafka.test_send_and_wait_value[hueh_hueh_hueh].json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"_dd.top_level": 1.0,
"_dd.tracer_kr": 1.0,
"_sampling_priority_v1": 1.0,
"kafka.message_offset": -1.0,
"kafka.partition": -1.0,
"kafka.message_offset": 0.0,
"kafka.partition": 0.0,
"process_id": 510.0
},
"duration": 2561725,
Expand Down
4 changes: 2 additions & 2 deletions ...ots/tests.contrib.aiokafka.test_aiokafka.test_send_and_wait_with_distributed_tracing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
"_dd.top_level": 1.0,
"_dd.tracer_kr": 1.0,
"_sampling_priority_v1": 1.0,
"kafka.message_offset": -1.0,
"kafka.partition": -1.0,
"kafka.message_offset": 0.0,
"kafka.partition": 0.0,
"process_id": 510.0
},
"duration": 1800834,
Expand Down
4 changes: 2 additions & 2 deletions tests/snapshots/tests.contrib.aiokafka.test_aiokafka.test_send_commit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"_dd.top_level": 1.0,
"_dd.tracer_kr": 1.0,
"_sampling_priority_v1": 1.0,
"kafka.message_offset": -1.0,
"kafka.partition": -1.0,
"kafka.message_offset": 0.0,
"kafka.partition": 0.0,
"process_id": 510.0
},
"duration": 2675113,
Expand Down
4 changes: 2 additions & 2 deletions ...napshots/tests.contrib.aiokafka.test_aiokafka_dsm.test_data_streams_aiokafka_enabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"_dd.top_level": 1.0,
"_dd.tracer_kr": 1.0,
"_sampling_priority_v1": 1.0,
"kafka.message_offset": -1.0,
"kafka.partition": -1.0,
"kafka.message_offset": 0.0,
"kafka.partition": 0.0,
"process_id": 648.0
},
"duration": 499024,
Expand Down
Loading