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.

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

Fix zipkin event translation #1161

Merged
merged 2 commits into from
Sep 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Zipkin exporter now accepts a ``max_tag_value_length`` attribute to customize the
maximum allowed size a tag value can have. ([#1151](https://github.com/open-telemetry/opentelemetry-python/pull/1151))
- Fixed OTLP events to Zipkin annotations translation. ([#1161](https://github.com/open-telemetry/opentelemetry-python/pull/1161))

## Version 0.13b0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,20 +237,25 @@ def _extract_tags_from_span(self, span: Span):
tags.update(self._extract_tags_from_dict(span.resource.attributes))
return tags

def _extract_annotations_from_events(
self, events
): # pylint: disable=R0201
return (
[
def _extract_annotations_from_events(self, events):
if not events:
return None

annotations = []
for event in events:
attrs = {}
for key, value in event.attributes.items():
if isinstance(value, str):
value = value[: self.max_tag_value_length]
attrs[key] = value

annotations.append(
{
"timestamp": _nsec_to_usec_round(e.timestamp),
"value": e.name,
"timestamp": _nsec_to_usec_round(event.timestamp),
"value": json.dumps({event.name: attrs}),
}
for e in events
]
if events
else None
)
)
return annotations


def _nsec_to_usec_round(nsec):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,15 @@ def test_export(self):
"annotations": [
{
"timestamp": event_timestamp // 10 ** 3,
"value": "event0",
"value": json.dumps(
{
"event0": {
"annotation_bool": True,
"annotation_string": "annotation_test",
"key_float": 0.3,
}
}
),
}
],
"debug": True,
Expand Down