sdk: span parents are now always spancontext

ext/opentelemetry-ext-docker-tests/tests/pymongo/test_pymongo_functional.py

@@ -63,7 +63,7 @@ def validate_spans(self):
         self.assertIsNot(root_span, None)
         self.assertIsNot(pymongo_span, None)
         self.assertIsNotNone(pymongo_span.parent)
-        self.assertEqual(pymongo_span.parent.name, root_span.name)
+        self.assertEqual(pymongo_span.parent, root_span.get_context())
         self.assertIs(pymongo_span.kind, trace_api.SpanKind.CLIENT)
         self.assertEqual(
             pymongo_span.attributes["db.instance"], MONGODB_DB_NAME

ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/__init__.py

@@ -195,9 +195,7 @@ def _translate_to_jaeger(spans: Span):
         status = span.status
 
         parent_id = 0
-        if isinstance(span.parent, trace_api.Span):
-            parent_id = span.parent.get_context().span_id
-        elif isinstance(span.parent, trace_api.SpanContext):
+        if span.parent is not None:
             parent_id = span.parent.span_id
 
         tags = _extract_tags(span.attributes)

ext/opentelemetry-ext-opentracing-shim/tests/test_shim.py

@@ -292,7 +292,8 @@ def test_parent_child_implicit(self):
 
                 self.assertEqual(parent_trace_id, child_trace_id)
                 self.assertEqual(
-                    child.span.unwrap().parent, parent.span.unwrap()
+                    child.span.unwrap().parent,
+                    parent.span.unwrap().get_context(),
                 )
 
             # Verify parent span becomes the active span again.
@@ -320,7 +321,9 @@ def test_parent_child_explicit_span(self):
                 child_trace_id = child.span.unwrap().get_context().trace_id
 
                 self.assertEqual(child_trace_id, parent_trace_id)
-                self.assertEqual(child.span.unwrap().parent, parent.unwrap())
+                self.assertEqual(
+                    child.span.unwrap().parent, parent.unwrap().get_context()
+                )
 
         with self.shim.start_span("ParentSpan") as parent:
             child = self.shim.start_span("ChildSpan", child_of=parent)
@@ -329,7 +332,9 @@ def test_parent_child_explicit_span(self):
             child_trace_id = child.unwrap().get_context().trace_id
 
             self.assertEqual(child_trace_id, parent_trace_id)
-            self.assertEqual(child.unwrap().parent, parent.unwrap())
+            self.assertEqual(
+                child.unwrap().parent, parent.unwrap().get_context()
+            )
 
             child.finish()
 

ext/opentelemetry-ext-otcollector/src/opentelemetry/ext/otcollector/trace_exporter/__init__.py

@@ -109,9 +109,7 @@ def translate_to_collector(spans: Sequence[Span]):
         )
 
         parent_id = 0
-        if isinstance(span.parent, trace_api.Span):
-            parent_id = span.parent.get_context().span_id
-        elif isinstance(span.parent, trace_api.SpanContext):
+        if span.parent is not None:
             parent_id = span.parent.span_id
 
         collector_span.parent_span_id = parent_id.to_bytes(8, "big")
@@ -157,18 +155,7 @@ def translate_to_collector(spans: Sequence[Span]):
                 collector_span_link.type = (
                     trace_pb2.Span.Link.Type.TYPE_UNSPECIFIED
                 )
-
-                if isinstance(span.parent, trace_api.Span):
-                    if (
-                        link.context.span_id
-                        == span.parent.get_context().span_id
-                        and link.context.trace_id
-                        == span.parent.get_context().trace_id
-                    ):
-                        collector_span_link.type = (
-                            trace_pb2.Span.Link.Type.PARENT_LINKED_SPAN
-                        )
-                elif isinstance(span.parent, trace_api.SpanContext):
+                if span.parent is not None:
                     if (
                         link.context.span_id == span.parent.span_id
                         and link.context.trace_id == span.parent.trace_id

ext/opentelemetry-ext-otcollector/tests/test_otcollector_trace_exporter.py

@@ -135,7 +135,10 @@ def test_translate_to_collector(self):
             kind=trace_api.SpanKind.SERVER,
         )
         span_3 = trace.Span(
-            name="test3", context=other_context, links=(link_2,), parent=span_2
+            name="test3",
+            context=other_context,
+            links=(link_2,),
+            parent=span_2.get_context(),
         )
         otel_spans = [span_1, span_2, span_3]
         otel_spans[0].start(start_time=start_times[0])

opentelemetry-api/src/opentelemetry/trace/__init__.py

@@ -84,7 +84,7 @@
 logger = getLogger(__name__)
 
 # TODO: quarantine
-ParentSpan = typing.Optional[typing.Union["Span", "SpanContext"]]
+Parent = typing.Optional[typing.Union["SpanContext", "Span"]]
 
 
 class LinkBase(abc.ABC):
