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

OpenCensus kind mapping and EH update #7624

Merged
merged 15 commits into from
Jan 2, 2020
Merged

OpenCensus kind mapping and EH update #7624

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4d266c8
Make Producer in OpenCensus point to Client and EH update
lmazuel Oct 4, 2019
1d18551
Merge remote-tracking branch 'origin/master' into tracing_producer
lmazuel Dec 20, 2019
272976b
CONSUMER is CLIENT type
lmazuel Dec 20, 2019
be96677
Use Producer in EH
lmazuel Dec 20, 2019
7ca3078
Map internal to Client in OpenCensus
lmazuel Dec 20, 2019
22f6a34
Docstring
lmazuel Dec 20, 2019
56a2033
Fix #9099
lmazuel Dec 20, 2019
1b7ea9d
Fix #8810
lmazuel Dec 21, 2019
c46be9f
Fix #9084
lmazuel Dec 21, 2019
33b0ac0
pylint
lmazuel Dec 23, 2019
174582a
Internal is mapped to Client
lmazuel Dec 23, 2019
460de2f
INTERNAL is UNSPECIFIED
lmazuel Dec 27, 2019
b1554c0
Do not link if no traceparent
lmazuel Dec 31, 2019
2ccbfcb
Use a mapping for Kind
lmazuel Dec 31, 2019
613a18c
Avoid unecessary dict copy
lmazuel Dec 31, 2019
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
2 changes: 2 additions & 0 deletions sdk/core/azure-core-tracing-opencensus/azure/core/tracing/ext/opencensus_span/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ def kind(self, value):
"""Set the span kind of this span."""
kind = (
OpenCensusSpanKind.CLIENT if value == SpanKind.CLIENT else
OpenCensusSpanKind.CLIENT if value == SpanKind.PRODUCER else # No producer in opencensus
OpenCensusSpanKind.SERVER if value == SpanKind.SERVER else
OpenCensusSpanKind.SERVER if value == SpanKind.CONSUMER else # No consumer in opencensus
OpenCensusSpanKind.UNSPECIFIED if value == SpanKind.UNSPECIFIED else
None
)
Expand Down
14 changes: 9 additions & 5 deletions sdk/core/azure-core-tracing-opencensus/tests/test_tracing_implementations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,16 @@ def test_span_kind(self):
assert wrapped_class.span_instance.span_kind == OpenCensusSpanKind.CLIENT
assert wrapped_class.kind == SpanKind.CLIENT

# not supported
with pytest.raises(ValueError):
wrapped_class.kind = SpanKind.PRODUCER
# opencensus doesn't support producer, put client instead
wrapped_class.kind = SpanKind.PRODUCER
assert wrapped_class.span_instance.span_kind == OpenCensusSpanKind.CLIENT
assert wrapped_class.kind == SpanKind.CLIENT

with pytest.raises(ValueError):
wrapped_class.kind = SpanKind.CONSUMER
# opencensus doesn't support consumer, put server instead
wrapped_class.kind = SpanKind.CONSUMER
assert wrapped_class.span_instance.span_kind == OpenCensusSpanKind.SERVER
assert wrapped_class.kind == SpanKind.SERVER

# not supported
with pytest.raises(ValueError):
wrapped_class.kind = SpanKind.INTERNAL
2 changes: 1 addition & 1 deletion sdk/eventhub/azure-eventhubs/azure/eventhub/aio/producer_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ async def send(
child = None
if span_impl_type is not None:
child = span_impl_type(name="Azure.EventHubs.send")
child.kind = SpanKind.CLIENT # Should be PRODUCER
child.kind = SpanKind.PRODUCER

self._check_closed()
if isinstance(event_data, EventData):
Expand Down
2 changes: 1 addition & 1 deletion sdk/eventhub/azure-eventhubs/azure/eventhub/producer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def send(self, event_data, partition_key=None, timeout=None):
child = None
if span_impl_type is not None:
child = span_impl_type(name="Azure.EventHubs.send")
child.kind = SpanKind.CLIENT # Should be PRODUCER
child.kind = SpanKind.PRODUCER

self._check_closed()
if isinstance(event_data, EventData):
Expand Down