fix: b3 propagation needs to check if parent is SpanContext (open-telemetry#621)

alrex · web-flow · commit c772bb7deb65 · 2020-04-30T16:56:11.000-07:00
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/propagation/b3_format.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/propagation/b3_format.py
@@ -137,7 +137,7 @@ def inject(
             set_in_carrier(
                 carrier,
                 self.PARENT_SPAN_ID_KEY,
-                format_span_id(span.parent.context.span_id),
+                format_span_id(span.parent.span_id),
             )
         set_in_carrier(carrier, self.SAMPLED_KEY, "1" if sampled else "0")
 
diff --git a/opentelemetry-sdk/tests/trace/propagation/test_b3_format.py b/opentelemetry-sdk/tests/trace/propagation/test_b3_format.py
@@ -45,7 +45,7 @@ def get_child_parent_new_carrier(old_carrier):
             trace_flags=parent_context.trace_flags,
             trace_state=parent_context.trace_state,
         ),
-        parent=parent,
+        parent=parent.get_context(),
     )
 
     new_carrier = {}

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ def inject(`
`137`	`137`	`set_in_carrier(`
`138`	`138`	`carrier,`
`139`	`139`	`self.PARENT_SPAN_ID_KEY,`
`140`		`- format_span_id(span.parent.context.span_id),`
	`140`	`+ format_span_id(span.parent.span_id),`
`141`	`141`	`)`
`142`	`142`	`set_in_carrier(carrier, self.SAMPLED_KEY, "1" if sampled else "0")`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ def get_child_parent_new_carrier(old_carrier):`
`45`	`45`	`trace_flags=parent_context.trace_flags,`
`46`	`46`	`trace_state=parent_context.trace_state,`
`47`	`47`	`),`
`48`		`- parent=parent,`
	`48`	`+ parent=parent.get_context(),`
`49`	`49`	`)`
`50`	`50`
`51`	`51`	`new_carrier = {}`