From 7e9858873634e5a029a56cb41e8a40ba37b454e2 Mon Sep 17 00:00:00 2001 From: alrex Date: Thu, 22 Oct 2020 21:08:24 -0700 Subject: [PATCH] Revert "Zipkin exporter report instrumentation info (#1097)" This reverts commit a18ffbb9248b87755a1b4c0ffe10d00a1190edde. --- exporter/opentelemetry-exporter-zipkin/CHANGELOG.md | 2 -- .../src/opentelemetry/exporter/zipkin/__init__.py | 8 -------- .../tests/test_zipkin_exporter.py | 9 +-------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md index b285e4403..b1066d081 100644 --- a/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md @@ -7,8 +7,6 @@ `port`, `protocol`, `endpoint`. This brings this implementation inline with other implementations. ([#1064](https://github.com/open-telemetry/opentelemetry-python/pull/1064)) -- Zipkin exporter report instrumentation info. - ([#1097](https://github.com/open-telemetry/opentelemetry-python/pull/1097)) ## Version 0.12b0 diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py index 8c3c91a6d..6b3ce2df9 100644 --- a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py @@ -175,14 +175,6 @@ class ZipkinSpanExporter(SpanExporter): "annotations": _extract_annotations_from_events(span.events), } - if span.instrumentation_info is not None: - zipkin_span["tags"][ - "otel.instrumentation_library.name" - ] = span.instrumentation_info.name - zipkin_span["tags"][ - "otel.instrumentation_library.version" - ] = span.instrumentation_info.version - if context.trace_flags.sampled: zipkin_span["debug"] = True diff --git a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py index 309d96680..96586d91e 100644 --- a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py +++ b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py @@ -22,7 +22,6 @@ from opentelemetry.exporter.zipkin import ZipkinSpanExporter from opentelemetry.sdk import trace from opentelemetry.sdk.trace import Resource from opentelemetry.sdk.trace.export import SpanExportResult -from opentelemetry.sdk.util.instrumentation import InstrumentationInfo from opentelemetry.trace import TraceFlags @@ -192,9 +191,6 @@ class TestZipkinSpanExporter(unittest.TestCase): otel_spans[3].start(start_time=start_times[3]) otel_spans[3].resource = Resource({}) otel_spans[3].end(end_time=end_times[3]) - otel_spans[3].instrumentation_info = InstrumentationInfo( - name="name", version="version" - ) service_name = "test-service" local_endpoint = {"serviceName": service_name, "port": 9411} @@ -256,10 +252,7 @@ class TestZipkinSpanExporter(unittest.TestCase): "duration": durations[3] // 10 ** 3, "localEndpoint": local_endpoint, "kind": None, - "tags": { - "otel.instrumentation_library.name": "name", - "otel.instrumentation_library.version": "version", - }, + "tags": {}, "annotations": None, }, ]