fmt

benchmarks/bm/utils.py

@@ -8,8 +8,8 @@
 
 from ddtrace import __version__ as ddtrace_version
 from ddtrace._trace.span import Span
-from ddtrace.trace import TraceFilter
 from ddtrace.internal import telemetry
+from ddtrace.trace import TraceFilter
 
 
 _Span = Span

ddtrace/_trace/pin.py

@@ -72,15 +72,15 @@ def __repr__(self):
     def _find(*objs):
         # type: (Any) -> Optional[Pin]
         """
-        Return the first :class:`ddtrace.trace.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.trace.Pin.Pin` on
+        :param objs: The objects to search for a :class:`ddtrace.trace.Pin` on
         :type objs: List of objects
-        :rtype: :class:`ddtrace.trace.Pin.Pin`, None
-        :returns: The first found :class:`ddtrace.trace.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)
@@ -98,10 +98,10 @@ def get_from(obj):
 
             >>> pin = Pin.get_from(conn)
 
-        :param obj: The object to look for a :class:`ddtrace.trace.Pin.Pin` on
+        :param obj: The object to look for a :class:`ddtrace.trace.Pin` on
         :type obj: object
-        :rtype: :class:`ddtrace.trace.Pin.Pin`, None
-        :returns: :class:`ddtrace.trace.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 hasattr(obj, "__getddpin__"):
             return obj.__getddpin__()

ddtrace/_trace/tracer.py

@@ -31,7 +31,6 @@
 from ddtrace.constants import HOSTNAME_KEY
 from ddtrace.constants import PID
 from ddtrace.constants import VERSION_KEY
-from ddtrace.trace import TraceFilter
 from ddtrace.internal import agent
 from ddtrace.internal import atexit
 from ddtrace.internal import compat
@@ -69,6 +68,7 @@
 from ddtrace.settings import Config
 from ddtrace.settings.asm import config as asm_config
 from ddtrace.settings.peer_service import _ps_config
+from ddtrace.trace import TraceFilter
 from ddtrace.vendor.debtcollector import deprecate
 
 

ddtrace/contrib/internal/aiohttp/patch.py

@@ -21,8 +21,8 @@
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 from ddtrace.internal.utils import get_argument_value
 from ddtrace.internal.utils.formats import asbool
-from ddtrace.trace import Pin
 from ddtrace.propagation.http import HTTPPropagator
+from ddtrace.trace import Pin
 
 
 log = get_logger(__name__)

ddtrace/contrib/internal/asgi/middleware.py

@@ -150,12 +150,12 @@ async def __call__(self, scope, receive, send):
         if scope["type"] == "http":
             operation_name = schematize_url_operation(operation_name, direction=SpanDirection.INBOUND, protocol="http")
 
-        # Calling ddtrace.trace.Pin.Pin(...) with the `tracer` argument is deprecated
+        # Calling ddtrace.trace.Pin(...) with the `tracer` argument is deprecated
         # Remove this if statement when the `tracer` argument is removed
         if self.tracer is ddtrace.tracer:
-            pin = ddtrace.trace.Pin.Pin(service="asgi")
+            pin = ddtrace.trace.Pin(service="asgi")
         else:
-            pin = ddtrace.trace.Pin.Pin(service="asgi", tracer=self.tracer)
+            pin = ddtrace.trace.Pin(service="asgi", tracer=self.tracer)
 
         with core.context_with_data(
             "asgi.__call__",

ddtrace/contrib/internal/botocore/patch.py

@@ -33,8 +33,8 @@
 from ddtrace.internal.utils.formats import asbool
 from ddtrace.internal.utils.formats import deep_getattr
 from ddtrace.llmobs._integrations import BedrockIntegration
-from ddtrace.trace import Pin
 from ddtrace.settings.config import Config
+from ddtrace.trace import Pin
 
 from .services.bedrock import patched_bedrock_api_call
 from .services.kinesis import patched_kinesis_api_call

ddtrace/contrib/internal/dogpile_cache/patch.py

@@ -7,9 +7,9 @@
 
 from wrapt import wrap_function_wrapper as _w
 
-from ddtrace.internal.schema import schematize_service_name
 from ddtrace._trace.pin import _DD_PIN_NAME
 from ddtrace._trace.pin import _DD_PIN_PROXY_NAME
+from ddtrace.internal.schema import schematize_service_name
 from ddtrace.trace import Pin
 
 from .lock import _wrap_lock_ctor

ddtrace/contrib/internal/httplib/patch.py

@@ -20,9 +20,9 @@
 from ddtrace.internal.schema import schematize_url_operation
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 from ddtrace.internal.utils.formats import asbool
-from ddtrace.trace import Pin
 from ddtrace.propagation.http import HTTPPropagator
 from ddtrace.settings.asm import config as asm_config
+from ddtrace.trace import Pin
 
 
 span_name = "http.client.request"

ddtrace/contrib/internal/httpx/patch.py

@@ -22,8 +22,8 @@
 from ddtrace.internal.utils.formats import asbool
 from ddtrace.internal.utils.version import parse_version
 from ddtrace.internal.utils.wrappers import unwrap as _u
-from ddtrace.trace import Pin
 from ddtrace.propagation.http import HTTPPropagator
+from ddtrace.trace import Pin
 
 
 HTTPX_VERSION = parse_version(httpx.__version__)

ddtrace/contrib/internal/kafka/patch.py

@@ -24,8 +24,8 @@
 from ddtrace.internal.utils import set_argument_value
 from ddtrace.internal.utils.formats import asbool
 from ddtrace.internal.utils.version import parse_version
-from ddtrace.trace import Pin
 from ddtrace.propagation.http import HTTPPropagator as Propagator
+from ddtrace.trace import Pin
 
 
 _Producer = confluent_kafka.Producer

ddtrace/contrib/internal/kombu/patch.py

@@ -22,8 +22,8 @@
 from ddtrace.internal.utils import get_argument_value
 from ddtrace.internal.utils.formats import asbool
 from ddtrace.internal.utils.wrappers import unwrap
-from ddtrace.trace import Pin
 from ddtrace.propagation.http import HTTPPropagator
+from ddtrace.trace import Pin
 
 from .constants import DEFAULT_SERVICE
 from .utils import HEADER_POS

ddtrace/contrib/internal/pymemcache/patch.py

@@ -1,11 +1,11 @@
 import pymemcache
 import pymemcache.client.hash
 
-from ddtrace.ext import memcached as memcachedx
-from ddtrace.internal.schema import schematize_service_name
 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 .client import WrappedClient
 from .client import WrappedHashClient

ddtrace/contrib/internal/requests/patch.py

@@ -10,8 +10,8 @@
 from ddtrace.contrib.trace_utils import unwrap as _u
 from ddtrace.internal.schema import schematize_service_name
 from ddtrace.internal.utils.formats import asbool
-from ddtrace.trace import Pin
 from ddtrace.settings.asm import config as asm_config
+from ddtrace.trace import Pin
 
 from .connection import _wrap_send
 

ddtrace/contrib/internal/sqlite3/patch.py

@@ -15,8 +15,8 @@
 from ddtrace.internal.schema import schematize_database_operation
 from ddtrace.internal.schema import schematize_service_name
 from ddtrace.internal.utils.formats import asbool
-from ddtrace.trace import Pin
 from ddtrace.settings.asm import config as asm_config
+from ddtrace.trace import Pin
 
 
 # Original connect method

ddtrace/contrib/internal/urllib3/patch.py

@@ -22,9 +22,9 @@
 from ddtrace.internal.utils import get_argument_value
 from ddtrace.internal.utils.formats import asbool
 from ddtrace.internal.utils.wrappers import unwrap as _u
-from ddtrace.trace import Pin
 from ddtrace.propagation.http import HTTPPropagator
 from ddtrace.settings.asm import config as asm_config
+from ddtrace.trace import Pin
 
 
 # Ports which, if set, will not be used in hostnames/service names

tests/contrib/httpx/test_httpx.py

@@ -6,8 +6,8 @@
 from ddtrace.contrib.httpx.patch import HTTPX_VERSION
 from ddtrace.contrib.httpx.patch import patch
 from ddtrace.contrib.httpx.patch import unpatch
-from ddtrace.trace import Pin
 from ddtrace.settings.http import HttpConfig
+from ddtrace.trace import Pin
 from tests.utils import flaky
 from tests.utils import override_config
 from tests.utils import override_http_config

tests/contrib/httpx/test_httpx_pre_0_11.py

@@ -6,8 +6,8 @@
 from ddtrace.contrib.httpx.patch import HTTPX_VERSION
 from ddtrace.contrib.httpx.patch import patch
 from ddtrace.contrib.httpx.patch import unpatch
-from ddtrace.trace import Pin
 from ddtrace.settings.http import HttpConfig
+from ddtrace.trace import Pin
 from tests.utils import override_config
 from tests.utils import override_http_config
 

tests/contrib/kafka/test_kafka.py

@@ -16,13 +16,13 @@
 from ddtrace.contrib.kafka.patch import TracedConsumer
 from ddtrace.contrib.kafka.patch import patch
 from ddtrace.contrib.kafka.patch import unpatch
-from ddtrace.trace import TraceFilter
 import ddtrace.internal.datastreams  # noqa: F401 - used as part of mock patching
 from ddtrace.internal.datastreams.processor import PROPAGATION_KEY_BASE_64
 from ddtrace.internal.datastreams.processor import ConsumerPartitionKey
 from ddtrace.internal.datastreams.processor import DataStreamsCtx
 from ddtrace.internal.datastreams.processor import PartitionKey
 from ddtrace.internal.utils.retry import fibonacci_backoff_with_jitter
+from ddtrace.trace import TraceFilter
 from tests.contrib.config import KAFKA_CONFIG
 from tests.datastreams.test_public_api import MockedTracer
 from tests.utils import DummyTracer

tests/contrib/openai/conftest.py

@@ -10,8 +10,8 @@
 from ddtrace import Pin
 from ddtrace import patch
 from ddtrace.contrib.openai.patch import unpatch
-from ddtrace.trace import TraceFilter
 from ddtrace.llmobs import LLMObs
+from ddtrace.trace import TraceFilter
 from tests.utils import DummyTracer
 from tests.utils import DummyWriter
 from tests.utils import override_config

tests/contrib/urllib3/test_urllib3.py

@@ -11,8 +11,8 @@
 from ddtrace.contrib.urllib3 import unpatch
 from ddtrace.ext import http
 from ddtrace.internal.schema import DEFAULT_SPAN_SERVICE_NAME
-from ddtrace.trace import Pin
 from ddtrace.settings.asm import config as asm_config
+from ddtrace.trace import Pin
 from tests.contrib.config import HTTPBIN_CONFIG
 from tests.opentracer.utils import init_tracer
 from tests.utils import TracerTestCase

tests/tracer/runtime/test_tag_collectors.py

@@ -77,8 +77,8 @@ def test_tracer_tags_config():
 def test_tracer_tags_service_from_code():
     """Ensure we collect the expected tags for the TracerTagCollector"""
     import ddtrace
-    from ddtrace.trace import TraceFilter
     from ddtrace.internal.runtime import tag_collectors
+    from ddtrace.trace import TraceFilter
     from tests.conftest import DEFAULT_DDTRACE_SUBPROCESS_TEST_SERVICE_NAME
 
     class DropFilter(TraceFilter):

tests/tracer/test_instance_config.py

@@ -1,8 +1,8 @@
 from unittest import TestCase
 
 from ddtrace import config
-from ddtrace.trace import Pin
 from ddtrace.settings import IntegrationConfig
+from ddtrace.trace import Pin
 
 
 class InstanceConfigTestCase(TestCase):

tests/webclient.py

@@ -3,9 +3,9 @@
 import requests
 
 from ddtrace._trace.context import Context
-from ddtrace.trace import TraceFilter
 from ddtrace.internal.utils.retry import retry
 from ddtrace.propagation.http import HTTPPropagator
+from ddtrace.trace import TraceFilter
 
 
 class Client(object):