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

Include parent span in Jaeger gRPC export #1809

Merged
merged 4 commits into from
May 10, 2021
Merged

Include parent span in Jaeger gRPC export #1809

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1111e16
Include parent span in Jaeger gRPC export
plajjan May 3, 2021
43c9a05
Merge branch 'main' into 1808-fix-jaeger-grpc-child-of
srikanthccv May 7, 2021
f8dd33b
Merge branch 'main' into 1808-fix-jaeger-grpc-child-of
srikanthccv May 10, 2021
4abc465
Merge branch 'main' into 1808-fix-jaeger-grpc-child-of
May 10, 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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.1.0...HEAD)

### Changed
- Include span parent in Jaeger gRPC export as `CHILD_OF` reference
([#1809])(https://github.com/open-telemetry/opentelemetry-python/pull/1809)

### Added
- Added example for running Django with auto instrumentation.
([#1803](https://github.com/open-telemetry/opentelemetry-python/pull/1803))
Expand Down
12 changes: 10 additions & 2 deletions ...rter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/translate/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,18 @@ def _extract_tags(
def _extract_refs(
self, span: ReadableSpan
) -> Optional[Sequence[model_pb2.SpanRef]]:
if not span.links:
return None

refs = []
if span.parent:
ctx = span.get_span_context()
parent_id = span.parent.span_id
parent_ref = model_pb2.SpanRef(
ref_type=model_pb2.SpanRefType.CHILD_OF,
trace_id=_trace_id_to_bytes(ctx.trace_id),
span_id=_span_id_to_bytes(parent_id),
)
refs.append(parent_ref)

for link in span.links:
trace_id = link.context.trace_id
span_id = link.context.span_id
Expand Down
7 changes: 6 additions & 1 deletion exporter/opentelemetry-exporter-jaeger-proto-grpc/tests/test_jaeger_exporter_protobuf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,16 @@ def test_translate_to_jaeger(self):
),
],
references=[
model_pb2.SpanRef(
ref_type=model_pb2.SpanRefType.CHILD_OF,
trace_id=pb_translator._trace_id_to_bytes(trace_id),
span_id=pb_translator._span_id_to_bytes(parent_id),
),
model_pb2.SpanRef(
ref_type=model_pb2.SpanRefType.FOLLOWS_FROM,
trace_id=pb_translator._trace_id_to_bytes(trace_id),
span_id=pb_translator._span_id_to_bytes(other_id),
)
),
],
logs=[
model_pb2.Log(
Expand Down