@@ -512,7 +512,7 @@ def get_current_span(self) -> "Span":
     def start_span(
         self,
         name: str,
-        parent: ParentSpan = CURRENT_SPAN,
+        parent: Parent = CURRENT_SPAN,
         kind: SpanKind = SpanKind.INTERNAL,
         attributes: typing.Optional[types.Attributes] = None,
         links: typing.Sequence[Link] = (),
@@ -564,7 +564,7 @@ def start_span(
     def start_as_current_span(
         self,
         name: str,
-        parent: ParentSpan = CURRENT_SPAN,
+        parent: Parent = CURRENT_SPAN,
         kind: SpanKind = SpanKind.INTERNAL,
         attributes: typing.Optional[types.Attributes] = None,
         links: typing.Sequence[Link] = (),
@@ -644,7 +644,7 @@ def get_current_span(self) -> "Span":
     def start_span(
         self,
         name: str,
-        parent: ParentSpan = Tracer.CURRENT_SPAN,
+        parent: Parent = Tracer.CURRENT_SPAN,
         kind: SpanKind = SpanKind.INTERNAL,
         attributes: typing.Optional[types.Attributes] = None,
         links: typing.Sequence[Link] = (),
@@ -658,7 +658,7 @@ def start_span(
     def start_as_current_span(
         self,
         name: str,
-        parent: ParentSpan = Tracer.CURRENT_SPAN,
+        parent: Parent = Tracer.CURRENT_SPAN,
         kind: SpanKind = SpanKind.INTERNAL,
         attributes: typing.Optional[types.Attributes] = None,
         links: typing.Sequence[Link] = (),

opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

@@ -216,7 +216,7 @@ def __init__(
         self,
         name: str,
         context: trace_api.SpanContext,
-        parent: trace_api.ParentSpan = None,
+        parent: Optional[trace_api.SpanContext] = None,
         sampler: Optional[sampling.Sampler] = None,
         trace_config: None = None,  # TODO
         resource: None = None,
@@ -503,7 +503,7 @@ def get_current_span(self):
     def start_as_current_span(
         self,
         name: str,
-        parent: trace_api.ParentSpan = trace_api.Tracer.CURRENT_SPAN,
+        parent: trace_api.Parent = trace_api.Tracer.CURRENT_SPAN,
         kind: trace_api.SpanKind = trace_api.SpanKind.INTERNAL,
         attributes: Optional[types.Attributes] = None,
         links: Sequence[trace_api.Link] = (),
@@ -514,7 +514,7 @@ def start_as_current_span(
     def start_span(  # pylint: disable=too-many-locals
         self,
         name: str,
-        parent: trace_api.ParentSpan = trace_api.Tracer.CURRENT_SPAN,
+        parent: trace_api.Parent = trace_api.Tracer.CURRENT_SPAN,
         kind: trace_api.SpanKind = trace_api.SpanKind.INTERNAL,
         attributes: Optional[types.Attributes] = None,
         links: Sequence[trace_api.Link] = (),
@@ -531,7 +531,9 @@ def start_span(  # pylint: disable=too-many-locals
         if parent_context is not None and not isinstance(
             parent_context, trace_api.SpanContext
         ):
-            raise TypeError
+            raise TypeError(
+                "expected Span, SpanContext or None object for trace parent."
+            )
 
         if parent_context is None or not parent_context.is_valid():
             parent = parent_context = None
@@ -577,7 +579,7 @@ def start_span(  # pylint: disable=too-many-locals
             span = Span(
                 name=name,
                 context=context,
-                parent=parent,
+                parent=parent_context,
                 sampler=self.source.sampler,
                 resource=self.source.resource,
                 attributes=span_attributes,

opentelemetry-sdk/tests/context/test_asyncio.py

@@ -108,4 +108,4 @@ def test_with_asyncio(self):
         for span in span_list:
             if span is expected_parent:
                 continue
-            self.assertEqual(span.parent, expected_parent)
+            self.assertEqual(span.parent, expected_parent.get_context())

opentelemetry-sdk/tests/trace/test_trace.py

@@ -233,7 +233,7 @@ def test_start_span_implicit(self):
             with tracer.start_span(
                 "child", kind=trace_api.SpanKind.CLIENT
             ) as child:
-                self.assertIs(child.parent, root)
+                self.assertIs(child.parent, root.get_context())
                 self.assertEqual(child.kind, trace_api.SpanKind.CLIENT)
 
                 self.assertIsNotNone(child.start_time)
@@ -322,7 +322,7 @@ def test_start_as_current_span_implicit(self):
 
             with tracer.start_as_current_span("child") as child:
                 self.assertIs(tracer.get_current_span(), child)
-                self.assertIs(child.parent, root)
+                self.assertIs(child.parent, root.get_context())
 
             # After exiting the child's scope the parent should become the
             # current span again.