Revert "exporter/zipkin: Add status to the tags for the Zipkin Exporter (#1124)"

This reverts commit 9d396382e3.
This commit is contained in:
alrex 2020-10-22 21:08:24 -07:00
parent 875d5bf54e
commit 8a325898f0
3 changed files with 2 additions and 24 deletions

View File

@ -15,8 +15,6 @@ Released 2020-09-17
([#1097](https://github.com/open-telemetry/opentelemetry-python/pull/1097)) ([#1097](https://github.com/open-telemetry/opentelemetry-python/pull/1097))
- Drop support for Python 3.4 - Drop support for Python 3.4
([#1099](https://github.com/open-telemetry/opentelemetry-python/pull/1099)) ([#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 ## Version 0.12b0

View File

@ -183,15 +183,6 @@ class ZipkinSpanExporter(SpanExporter):
"otel.instrumentation_library.version" "otel.instrumentation_library.version"
] = span.instrumentation_info.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: if context.trace_flags.sampled:
zipkin_span["debug"] = True zipkin_span["debug"] = True

View File

@ -24,7 +24,6 @@ from opentelemetry.sdk.trace import Resource
from opentelemetry.sdk.trace.export import SpanExportResult from opentelemetry.sdk.trace.export import SpanExportResult
from opentelemetry.sdk.util.instrumentation import InstrumentationInfo from opentelemetry.sdk.util.instrumentation import InstrumentationInfo
from opentelemetry.trace import TraceFlags from opentelemetry.trace import TraceFlags
from opentelemetry.trace.status import Status, StatusCanonicalCode
class MockResponse: class MockResponse:
@ -175,9 +174,6 @@ class TestZipkinSpanExporter(unittest.TestCase):
otel_spans[0].set_attribute("key_bool", False) otel_spans[0].set_attribute("key_bool", False)
otel_spans[0].set_attribute("key_string", "hello_world") otel_spans[0].set_attribute("key_string", "hello_world")
otel_spans[0].set_attribute("key_float", 111.22) 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[0].end(end_time=end_times[0])
otel_spans[1].start(start_time=start_times[1]) otel_spans[1].start(start_time=start_times[1])
@ -217,8 +213,6 @@ class TestZipkinSpanExporter(unittest.TestCase):
"key_bool": "False", "key_bool": "False",
"key_string": "hello_world", "key_string": "hello_world",
"key_float": "111.22", "key_float": "111.22",
"otel.status_code": 2,
"otel.status_description": "Example description",
}, },
"annotations": [ "annotations": [
{ {
@ -237,10 +231,7 @@ class TestZipkinSpanExporter(unittest.TestCase):
"duration": durations[1] // 10 ** 3, "duration": durations[1] // 10 ** 3,
"localEndpoint": local_endpoint, "localEndpoint": local_endpoint,
"kind": None, "kind": None,
"tags": { "tags": {"key_resource": "some_resource"},
"key_resource": "some_resource",
"otel.status_code": 0,
},
"annotations": None, "annotations": None,
}, },
{ {
@ -254,7 +245,6 @@ class TestZipkinSpanExporter(unittest.TestCase):
"tags": { "tags": {
"key_string": "hello_world", "key_string": "hello_world",
"key_resource": "some_resource", "key_resource": "some_resource",
"otel.status_code": 0,
}, },
"annotations": None, "annotations": None,
}, },
@ -269,7 +259,6 @@ class TestZipkinSpanExporter(unittest.TestCase):
"tags": { "tags": {
"otel.instrumentation_library.name": "name", "otel.instrumentation_library.name": "name",
"otel.instrumentation_library.version": "version", "otel.instrumentation_library.version": "version",
"otel.status_code": 0,
}, },
"annotations": None, "annotations": None,
}, },
@ -335,7 +324,7 @@ class TestZipkinSpanExporter(unittest.TestCase):
"duration": duration // 10 ** 3, "duration": duration // 10 ** 3,
"localEndpoint": local_endpoint, "localEndpoint": local_endpoint,
"kind": None, "kind": None,
"tags": {"otel.status_code": 0}, "tags": {},
"annotations": None, "annotations": None,
"debug": True, "debug": True,
"parentId": "0aaaaaaaaaaaaaaa", "parentId": "0aaaaaaaaaaaaaaa",