Merge branch 'munir/avoid-using-deprecated-apis-internally' into munir/remove-deprecated-tracing-modules

Author: mabdinur

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

@@ -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__()

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 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()
     """
 

ddtrace/_trace/utils_botocore/aws_payload_tagging.py

@@ -5,8 +5,8 @@
 from typing import Dict
 from typing import Optional
 
-from ddtrace import Span
 from ddtrace import config
+from ddtrace.trace import Span
 from ddtrace.vendor.jsonpath_ng import parse
 
 

ddtrace/_trace/utils_botocore/span_tags.py

@@ -3,7 +3,6 @@
 from typing import Dict
 from typing import Optional
 
-from ddtrace import Span
 from ddtrace import config
 from ddtrace._trace.utils_botocore.aws_payload_tagging import AWSPayloadTagging
 from ddtrace.constants import _ANALYTICS_SAMPLE_RATE_KEY
@@ -14,6 +13,7 @@
 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/appsec/_asm_request_context.py

@@ -63,7 +63,7 @@ class ASM_Environment:
     """
 
     def __init__(self, span: Optional[Span] = None):
-        from ddtrace import tracer
+        from ddtrace.trace import tracer
 
         self.root = not in_asm_context()
         if self.root:
@@ -178,7 +178,7 @@ def update_span_metrics(span: Span, name: str, value: Union[float, int]) -> None
 def flush_waf_triggers(env: ASM_Environment) -> None:
     # Make sure we find a root span to attach the triggers to
     if env.span is None:
-        from ddtrace import tracer
+        from ddtrace.trace import tracer
 
         current_span = tracer.current_span()
         if current_span is None:

ddtrace/appsec/_exploit_prevention/stack_traces.py

