From 82ba3faf677db5ce43f9e1d660a6b123d8dc182a Mon Sep 17 00:00:00 2001 From: alrex Date: Thu, 22 Oct 2020 21:08:24 -0700 Subject: [PATCH] Revert "Parent is now always passed in via Context, intead of Span or SpanContext (#1146)" This reverts commit 8cf811098773735cd7f4021d1de2803861b08434. --- .../src/opentelemetry/exporter/zipkin/__init__.py | 4 ++-- .../tests/test_zipkin_exporter.py | 12 +++++------- 2 files changed, 7 insertions(+), 9 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 c8578c964..bacfcc278 100644 --- a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py @@ -159,7 +159,7 @@ class ZipkinSpanExporter(SpanExporter): zipkin_spans = [] for span in spans: - context = span.get_span_context() + context = span.get_context() trace_id = context.trace_id span_id = context.span_id @@ -205,7 +205,7 @@ class ZipkinSpanExporter(SpanExporter): if isinstance(span.parent, Span): zipkin_span["parentId"] = format( - span.parent.get_span_context().span_id, "016x" + span.parent.get_context().span_id, "016x" ) elif isinstance(span.parent, SpanContext): zipkin_span["parentId"] = format(span.parent.span_id, "016x") diff --git a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py index c3098da88..8d6d8bb86 100644 --- a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py +++ b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py @@ -127,7 +127,7 @@ class TestZipkinSpanExporter(unittest.TestCase): is_remote=False, trace_flags=TraceFlags(TraceFlags.SAMPLED), ) - parent_span_context = trace_api.SpanContext( + parent_context = trace_api.SpanContext( trace_id, parent_id, is_remote=False ) other_context = trace_api.SpanContext( @@ -157,12 +157,12 @@ class TestZipkinSpanExporter(unittest.TestCase): trace._Span( name=span_names[0], context=span_context, - parent=parent_span_context, + parent=parent_context, events=(event,), links=(link,), ), trace._Span( - name=span_names[1], context=parent_span_context, parent=None + name=span_names[1], context=parent_context, parent=None ), trace._Span( name=span_names[2], context=other_context, parent=None @@ -328,14 +328,12 @@ class TestZipkinSpanExporter(unittest.TestCase): is_remote=False, trace_flags=TraceFlags(TraceFlags.SAMPLED), ) - parent_span_context = trace_api.SpanContext( + parent_context = trace_api.SpanContext( trace_id, parent_id, is_remote=False ) otel_span = trace._Span( - name=span_names[0], - context=span_context, - parent=parent_span_context, + name=span_names[0], context=span_context, parent=parent_context, ) otel_span.start(start_time=start_time)