From e8a974ce80b8ad7c5731aa953a4b3527e01734df Mon Sep 17 00:00:00 2001 From: alrex Date: Thu, 22 Oct 2020 21:08:24 -0700 Subject: [PATCH] Revert "sdk: rename resource labels to attributes (#1082)" This reverts commit 326d77aa7d2a7c5bf84825d8a9236675007c892a. --- .../src/opentelemetry/exporter/zipkin/__init__.py | 2 +- .../tests/test_zipkin_exporter.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 6b3ce2df9..c62e07e41 100644 --- a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py @@ -211,7 +211,7 @@ def _extract_tags_from_dict(tags_dict): def _extract_tags_from_span(span: Span): tags = _extract_tags_from_dict(getattr(span, "attributes", None)) if span.resource: - tags.update(_extract_tags_from_dict(span.resource.attributes)) + tags.update(_extract_tags_from_dict(span.resource.labels)) return tags diff --git a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py index 96586d91e..709ca29d6 100644 --- a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py +++ b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py @@ -177,14 +177,14 @@ class TestZipkinSpanExporter(unittest.TestCase): otel_spans[1].start(start_time=start_times[1]) otel_spans[1].resource = Resource( - attributes={"key_resource": "some_resource"} + labels={"key_resource": "some_resource"} ) otel_spans[1].end(end_time=end_times[1]) otel_spans[2].start(start_time=start_times[2]) otel_spans[2].set_attribute("key_string", "hello_world") otel_spans[2].resource = Resource( - attributes={"key_resource": "some_resource"} + labels={"key_resource": "some_resource"} ) otel_spans[2].end(end_time=end_times[2])