update pin

update pin and circular imports

Author: mabdinur

ddtrace/__init__.py

@@ -29,7 +29,7 @@
 from .internal.utils.deprecations import DDTraceDeprecationWarning  # noqa: E402
 from ddtrace._trace.pin import Pin  # noqa: E402
 from ddtrace._trace.span import Span  # noqa: E402
-from ddtrace.trace import Tracer  # noqa: E402
+from ddtrace._trace.tracer import Tracer  # noqa: E402
 from ddtrace.vendor import debtcollector
 from .version import get_version  # noqa: E402
 

ddtrace/_trace/_span_link.py

@@ -13,7 +13,7 @@
 Usage
 -----
 
-SpanLinks can be set using :meth:`ddtrace._trace.span.Span.link_span(...)` Ex::
+SpanLinks can be set using :meth:`ddtrace.Span.link_span(...)` Ex::
 
     from ddtrace.trace import tracer
 

ddtrace/_trace/trace_handlers.py

@@ -39,7 +39,7 @@
 
 
 if TYPE_CHECKING:
-    from ddtrace.trace import Span
+    from ddtrace._trace.span import Span
 
 
 log = get_logger(__name__)

ddtrace/_trace/utils_botocore/aws_payload_tagging.py

@@ -6,7 +6,7 @@
 from typing import Optional
 
 from ddtrace import config
-from ddtrace.trace import Span
+from ddtrace._trace.span import Span
 from ddtrace.vendor.jsonpath_ng import parse
 
 

ddtrace/_trace/utils_botocore/span_tags.py

@@ -4,6 +4,7 @@
 from typing import Optional
 
 from ddtrace import config
+from ddtrace._trace.span import Span
 from ddtrace._trace.utils_botocore.aws_payload_tagging import AWSPayloadTagging
 from ddtrace.constants import _ANALYTICS_SAMPLE_RATE_KEY
 from ddtrace.constants import _SPAN_MEASURED_KEY
@@ -13,7 +14,6 @@
 from ddtrace.ext import http
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.utils.formats import deep_getattr
-from ddtrace.trace import Span
 
 
 _PAYLOAD_TAGGER = AWSPayloadTagging()

ddtrace/contrib/internal/pymemcache/patch.py

@@ -3,9 +3,9 @@
 
 from ddtrace._trace.pin import _DD_PIN_NAME
 from ddtrace._trace.pin import _DD_PIN_PROXY_NAME
-from ddtrace._trace.pin import Pin
 from ddtrace.ext import memcached as memcachedx
 from ddtrace.internal.schema import schematize_service_name
+from ddtrace.trace import Pin
 
 from .client import WrappedClient
 from .client import WrappedHashClient

ddtrace/internal/ci_visibility/api/_base.py

@@ -76,7 +76,7 @@ class TestVisibilitySessionSettings:
 
     def __post_init__(self):
         if not isinstance(self.tracer, Tracer):
-            raise TypeError("tracer must be a ddtrace._trace.tracer.Tracer")
+            raise TypeError("tracer must be a ddtrace.trace.Tracer")
         if not isinstance(self.workspace_path, Path):
             raise TypeError("root_dir must be a pathlib.Path")
         if not self.workspace_path.is_absolute():

ddtrace/internal/ci_visibility/coverage.py

@@ -131,7 +131,7 @@ def _switch_coverage_context(
 
 
 def _report_coverage_to_span(
-    coverage_data: Coverage, span: ddtrace._trace.span.Span, root_dir: str, framework: Optional[TEST_FRAMEWORKS] = None
+    coverage_data: Coverage, span: ddtrace.trace.Span, root_dir: str, framework: Optional[TEST_FRAMEWORKS] = None
 ):
     # Experimental feature to use internal coverage collection
     if USE_DD_COVERAGE:

ddtrace/internal/ci_visibility/utils.py

@@ -50,7 +50,7 @@ def get_source_lines_for_test_method(
 
 
 def _add_start_end_source_file_path_data_to_span(
-    span: ddtrace._trace.span.Span, test_method_object, test_name: str, repo_directory: str
+    span: ddtrace.trace.Span, test_method_object, test_name: str, repo_directory: str
 ):
     if not test_method_object:
         log.debug(
@@ -75,7 +75,7 @@ def _add_start_end_source_file_path_data_to_span(
         span.set_tag(test.SOURCE_END, end_line)
 
 
-def _add_pct_covered_to_span(coverage_data: dict, span: ddtrace._trace.span.Span):
+def _add_pct_covered_to_span(coverage_data: dict, span: ddtrace.trace.Span):
     if not coverage_data or PCT_COVERED_KEY not in coverage_data:
         log.warning("Tried to add total covered percentage to session span but no data was found")
         return

ddtrace/internal/opentelemetry/trace.py

@@ -103,7 +103,7 @@ def start_span(
         curr_otel_span = get_current_span(context)
         if curr_otel_span is INVALID_SPAN:
             # There is no active datadog/otel span
-            dd_active = None  # type: Optional[Union[ddtrace.trace.Context, ddtrace._trace.span.Span]]
+            dd_active = None  # type: Optional[Union[ddtrace.trace.Context, ddtrace.trace.Span]]
         elif isinstance(curr_otel_span, Span):
             # Get underlying ddtrace span from the active otel span
             dd_active = curr_otel_span._ddspan

ddtrace/internal/runtime/runtime_metrics.py

@@ -78,7 +78,7 @@ def __init__(self, interval=_get_interval_or_default(), tracer=ddtrace.tracer, d
         self._dogstatsd_client: DogStatsd = get_dogstatsd_client(
             self.dogstatsd_url or ddtrace.internal.agent.get_stats_url()
         )
-        self.tracer: Optional[ddtrace._trace.tracer.Tracer] = tracer
+        self.tracer: Optional[ddtrace.trace.Tracer] = tracer
         self._runtime_metrics: RuntimeMetrics = RuntimeMetrics()
         self._services: Set[str] = set()
 
@@ -114,7 +114,7 @@ def _restart(cls):
 
     @classmethod
     def enable(cls, flush_interval=None, tracer=None, dogstatsd_url=None):
-        # type: (Optional[float], Optional[ddtrace._trace.tracer.Tracer], Optional[str]) -> None
+        # type: (Optional[float], Optional[ddtrace.trace.Tracer], Optional[str]) -> None
         with cls._lock:
             if cls._instance is not None:
                 return

ddtrace/internal/runtime/tag_collectors.py

@@ -17,7 +17,7 @@ class RuntimeTagCollector(ValueCollector):
 
 
 class TracerTagCollector(RuntimeTagCollector):
-    """Tag collector for the ddtrace._trace.tracer.Tracer"""
+    """Tag collector for the ddtrace Tracer"""
 
     required_modules = ["ddtrace"]
 

docs/advanced_usage.rst

@@ -29,7 +29,7 @@ You can also use a Unix Domain Socket to connect to the agent::
 Context
 -------
 
-The :class:`ddtrace.context.Context` object is used to represent the state of
+The :class:`ddtrace.trace.Context` object is used to represent the state of
 a trace at a point in time. This state includes the trace id, active span id,
 distributed sampling decision and more. It is used to propagate the trace
 across execution boundaries like processes
@@ -46,7 +46,7 @@ Tracing Context Management
 --------------------------
 
 In ``ddtrace`` "context management" is the management of which
-:class:`ddtrace.trace.Span` or :class:`ddtrace.context.Context` is active in an
+:class:`ddtrace.trace.Span` or :class:`ddtrace.trace.Context` is active in an
 execution (thread, task, etc). There can only be one active span or context
 per execution at a time.