Skip to content

Commit

Permalink
Revert "exporter/zipkin: Add status to the tags for the Zipkin Export…
Browse files Browse the repository at this point in the history
…er (#1124)"

This reverts commit 9d39638.
  • Loading branch information
codeboten committed Oct 23, 2020
1 parent 875d5bf commit 8a32589
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 24 deletions.
2 changes: 0 additions & 2 deletions exporter/opentelemetry-exporter-zipkin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ Released 2020-09-17
([#1097](https://github.com/open-telemetry/opentelemetry-python/pull/1097))
- Drop support for Python 3.4
([#1099](https://github.com/open-telemetry/opentelemetry-python/pull/1099))
- Add status mapping to tags
([#1111](https://github.com/open-telemetry/opentelemetry-python/issues/1111))

## Version 0.12b0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,6 @@ def _translate_to_zipkin(self, spans: Sequence[Span]):
"otel.instrumentation_library.version"
] = span.instrumentation_info.version

if span.status is not None:
zipkin_span["tags"][
"otel.status_code"
] = span.status.canonical_code.value
if span.status.description is not None:
zipkin_span["tags"][
"otel.status_description"
] = span.status.description

if context.trace_flags.sampled:
zipkin_span["debug"] = True

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
from opentelemetry.sdk.trace.export import SpanExportResult
from opentelemetry.sdk.util.instrumentation import InstrumentationInfo
from opentelemetry.trace import TraceFlags
from opentelemetry.trace.status import Status, StatusCanonicalCode


class MockResponse:
Expand Down Expand Up @@ -175,9 +174,6 @@ def test_export(self):
otel_spans[0].set_attribute("key_bool", False)
otel_spans[0].set_attribute("key_string", "hello_world")
otel_spans[0].set_attribute("key_float", 111.22)
otel_spans[0].set_status(
Status(StatusCanonicalCode.UNKNOWN, "Example description")
)
otel_spans[0].end(end_time=end_times[0])

otel_spans[1].start(start_time=start_times[1])
Expand Down Expand Up @@ -217,8 +213,6 @@ def test_export(self):
"key_bool": "False",
"key_string": "hello_world",
"key_float": "111.22",
"otel.status_code": 2,
"otel.status_description": "Example description",
},
"annotations": [
{
Expand All @@ -237,10 +231,7 @@ def test_export(self):
"duration": durations[1] // 10 ** 3,
"localEndpoint": local_endpoint,
"kind": None,
"tags": {
"key_resource": "some_resource",
"otel.status_code": 0,
},
"tags": {"key_resource": "some_resource"},
"annotations": None,
},
{
Expand All @@ -254,7 +245,6 @@ def test_export(self):
"tags": {
"key_string": "hello_world",
"key_resource": "some_resource",
"otel.status_code": 0,
},
"annotations": None,
},
Expand All @@ -269,7 +259,6 @@ def test_export(self):
"tags": {
"otel.instrumentation_library.name": "name",
"otel.instrumentation_library.version": "version",
"otel.status_code": 0,
},
"annotations": None,
},
Expand Down Expand Up @@ -335,7 +324,7 @@ def test_zero_padding(self):
"duration": duration // 10 ** 3,
"localEndpoint": local_endpoint,
"kind": None,
"tags": {"otel.status_code": 0},
"tags": {},
"annotations": None,
"debug": True,
"parentId": "0aaaaaaaaaaaaaaa",
Expand Down

0 comments on commit 8a32589

Please sign in to comment.