Skip to content
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

Jump to bottom

Fix a logic bug on parentless spans #782

Merged
merged 9 commits into from
Nov 19, 2021
Merged

Fix a logic bug on parentless spans #782

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c956ff2
Fix a logic bug on parentless spans
tonybaloney Oct 26, 2021
ac644e5
Merge remote-tracking branch 'upstream/main' into rich_parent_fix
tonybaloney Nov 16, 2021
b982401
Add a test
tonybaloney Nov 18, 2021
89c1e37
Simplify logic
tonybaloney Nov 18, 2021
843d48c
Merge branch 'main' into rich_parent_fix
tonybaloney Nov 18, 2021
3bbff19
Add changelog entry
tonybaloney Nov 18, 2021
e2544b7
Merge branch 'rich_parent_fix' of github.com:tonybaloney/opentelemetr…
tonybaloney Nov 18, 2021
3dbb883
Update tox configuration
tonybaloney Nov 18, 2021
a7716d0
Rename the fixtures to keep pylint happy
tonybaloney Nov 18, 2021
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
20 changes: 14 additions & 6 deletions ...ter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,26 @@ def export(self, spans: typing.Sequence[ReadableSpan]) -> SpanExportResult:
_child_to_tree(child, span)

for span in spans:
if span.parent and span.parent.span_id not in parents:
child = tree.add(
label=Text.from_markup(
f"[blue][{_ns_to_time(span.start_time)}][/blue] [bold]{span.name}[/bold], span {opentelemetry.trace.format_span_id(span.context.span_id)}"
if span.parent:
tonybaloney marked this conversation as resolved.
Show resolved Hide resolved
if span.parent.span_id not in parents:
child = tree.add(
label=Text.from_markup(
f"[blue][{_ns_to_time(span.start_time)}][/blue] [bold]{span.name}[/bold], span {opentelemetry.trace.format_span_id(span.context.span_id)}"
)
)
else:
child = parents[span.parent.span_id].add(
label=Text.from_markup(
f"[blue][{_ns_to_time(span.start_time)}][/blue] [bold]{span.name}[/bold], span {opentelemetry.trace.format_span_id(span.context.span_id)}"
)
)
)
else:
child = parents[span.parent.span_id].add(
child = tree.add(
label=Text.from_markup(
f"[blue][{_ns_to_time(span.start_time)}][/blue] [bold]{span.name}[/bold], span {opentelemetry.trace.format_span_id(span.context.span_id)}"
)
)

parents[span.context.span_id] = child
_child_to_tree(child, span)

Expand Down