Skip to content

Don't dedupe span metadata by id() (fix flaky test_collections_metadata) #9316

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
crusaderky merged 2 commits into from
Jul 9, 2026
+6 −7
Merged

Don't dedupe span metadata by id() (fix flaky test_collections_metadata) #9316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f6efcb
Fix flaky test_collections_metadata: don't dedupe span metadata by id()
crusaderky Jul 2, 2026
230f1d6
Merge branch 'main' into test_collection_metadata
crusaderky Jul 9, 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
13 changes: 6 additions & 7 deletions distributed/spans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ class Span:
__weakref__: Any

__slots__ = tuple(__annotations__)
_metadata_seen: set[int] = set()

def __init__(
self,
Expand Down Expand Up @@ -171,11 +170,7 @@ def parent(self) -> Span | None:
return None

def add_metadata(self, metadata: SpanMetadata) -> None:
"""Add metadata to the span, e.g. code snippets"""
id_ = id(metadata)
if id_ in self._metadata_seen:
return
self._metadata_seen.add(id_)
"""Add metadata to the span, e.g. computed collections"""
if self._metadata is None:
self._metadata = copy.deepcopy(metadata)
else:
Expand Down Expand Up @@ -522,6 +517,9 @@ def observe_tasks(
"""
out = {}
default_span = None
# All tasks of the same graph submission share the same metadata object.
# Add it only once per span.
metadata_added: set[Span] = set()

for ts in tss:
if ts.annotations is None:
Expand All @@ -546,7 +544,8 @@ def observe_tasks(

if code:
span._code[code] = None
if span_metadata:
if span_metadata and span not in metadata_added:
metadata_added.add(span)
span.add_metadata(span_metadata)

# The span may be completely different from the one referenced by the
Expand Down
Loading