Merge remote-tracking branch 'origin/3.x-staging' into munir/remove-d…

…eprecated-code-integrations

benchmarks/ddtrace_run/scenario.py

@@ -32,7 +32,7 @@ def run(self):
             env["DD_TRACE_API_VERSION"] = "v0.4"
             code += """
 import httpretty
-from ddtrace import tracer
+from ddtrace.trace import tracer
 from ddtrace.internal.telemetry import telemetry_writer
 
 httpretty.enable(allow_net_connect=False)

benchmarks/otel_span/scenario.py

@@ -6,8 +6,8 @@
 from opentelemetry.trace import set_tracer_provider
 
 from ddtrace import config
-from ddtrace import tracer
 from ddtrace.opentelemetry import TracerProvider  # Requires ``ddtrace>=1.11``
+from ddtrace.trace import tracer
 
 
 set_tracer_provider(TracerProvider())

benchmarks/span/scenario.py

@@ -2,7 +2,7 @@
 import bm.utils as utils
 
 from ddtrace import config
-from ddtrace import tracer
+from ddtrace.trace import tracer
 
 
 class Span(Scenario):

benchmarks/threading/scenario.py

@@ -39,7 +39,7 @@ def create_trace(self, tracer: Tracer) -> None:
                     random.random()
 
     def run(self) -> Generator[Callable[[int], None], None, None]:
-        from ddtrace import tracer
+        from ddtrace.trace import tracer
 
         # configure global tracer to drop traces rather
         tracer.configure(writer=NoopWriter())

benchmarks/tracer/scenario.py

@@ -8,7 +8,7 @@ class Tracer(bm.Scenario):
     def run(self):
         # configure global tracer to drop traces rather than encoded and sent to
         # an agent
-        from ddtrace import tracer
+        from ddtrace.trace import tracer
 
         utils.drop_traces(tracer)
         utils.drop_telemetry_events()

ddtrace/_trace/_span_link.py

@@ -15,7 +15,7 @@
 
 SpanLinks can be set using :meth:`ddtrace.Span.link_span(...)` Ex::
 
-    from ddtrace import tracer
+    from ddtrace.trace import tracer
 
     s1 = tracer.trace("s1")
     s2 = tracer.trace("s2")

ddtrace/_trace/pin.py

@@ -44,7 +44,7 @@ def __init__(
         # type: (...) -> None
         if tracer is not None and tracer is not ddtrace.tracer:
             deprecate(
-                "Initializing ddtrace.Pin with `tracer` argument is deprecated",
+                "Initializing ddtrace.trace.Pin with `tracer` argument is deprecated",
                 message="All Pin instances should use the global tracer instance",
                 removal_version="3.0.0",
             )
@@ -79,15 +79,15 @@ def __repr__(self):
     def _find(*objs):
         # type: (Any) -> Optional[Pin]
         """
-        Return the first :class:`ddtrace.pin.Pin` found on any of the provided objects or `None` if none were found
+        Return the first :class:`ddtrace.trace.Pin` found on any of the provided objects or `None` if none were found
 
 
             >>> pin = Pin._find(wrapper, instance, conn)
 
-        :param objs: The objects to search for a :class:`ddtrace.pin.Pin` on
+        :param objs: The objects to search for a :class:`ddtrace.trace.Pin` on
         :type objs: List of objects
-        :rtype: :class:`ddtrace.pin.Pin`, None
-        :returns: The first found :class:`ddtrace.pin.Pin` or `None` is none was found
+        :rtype: :class:`ddtrace.trace.Pin`, None
+        :returns: The first found :class:`ddtrace.trace.Pin` or `None` is none was found
         """
         for obj in objs:
             pin = Pin.get_from(obj)
@@ -105,10 +105,10 @@ def get_from(obj):
 
             >>> pin = Pin.get_from(conn)
 
-        :param obj: The object to look for a :class:`ddtrace.pin.Pin` on
+        :param obj: The object to look for a :class:`ddtrace.trace.Pin` on
         :type obj: object
-        :rtype: :class:`ddtrace.pin.Pin`, None
-        :returns: :class:`ddtrace.pin.Pin` associated with the object, or None if none was found
+        :rtype: :class:`ddtrace.trace.Pin`, None
+        :returns: :class:`ddtrace.trace.Pin` associated with the object, or None if none was found
         """
         if hasattr(obj, "__getddpin__"):
             return obj.__getddpin__()
@@ -141,7 +141,7 @@ def override(
         """
         if tracer is not None:
             deprecate(
-                "Calling ddtrace.Pin.override(...) with the `tracer` argument is deprecated",
+                "Calling ddtrace.trace.Pin.override(...) with the `tracer` argument is deprecated",
                 message="All Pin instances should use the global tracer instance",
                 removal_version="3.0.0",
             )
@@ -208,7 +208,7 @@ def clone(
 
         if tracer is not None:
             deprecate(
-                "Initializing ddtrace.Pin with `tracer` argument is deprecated",
+                "Initializing ddtrace.trace.Pin with `tracer` argument is deprecated",
                 message="All Pin instances should use the global tracer instance",
                 removal_version="3.0.0",
             )

ddtrace/_trace/sampler.py

@@ -261,7 +261,9 @@ def __init__(
                 if isinstance(rule, SamplingRule):
                     self.rules.append(rule)
                 elif config._raise:
-                    raise TypeError("Rule {!r} must be a sub-class of type ddtrace.sampler.SamplingRules".format(rule))
+                    raise TypeError(
+                        "Rule {!r} must be a sub-class of type ddtrace._trace.sampler.SamplingRules".format(rule)
+                    )
 
         # DEV: sampling rule must come last
         if effective_sample_rate is not None:

ddtrace/_trace/trace_handlers.py

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

ddtrace/_trace/tracer.py

@@ -189,7 +189,7 @@ class Tracer(object):
     If you're running an application that will serve a single trace per thread,
     you can use the global tracer instance::
 
-        from ddtrace import tracer
+        from ddtrace.trace import tracer
         trace = tracer.trace('app.request', 'web-server').finish()
     """