rename get_parent

sdk/core/azure-core/azure/core/tracing/common.py

@@ -41,7 +41,7 @@ def set_span_contexts(wrapped_span, span_instance=None):
         impl_wrapper.set_current_span(span_instance)
 
 
-def get_parent(kwargs):
+def get_parent_and_original_contexts(kwargs):
     # type: (Any) -> Tuple(AbstractSpan, AbstractSpan, Any)
     """Returns the parent span that of the span that represents the function and the spans before that parent span"""
     parent_span = kwargs.pop("parent_span", None)  # type: AbstractSpan

sdk/core/azure-core/azure/core/tracing/decorator.py

@@ -33,7 +33,7 @@ def distributed_tracing_decorator(func):
     @functools.wraps(func)
     def wrapper_use_tracer(self, *args, **kwargs):
         # type: (Any) -> Any
-        parent_span, original_span_from_sdk_context, original_span_instance = common.get_parent(
+        parent_span, original_span_from_sdk_context, original_span_instance = common.get_parent_and_original_contexts(
             kwargs
         )
         ans = None
@@ -48,9 +48,7 @@ def wrapper_use_tracer(self, *args, **kwargs):
             common.set_span_contexts(parent_span)
             if getattr(parent_span, "was_created_by_azure_sdk", False):
                 parent_span.finish()
-            common.set_span_contexts(
-                original_span_from_sdk_context, span_instance=original_span_instance
-            )
+            common.set_span_contexts(original_span_from_sdk_context, span_instance=original_span_instance)
         else:
             ans = func(self, *args, **kwargs)
         return ans

sdk/core/azure-core/azure/core/tracing/decorator_async.py

@@ -24,15 +24,16 @@
 #
 # --------------------------------------------------------------------------
 import functools
+
 import azure.core.tracing.common as common
 
 
-def distributed_tracing_decorator_async(func):
+def distributed_tracing_decorator(func):
     # type: (Callable[[Any], Any]) -> Callable[[Any], Any]
     @functools.wraps(func)
     async def wrapper_use_tracer(self, *args, **kwargs):
         # type: (Any) -> Any
-        parent_span, original_span_from_sdk_context, original_span_instance = common.get_parent(
+        parent_span, original_span_from_sdk_context, original_span_instance = common.get_parent_and_original_contexts(
             kwargs
         )
         ans = None
@@ -47,9 +48,7 @@ async def wrapper_use_tracer(self, *args, **kwargs):
             common.set_span_contexts(parent_span)
             if getattr(parent_span, "was_created_by_azure_sdk", False):
                 parent_span.finish()
-            common.set_span_contexts(
-                original_span_from_sdk_context, span_instance=original_span_instance
-            )
+            common.set_span_contexts(original_span_from_sdk_context, span_instance=original_span_instance)
         else:
             ans = await func(self, *args, **kwargs)
         return ans

sdk/core/azure-core/tests/test_tracing_decorator.py

@@ -97,37 +97,37 @@ def test_set_span_context(self):
             assert parent.span_instance == wrapper.get_current_span()
             assert tracing_context.current_span.get() == parent
 
-    def test_get_parent(self):
+    def test_get_parent_and_original_contexts(self):
         with ContextHelper():
             opencensus = sys.modules["opencensus"]
             del sys.modules["opencensus"]
 
-            parent, orig_tracing_context, orig_span_inst = common.get_parent({})
+            parent, orig_tracing_context, orig_span_inst = common.get_parent_and_original_contexts({})
             assert orig_span_inst is None
             assert parent is None
             assert orig_tracing_context is None
 
             sys.modules["opencensus"] = opencensus
-            parent, orig_tracing_context, orig_span_inst = common.get_parent({})
+            parent, orig_tracing_context, orig_span_inst = common.get_parent_and_original_contexts({})
             assert orig_span_inst is None
             assert parent.span_instance.name == "azure-sdk-for-python-first_parent_span"
             assert orig_tracing_context is None
 
             tracer = tracer_module.Tracer(sampler=AlwaysOnSampler())
-            parent, orig_tracing_context, orig_span_inst = common.get_parent({})
+            parent, orig_tracing_context, orig_span_inst = common.get_parent_and_original_contexts({})
             assert orig_span_inst is None
             assert parent.span_instance.name == "azure-sdk-for-python-first_parent_span"
             assert orig_tracing_context is None
             parent.finish()
 
             some_span = tracer.start_span(name="some_span")
-            new_parent, orig_tracing_context, orig_span_inst = common.get_parent({})
+            new_parent, orig_tracing_context, orig_span_inst = common.get_parent_and_original_contexts({})
             assert orig_span_inst == some_span
             assert new_parent.span_instance.name == "some_span"
             assert orig_tracing_context is None
 
             kwarg = {"parent_span": parent.span_instance}
-            should_be_old_parent, orig_tracing_context, orig_span_inst = common.get_parent(kwarg)
+            should_be_old_parent, orig_tracing_context, orig_span_inst = common.get_parent_and_original_contexts(kwarg)
             assert kwarg.get("parent_span") is None
             assert orig_span_inst == some_span
             assert should_be_old_parent.span_instance == parent.span_instance