@@ -33,7 +33,7 @@ def report_stack(
         return False
 
     if span is None:
-        from ddtrace import tracer
+        from ddtrace.trace import tracer
 
         span = tracer.current_span()
 

ddtrace/appsec/_iast/taint_sinks/_base.py

@@ -4,11 +4,11 @@
 from typing import Optional
 from typing import Text
 
-from ddtrace import tracer
 from ddtrace.appsec._deduplications import deduplication
 from ddtrace.appsec._trace_utils import _asm_manual_keep
 from ddtrace.internal.logger import get_logger
 from ddtrace.settings.asm import config as asm_config
+from ddtrace.trace import tracer
 
 from .._iast_request_context import get_iast_reporter
 from .._iast_request_context import is_iast_request_enabled

ddtrace/appsec/_remoteconfiguration.py

@@ -5,7 +5,6 @@
 from typing import Mapping
 from typing import Optional
 
-from ddtrace import Tracer
 from ddtrace.appsec._capabilities import _asm_feature_is_required
 from ddtrace.appsec._constants import PRODUCTS
 from ddtrace.internal.logger import get_logger
@@ -17,6 +16,7 @@
 from ddtrace.internal.telemetry import telemetry_writer
 from ddtrace.internal.telemetry.constants import TELEMETRY_APM_PRODUCT
 from ddtrace.settings.asm import config as asm_config
+from ddtrace.trace import Tracer
 
 
 log = get_logger(__name__)
@@ -109,7 +109,7 @@ def _appsec_rules_data(features: Mapping[str, Any], test_tracer: Optional[Tracer
     # Tracer is a parameter for testing propose
     # Import tracer here to avoid a circular import
     if test_tracer is None:
-        from ddtrace import tracer
+        from ddtrace.trace import tracer
     else:
         tracer = test_tracer
 
@@ -198,7 +198,7 @@ def _appsec_1click_activation(features: Mapping[str, Any], test_tracer: Optional
         # Tracer is a parameter for testing propose
         # Import tracer here to avoid a circular import
         if test_tracer is None:
-            from ddtrace import tracer
+            from ddtrace.trace import tracer
         else:
             tracer = test_tracer
 

ddtrace/appsec/_trace_utils.py

@@ -1,6 +1,5 @@
 from typing import Optional
 
-from ddtrace import Tracer
 from ddtrace import constants
 from ddtrace._trace.span import Span
 from ddtrace.appsec import _asm_request_context
@@ -18,6 +17,7 @@
 from ddtrace.internal._exceptions import BlockingException
 from ddtrace.internal.logger import get_logger
 from ddtrace.settings.asm import config as asm_config
+from ddtrace.trace import Tracer
 
 
 log = get_logger(__name__)

ddtrace/bootstrap/preload.py

@@ -15,7 +15,7 @@
 from ddtrace.internal.utils.formats import asbool  # noqa:F401
 from ddtrace.internal.utils.formats import parse_tags_str  # noqa:F401
 from ddtrace.settings.crashtracker import config as crashtracker_config
-from ddtrace import tracer
+from ddtrace.trace import tracer
 
 
 import typing as t

ddtrace/contrib/aiohttp/__init__.py

@@ -47,7 +47,7 @@
 the provided ``trace_app`` function must be used::
 
     from aiohttp import web
-    from ddtrace import tracer, patch
+    from ddtrace.trace import tracer, patch
     from ddtrace.contrib.aiohttp import trace_app
 
     # create your application

ddtrace/contrib/bottle/__init__.py

@@ -3,7 +3,7 @@
 plugin to your app::
 
     import bottle
-    from ddtrace import tracer
+    from ddtrace.trace import tracer
     from ddtrace.contrib.bottle import TracePlugin
 
     app = bottle.Bottle()

ddtrace/contrib/cherrypy/__init__.py

@@ -7,7 +7,7 @@
 ~~~~~
 To install the middleware, add::
 
-    from ddtrace import tracer
+    from ddtrace.trace import tracer
     from ddtrace.contrib.cherrypy import TraceMiddleware
 
 and create a `TraceMiddleware` object::
@@ -40,7 +40,7 @@
 
     import cherrypy
 
-    from ddtrace import tracer, Pin
+    from ddtrace.trace import tracer, Pin
     from ddtrace.contrib.cherrypy import TraceMiddleware
     TraceMiddleware(cherrypy, tracer, service="my-cherrypy-app")
 

ddtrace/contrib/falcon/__init__.py

@@ -2,7 +2,7 @@
 To trace the falcon web framework, install the trace middleware::
 
     import falcon
-    from ddtrace import tracer
+    from ddtrace.trace import tracer
     from ddtrace.contrib.falcon import TraceMiddleware
 
     mw = TraceMiddleware(tracer, 'my-falcon-app')
@@ -11,7 +11,7 @@
 You can also use the autopatching functionality::
 
     import falcon
-    from ddtrace import tracer, patch
+    from ddtrace.trace import tracer, patch
 
     patch(falcon=True)
 

ddtrace/contrib/flask_cache/__init__.py

@@ -5,9 +5,9 @@
 The tracer supports both `Flask-Cache <https://pythonhosted.org/Flask-Cache/>`_
 and `Flask-Caching <https://flask-caching.readthedocs.io/>`_.
 
-To install the tracer, ``from ddtrace import tracer`` needs to be added::
+To install the tracer, ``from ddtrace.trace import tracer`` needs to be added::
 
-    from ddtrace import tracer
+    from ddtrace.trace import tracer
     from ddtrace.contrib.flask_cache import get_traced_cache
 
 and the tracer needs to be initialized::
@@ -18,7 +18,7 @@
 
     from flask import Flask
 
-    from ddtrace import tracer
+    from ddtrace.trace import tracer
     from ddtrace.contrib.flask_cache import get_traced_cache
 
     app = Flask(__name__)
@@ -35,7 +35,7 @@ def counter():
 
 Use a specific ``Cache`` implementation with::
 
-    from ddtrace import tracer
+    from ddtrace.trace import tracer
     from ddtrace.contrib.flask_cache import get_traced_cache
 
     from flask_caching import Cache

ddtrace/contrib/internal/cassandra/session.py

@@ -20,7 +20,6 @@
 from cassandra.query import SimpleStatement
 import wrapt
 
-from ddtrace import Span
 from ddtrace import config
 from ddtrace.constants import _ANALYTICS_SAMPLE_RATE_KEY
 from ddtrace.constants import _SPAN_MEASURED_KEY
@@ -40,6 +39,7 @@
 from ddtrace.internal.utils import get_argument_value
 from ddtrace.internal.utils.formats import deep_getattr
 from ddtrace.trace import Pin
+from ddtrace.trace import Span
 
 
 log = get_logger(__name__)

ddtrace/contrib/internal/flask_cache/tracers.py

@@ -20,7 +20,7 @@
 
 
 if typing.TYPE_CHECKING:  # pragma: no cover
-    from ddtrace import Span  # noqa:F401
+    from ddtrace.trace import Span  # noqa:F401
 
 
 log = logging.Logger(__name__)

ddtrace/contrib/internal/grpc/aio_client_interceptor.py

@@ -11,7 +11,6 @@
 from grpc.aio._typing import ResponseIterableType
 from grpc.aio._typing import ResponseType
 
-from ddtrace import Span
 from ddtrace import config
 from ddtrace.constants import _ANALYTICS_SAMPLE_RATE_KEY
 from ddtrace.constants import _SPAN_MEASURED_KEY
@@ -30,6 +29,7 @@
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 from ddtrace.propagation.http import HTTPPropagator
 from ddtrace.trace import Pin
+from ddtrace.trace import Span
 
 
 log = get_logger(__name__)

ddtrace/contrib/internal/grpc/aio_server_interceptor.py

@@ -13,7 +13,6 @@
 from grpc.aio._typing import ResponseType
 import wrapt
 
-from ddtrace import Span  # noqa:F401
 from ddtrace import config
 from ddtrace.constants import _ANALYTICS_SAMPLE_RATE_KEY
 from ddtrace.constants import _SPAN_MEASURED_KEY
@@ -30,6 +29,7 @@
 from ddtrace.internal.schema import schematize_url_operation
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 from ddtrace.trace import Pin  # noqa:F401
+from ddtrace.trace import Span  # noqa:F401
 
 
 Continuation = Callable[[grpc.HandlerCallDetails], Awaitable[grpc.RpcMethodHandler]]

ddtrace/contrib/internal/mongoengine/trace.py

@@ -29,7 +29,7 @@ def __call__(self, *args, **kwargs):
         client = self.__wrapped__(*args, **kwargs)
         pin = ddtrace.trace.Pin.get_from(self)
         if pin:
-            # Calling ddtrace.pin.Pin(...) with the `tracer` argument generates a deprecation warning.
+            # Calling ddtrace.trace.Pin(...) with the `tracer` argument generates a deprecation warning.
             # Remove this if statement when the `tracer` argument is removed
             if pin.tracer is ddtrace.tracer:
                 ddtrace.trace.Pin(service=pin.service).onto(client)