Revert "Zipkin exporter report instrumentation info (#1097)"
This reverts commit a18ffbb924.
This commit is contained in:
parent
6f24122e74
commit
7e98588736
|
|
@ -7,8 +7,6 @@
|
||||||
`port`, `protocol`, `endpoint`. This brings this implementation inline with other
|
`port`, `protocol`, `endpoint`. This brings this implementation inline with other
|
||||||
implementations.
|
implementations.
|
||||||
([#1064](https://github.com/open-telemetry/opentelemetry-python/pull/1064))
|
([#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
|
## Version 0.12b0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -175,14 +175,6 @@ class ZipkinSpanExporter(SpanExporter):
|
||||||
"annotations": _extract_annotations_from_events(span.events),
|
"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:
|
if context.trace_flags.sampled:
|
||||||
zipkin_span["debug"] = True
|
zipkin_span["debug"] = True
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,6 @@ from opentelemetry.exporter.zipkin import ZipkinSpanExporter
|
||||||
from opentelemetry.sdk import trace
|
from opentelemetry.sdk import trace
|
||||||
from opentelemetry.sdk.trace import Resource
|
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.trace import TraceFlags
|
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].start(start_time=start_times[3])
|
||||||
otel_spans[3].resource = Resource({})
|
otel_spans[3].resource = Resource({})
|
||||||
otel_spans[3].end(end_time=end_times[3])
|
otel_spans[3].end(end_time=end_times[3])
|
||||||
otel_spans[3].instrumentation_info = InstrumentationInfo(
|
|
||||||
name="name", version="version"
|
|
||||||
)
|
|
||||||
|
|
||||||
service_name = "test-service"
|
service_name = "test-service"
|
||||||
local_endpoint = {"serviceName": service_name, "port": 9411}
|
local_endpoint = {"serviceName": service_name, "port": 9411}
|
||||||
|
|
@ -256,10 +252,7 @@ class TestZipkinSpanExporter(unittest.TestCase):
|
||||||
"duration": durations[3] // 10 ** 3,
|
"duration": durations[3] // 10 ** 3,
|
||||||
"localEndpoint": local_endpoint,
|
"localEndpoint": local_endpoint,
|
||||||
"kind": None,
|
"kind": None,
|
||||||
"tags": {
|
"tags": {},
|
||||||
"otel.instrumentation_library.name": "name",
|
|
||||||
"otel.instrumentation_library.version": "version",
|
|
||||||
},
|
|
||||||
"annotations": None,
|
"annotations": None,
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue