Update internal imports (#2986)

As we've been deprecating a lot of stuff it's important that we actually
change our own code over to use the internal definitions to avoid deprecation
warnings.

We've had a few imports/usages slip through so let's add a regression
test and fix those up.

Author: Kyle-Verhoog

ddtrace/__init__.py

@@ -1,10 +1,10 @@
-from .monkey import patch  # noqa: E402
-from .monkey import patch_all
+from ._monkey import patch  # noqa: E402
+from ._monkey import patch_all
+from .internal.utils.deprecation import deprecated  # noqa: E402
 from .pin import Pin  # noqa: E402
 from .settings import _config as config  # noqa: E402
 from .span import Span  # noqa: E402
 from .tracer import Tracer  # noqa: E402
-from .utils.deprecation import deprecated  # noqa: E402
 from .version import get_version
 
 

ddtrace/_monkey.py

@@ -9,9 +9,9 @@
 from ddtrace.vendor.wrapt.importer import when_imported
 
 from .internal.logger import get_logger
+from .internal.utils import formats
+from .internal.utils.deprecation import deprecated
 from .settings import _config as config
-from .utils import formats
-from .utils.deprecation import deprecated
 
 
 log = get_logger(__name__)

ddtrace/context.py

@@ -8,7 +8,7 @@
 from .constants import SAMPLING_PRIORITY_KEY
 from .internal.compat import NumericType
 from .internal.logger import get_logger
-from .utils.deprecation import deprecated
+from .internal.utils.deprecation import deprecated
 
 
 if TYPE_CHECKING:

ddtrace/contrib/__init__.py

@@ -1,3 +1,3 @@
-from ..utils.importlib import func_name  # noqa
-from ..utils.importlib import module_name  # noqa
-from ..utils.importlib import require_modules  # noqa
+from ..internal.utils.importlib import func_name  # noqa
+from ..internal.utils.importlib import module_name  # noqa
+from ..internal.utils.importlib import require_modules  # noqa

ddtrace/contrib/aiobotocore/__init__.py

@@ -18,7 +18,7 @@
     # This query generates a trace
     lambda_client.list_functions()
 """
-from ...utils.importlib import require_modules
+from ...internal.utils.importlib import require_modules
 
 
 required_modules = ["aiobotocore.client"]

ddtrace/contrib/aiobotocore/patch.py

@@ -16,11 +16,11 @@
 from ...ext import aws
 from ...ext import http
 from ...internal.compat import PYTHON_VERSION_INFO
+from ...internal.utils import ArgumentError
+from ...internal.utils import get_argument_value
+from ...internal.utils.formats import deep_getattr
 from ...pin import Pin
-from ...utils import ArgumentError
-from ...utils import get_argument_value
-from ...utils.formats import deep_getattr
-from ...utils.wrappers import unwrap
+from ..trace_utils import unwrap
 
 
 ARGS_NAME = ("action", "params", "path", "verb")

ddtrace/contrib/aiohttp/__init__.py

@@ -47,7 +47,7 @@ async def home_handler(request):
 :ref:`All HTTP tags <http-tagging>` are supported for this integration.
 
 """
-from ...utils.importlib import require_modules
+from ...internal.utils.importlib import require_modules
 
 
 required_modules = ["aiohttp"]

ddtrace/contrib/aiohttp/patch.py

@@ -2,8 +2,8 @@
 from ddtrace.internal.logger import get_logger
 from ddtrace.vendor import wrapt
 
+from ...internal.utils.wrappers import unwrap
 from ...pin import Pin
-from ...utils.wrappers import unwrap
 
 
 log = get_logger(__name__)

ddtrace/contrib/aiohttp/template.py

@@ -3,7 +3,7 @@
 from ddtrace import Pin
 
 from ...ext import SpanTypes
-from ...utils import get_argument_value
+from ...internal.utils import get_argument_value
 
 
 def _trace_render_template(func, module, args, kwargs):

ddtrace/contrib/aiopg/__init__.py

@@ -15,7 +15,7 @@
     # Use a pin to specify metadata related to this connection
     Pin.override(db, service='postgres-users')
 """
-from ...utils.importlib import require_modules
+from ...internal.utils.importlib import require_modules
 
 
 required_modules = ["aiopg"]