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 OTLP exporter not grouping exported spans properly #1927

Merged
merged 6 commits into from
Jul 8, 2021
Merged

Fix OTLP exporter not grouping exported spans properly #1927

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7c8c8e
otlp
lzchen Jun 29, 2021
140fdbc
test
lzchen Jun 29, 2021
c523d94
lint
lzchen Jun 29, 2021
d329311
Update exporter.py
lzchen Jun 29, 2021
767bbd4
update SHA
codeboten Jul 1, 2021
880d436
Merge branch 'main' into bug
lzchen Jul 8, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added `BoundedAttributes` to the API to make it available for `Link` which is defined in the
API. Marked `BoundedDict` in the SDK as deprecated as a result.
([#1915](https://github.com/open-telemetry/opentelemetry-python/pull/1915))
- Fix OTLP SpanExporter to distinguish spans based off Resource and InstrumentationInfo
([#1927](https://github.com/open-telemetry/opentelemetry-python/pull/1927))

## [1.3.0-0.22b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.3.0-0.22b0) - 2021-06-01

Expand Down
6 changes: 3 additions & 3 deletions ...telemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ def get_resource_data(
resource_class(
**{
"resource": collector_resource,
"instrumentation_library_{}".format(name): [
instrumentation_library_data
],
"instrumentation_library_{}".format(
name
): instrumentation_library_data.values(),
}
)
)
Expand Down
57 changes: 35 additions & 22 deletions ...ter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/trace_exporter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,29 +236,42 @@ def _translate_data(
sdk_resource_instrumentation_library_spans = {}

for sdk_span in data:

if sdk_span.resource not in (
sdk_resource_instrumentation_library_spans.keys()
):
instrumentation_library_spans_map = (
sdk_resource_instrumentation_library_spans.get(
sdk_span.resource, {}
)
)
# If we haven't seen the Resource yet, add it to the map
if not instrumentation_library_spans_map:
sdk_resource_instrumentation_library_spans[
sdk_span.resource
] = instrumentation_library_spans_map
instrumentation_library_spans = (
instrumentation_library_spans_map.get(
sdk_span.instrumentation_info
lzchen marked this conversation as resolved.
Show resolved Hide resolved
)
)
# If we haven't seen the InstrumentationInfo for this Resource yet, add it to the map
if not instrumentation_library_spans:
if sdk_span.instrumentation_info is not None:
instrumentation_library_spans = (
InstrumentationLibrarySpans(
instrumentation_library=InstrumentationLibrary(
name=sdk_span.instrumentation_info.name,
version=sdk_span.instrumentation_info.version,
)
instrumentation_library_spans_map[
sdk_span.instrumentation_info
] = InstrumentationLibrarySpans(
instrumentation_library=InstrumentationLibrary(
name=sdk_span.instrumentation_info.name,
version=sdk_span.instrumentation_info.version,
)
)

else:
instrumentation_library_spans = (
InstrumentationLibrarySpans()
)

sdk_resource_instrumentation_library_spans[
sdk_span.resource
] = instrumentation_library_spans

# If no InstrumentationInfo, store in None key
instrumentation_library_spans_map[
sdk_span.instrumentation_info
lzchen marked this conversation as resolved.
Show resolved Hide resolved
] = InstrumentationLibrarySpans()
instrumentation_library_spans = (
instrumentation_library_spans_map.get(
sdk_span.instrumentation_info
)
)
self._collector_span_kwargs = {}

self._translate_name(sdk_span)
Expand All @@ -278,9 +291,9 @@ def _translate_data(
"SPAN_KIND_{}".format(sdk_span.kind.name),
)

sdk_resource_instrumentation_library_spans[
sdk_span.resource
].spans.append(CollectorSpan(**self._collector_span_kwargs))
instrumentation_library_spans.spans.append(
CollectorSpan(**self._collector_span_kwargs)
)

return ExportTraceServiceRequest(
resource_spans=get_resource_data(
Expand Down
211 changes: 211 additions & 0 deletions exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_trace_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,44 @@ def setUp(self):
),
)

self.span2 = _Span(
"b",
context=Mock(
**{
"trace_state": OrderedDict([("a", "b"), ("c", "d")]),
"span_id": 10217189687419569865,
"trace_id": 67545097771067222548457157018666467027,
}
),
resource=SDKResource(OrderedDict([("a", 2), ("b", False)])),
parent=Mock(**{"span_id": 12345}),
instrumentation_info=InstrumentationInfo(
name="name", version="version"
),
)

self.span3 = _Span(
"c",
context=Mock(
**{
"trace_state": OrderedDict([("a", "b"), ("c", "d")]),
"span_id": 10217189687419569865,
"trace_id": 67545097771067222548457157018666467027,
}
),
resource=SDKResource(OrderedDict([("a", 1), ("b", False)])),
parent=Mock(**{"span_id": 12345}),
instrumentation_info=InstrumentationInfo(
name="name2", version="version2"
),
)

self.span.start()
self.span.end()
self.span2.start()
self.span2.end()
self.span3.start()
self.span3.end()

def tearDown(self):
self.server.stop(None)
Expand Down Expand Up @@ -497,6 +533,181 @@ def test_translate_spans(self):
# pylint: disable=protected-access
self.assertEqual(expected, self.exporter._translate_data([self.span]))

def test_translate_spans_multi(self):
expected = ExportTraceServiceRequest(
resource_spans=[
ResourceSpans(
resource=OTLPResource(
attributes=[
KeyValue(key="a", value=AnyValue(int_value=1)),
KeyValue(
key="b", value=AnyValue(bool_value=False)
),
]
),
instrumentation_library_spans=[
InstrumentationLibrarySpans(
instrumentation_library=InstrumentationLibrary(
name="name", version="version"
),
spans=[
OTLPSpan(
# pylint: disable=no-member
name="a",
start_time_unix_nano=self.span.start_time,
end_time_unix_nano=self.span.end_time,
trace_state="a=b,c=d",
span_id=int.to_bytes(
10217189687419569865, 8, "big"
),
trace_id=int.to_bytes(
67545097771067222548457157018666467027,
16,
"big",
),
parent_span_id=(
b"\000\000\000\000\000\00009"
),
kind=(
OTLPSpan.SpanKind.SPAN_KIND_INTERNAL
),
attributes=[
KeyValue(
key="a",
value=AnyValue(int_value=1),
),
KeyValue(
key="b",
value=AnyValue(bool_value=True),
),
],
events=[
OTLPSpan.Event(
name="a",
time_unix_nano=1591240820506462784,
attributes=[
KeyValue(
key="a",
value=AnyValue(
int_value=1
),
),
KeyValue(
key="b",
value=AnyValue(
bool_value=False
),
),
],
)
],
status=Status(code=0, message=""),
links=[
OTLPSpan.Link(
trace_id=int.to_bytes(
1, 16, "big"
),
span_id=int.to_bytes(2, 8, "big"),
attributes=[
KeyValue(
key="a",
value=AnyValue(
int_value=1
),
),
KeyValue(
key="b",
value=AnyValue(
bool_value=False
),
),
],
)
],
)
],
),
InstrumentationLibrarySpans(
instrumentation_library=InstrumentationLibrary(
name="name2", version="version2"
),
spans=[
OTLPSpan(
# pylint: disable=no-member
name="c",
start_time_unix_nano=self.span3.start_time,
end_time_unix_nano=self.span3.end_time,
trace_state="a=b,c=d",
span_id=int.to_bytes(
10217189687419569865, 8, "big"
),
trace_id=int.to_bytes(
67545097771067222548457157018666467027,
16,
"big",
),
parent_span_id=(
b"\000\000\000\000\000\00009"
),
kind=(
OTLPSpan.SpanKind.SPAN_KIND_INTERNAL
),
status=Status(code=0, message=""),
)
],
),
],
),
ResourceSpans(
resource=OTLPResource(
attributes=[
KeyValue(key="a", value=AnyValue(int_value=2)),
KeyValue(
key="b", value=AnyValue(bool_value=False)
),
]
),
instrumentation_library_spans=[
InstrumentationLibrarySpans(
instrumentation_library=InstrumentationLibrary(
name="name", version="version"
),
spans=[
OTLPSpan(
# pylint: disable=no-member
name="b",
start_time_unix_nano=self.span2.start_time,
end_time_unix_nano=self.span2.end_time,
trace_state="a=b,c=d",
span_id=int.to_bytes(
10217189687419569865, 8, "big"
),
trace_id=int.to_bytes(
67545097771067222548457157018666467027,
16,
"big",
),
parent_span_id=(
b"\000\000\000\000\000\00009"
),
kind=(
OTLPSpan.SpanKind.SPAN_KIND_INTERNAL
),
status=Status(code=0, message=""),
)
],
)
],
),
]
)

# pylint: disable=protected-access
self.assertEqual(
expected,
self.exporter._translate_data([self.span, self.span2, self.span3]),
)

def _check_translated_status(
self,
translated: ExportTraceServiceRequest,
Expand Down