chore: migrate to ruff

ddtrace/appsec/_iast/_taint_tracking/aspects.py

@@ -4,9 +4,9 @@
 import codecs
 import traceback
 from types import BuiltinFunctionType
+from typing import TYPE_CHECKING
 from typing import Any
 from typing import Callable
-from typing import TYPE_CHECKING
 
 from ddtrace.internal.compat import iteritems
 
@@ -281,7 +281,7 @@ def format_aspect(
         new_template = as_formatted_evidence(
             candidate_text, candidate_text_ranges, tag_mapping_function=TagMappingMode.Mapper
         )
-        fun = (
+        fun = (  # noqa: E731
             lambda arg: as_formatted_evidence(arg, tag_mapping_function=TagMappingMode.Mapper)
             if isinstance(arg, TEXT_TYPES)
             else arg

ddtrace/appsec/_iast/processor.py

@@ -10,8 +10,8 @@
 from ddtrace.internal.logger import get_logger
 from ddtrace.internal.processor import SpanProcessor
 
-from . import oce
 from .._trace_utils import _asm_manual_keep
+from . import oce
 from ._metrics import _set_metric_iast_request_tainted
 from ._utils import _iast_report_to_str
 from ._utils import _is_iast_enabled

ddtrace/appsec/_iast/reporter.py

@@ -2,9 +2,9 @@
 import json
 import operator
 import os
+from typing import TYPE_CHECKING
 from typing import List
 from typing import Set
-from typing import TYPE_CHECKING
 import zlib
 
 import attr

ddtrace/appsec/_iast/taint_sinks/command_injection.py

@@ -2,9 +2,9 @@
 import re
 import shlex
 import subprocess  # nosec
+from typing import TYPE_CHECKING
 from typing import List
 from typing import Set
-from typing import TYPE_CHECKING
 from typing import Union
 
 import six

ddtrace/appsec/_iast/taint_sinks/ssrf.py

@@ -12,8 +12,8 @@
 from .._utils import _scrub
 from .._utils import _scrub_get_tokens_positions
 from ..constants import EVIDENCE_SSRF
-from ..constants import VULNERABILITY_TOKEN_TYPE
 from ..constants import VULN_SSRF
+from ..constants import VULNERABILITY_TOKEN_TYPE
 from ..reporter import IastSpanReporter
 from ..reporter import Vulnerability
 from ._base import VulnerabilityBase

ddtrace/context.py

@@ -1,16 +1,16 @@
 import base64
 import re
 import threading
+from typing import TYPE_CHECKING
 from typing import Any
 from typing import Optional
-from typing import TYPE_CHECKING
 from typing import Text
 
 from .constants import ORIGIN_KEY
 from .constants import SAMPLING_PRIORITY_KEY
 from .constants import USER_ID_KEY
-from .internal.compat import NumericType
 from .internal.compat import PY2
+from .internal.compat import NumericType
 from .internal.constants import W3C_TRACEPARENT_KEY
 from .internal.constants import W3C_TRACESTATE_KEY
 from .internal.logger import get_logger

ddtrace/contrib/_trace_utils_llm.py

@@ -1,11 +1,11 @@
 import abc
 import os
 import time
+from typing import TYPE_CHECKING
 from typing import Any
 from typing import Dict
 from typing import List
 from typing import Optional
-from typing import TYPE_CHECKING
 
 from ddtrace.constants import SPAN_MEASURED_KEY
 from ddtrace.contrib.trace_utils import int_service

ddtrace/contrib/aiohttp/middlewares.py

@@ -2,7 +2,6 @@
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 
-from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import SPAN_KIND
 from ...constants import SPAN_MEASURED_KEY
@@ -11,6 +10,7 @@
 from ...ext import http
 from ...internal.compat import stringify
 from ...internal.schema import schematize_url_operation
+from .. import trace_utils
 from ..asyncio import context_provider
 
 

ddtrace/contrib/aioredis/patch.py

@@ -10,7 +10,6 @@
 from ddtrace.internal.utils.wrappers import unwrap as _u
 from ddtrace.pin import Pin
 
-from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import SPAN_KIND
 from ...constants import SPAN_MEASURED_KEY
@@ -23,6 +22,7 @@
 from ...internal.schema import schematize_service_name
 from ...internal.utils.formats import CMD_MAX_LEN
 from ...internal.utils.formats import stringify_cache_args
+from .. import trace_utils
 from ..redis.asyncio_patch import _run_redis_command_async
 from ..trace_utils_redis import ROW_RETURNING_COMMANDS
 from ..trace_utils_redis import _trace_redis_cmd

ddtrace/contrib/algoliasearch/patch.py

@@ -9,9 +9,9 @@
 from ddtrace.internal.utils.wrappers import unwrap as _u
 from ddtrace.pin import Pin
 
-from .. import trace_utils
 from ...constants import SPAN_KIND
 from ...constants import SPAN_MEASURED_KEY
+from .. import trace_utils
 
 
 DD_PATCH_ATTR = "_datadog_patch"

ddtrace/contrib/asgi/middleware.py

@@ -14,11 +14,11 @@
 from ddtrace.internal.schema import schematize_url_operation
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 
-from .. import trace_utils
 from ...appsec._constants import WAF_CONTEXT_NAMES
 from ...internal import core
 from ...internal.compat import reraise
 from ...internal.logger import get_logger
+from .. import trace_utils
 from .utils import guarantee_single_callable
 
 

ddtrace/contrib/bottle/trace.py

@@ -8,14 +8,14 @@
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 
-from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import SPAN_KIND
 from ...constants import SPAN_MEASURED_KEY
 from ...ext import SpanKind
 from ...ext import SpanTypes
 from ...internal.schema import schematize_url_operation
 from ...internal.utils.formats import asbool
+from .. import trace_utils
 
 
 class TracePlugin(object):

ddtrace/contrib/celery/app.py

@@ -5,12 +5,12 @@
 from ddtrace import config
 from ddtrace.pin import _DD_PIN_NAME
 
-from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import SPAN_KIND
 from ...constants import SPAN_MEASURED_KEY
 from ...ext import SpanKind
 from ...ext import SpanTypes
+from .. import trace_utils
 from .signals import trace_after_publish
 from .signals import trace_before_publish
 from .signals import trace_failure

ddtrace/contrib/celery/signals.py

@@ -5,8 +5,6 @@
 from ddtrace import config
 from ddtrace.internal.constants import COMPONENT
 
-from . import constants as c
-from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import SPAN_KIND
 from ...constants import SPAN_MEASURED_KEY
@@ -15,6 +13,8 @@
 from ...ext import net
 from ...internal.logger import get_logger
 from ...propagation.http import HTTPPropagator
+from .. import trace_utils
+from . import constants as c
 from .utils import attach_span
 from .utils import detach_span
 from .utils import retrieve_span

ddtrace/contrib/cherrypy/middleware.py

@@ -14,14 +14,14 @@
 from ddtrace.constants import SPAN_KIND
 from ddtrace.internal.constants import COMPONENT
 
-from .. import trace_utils
 from ...ext import SpanKind
 from ...ext import SpanTypes
 from ...internal import compat
 from ...internal.schema import SpanDirection
 from ...internal.schema import schematize_service_name
 from ...internal.schema import schematize_url_operation
 from ...internal.utils.formats import asbool
+from .. import trace_utils
 
 
 log = logging.getLogger(__name__)

ddtrace/contrib/django/_asgi.py

@@ -3,8 +3,8 @@
 """
 from ddtrace.contrib.asgi import span_from_scope
 
-from .. import trace_utils
 from ...internal.utils import get_argument_value
+from .. import trace_utils
 from .utils import REQUEST_DEFAULT_RESOURCE
 from .utils import _after_request_tags
 from .utils import _before_request_tags

ddtrace/contrib/django/patch.py

@@ -40,9 +40,9 @@
 from ddtrace.internal.utils.formats import asbool
 from ddtrace.settings.integration import IntegrationConfig
 
-from .. import trace_utils
 from ...appsec._utils import _UserInfoRetriever
 from ...internal.utils import get_argument_value
+from .. import trace_utils
 from ..trace_utils import _get_request_header_user_agent
 from ..trace_utils import _set_url_tag
 

ddtrace/contrib/django/utils.py

@@ -22,10 +22,10 @@
 from ddtrace.internal.utils.http import parse_form_params
 from ddtrace.propagation._utils import from_wsgi_header
 
-from .. import trace_utils
 from ...internal import core
 from ...internal.logger import get_logger
 from ...internal.utils.formats import stringify_cache_args
+from .. import trace_utils
 from .compat import get_resolver
 from .compat import user_is_authenticated
 

ddtrace/contrib/dogpile_cache/patch.py

@@ -8,9 +8,9 @@
 from wrapt import wrap_function_wrapper as _w
 
 from ddtrace.internal.schema import schematize_service_name
-from ddtrace.pin import Pin
 from ddtrace.pin import _DD_PIN_NAME
 from ddtrace.pin import _DD_PIN_PROXY_NAME
+from ddtrace.pin import Pin
 
 from .lock import _wrap_lock_ctor
 from .region import _wrap_get_create

ddtrace/contrib/falcon/middleware.py

@@ -6,14 +6,14 @@
 from ddtrace.ext import http as httpx
 from ddtrace.internal.constants import COMPONENT
 
-from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import SPAN_KIND
 from ...constants import SPAN_MEASURED_KEY
 from ...internal.compat import iteritems
 from ...internal.schema import SpanDirection
 from ...internal.schema import schematize_service_name
 from ...internal.schema import schematize_url_operation
+from .. import trace_utils
 
 
 class TraceMiddleware(object):

ddtrace/contrib/flask_login/patch.py

@@ -8,10 +8,10 @@
 from ddtrace.appsec.trace_utils import track_user_login_success_event
 from ddtrace.internal.logger import get_logger
 
-from .. import trace_utils
 from ...appsec._utils import _UserInfoRetriever
 from ...ext import SpanTypes
 from ...internal.utils import get_argument_value
+from .. import trace_utils
 from ..flask.wrappers import get_current_app
 
 

ddtrace/contrib/graphql/patch.py

@@ -40,8 +40,8 @@
 from ddtrace.internal.wrapping import wrap
 from ddtrace.pin import Pin
 
-from .. import trace_utils
 from ...ext import SpanTypes
+from .. import trace_utils
 
 
 _graphql_version_str = graphql.__version__

ddtrace/contrib/grpc/aio_client_interceptor.py

@@ -15,7 +15,6 @@
 from ddtrace.internal.schema import schematize_url_operation
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 
-from .. import trace_utils
 from ... import Pin
 from ... import Span
 from ... import config
@@ -28,6 +27,7 @@
 from ...ext import SpanTypes
 from ...internal.compat import to_unicode
 from ...propagation.http import HTTPPropagator
+from .. import trace_utils
 from ..grpc import constants
 from ..grpc import utils
 

ddtrace/contrib/grpc/aio_server_interceptor.py

@@ -20,7 +20,6 @@
 from ddtrace.internal.schema import schematize_url_operation
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 
-from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import ERROR_MSG
 from ...constants import ERROR_TYPE
@@ -29,6 +28,7 @@
 from ...ext import SpanKind
 from ...ext import SpanTypes
 from ...internal.compat import to_unicode
+from .. import trace_utils
 from ..grpc import constants
 from ..grpc.utils import set_grpc_method_meta
 

ddtrace/contrib/grpc/client_interceptor.py

@@ -11,9 +11,6 @@
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 
-from . import constants
-from . import utils
-from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import ERROR_MSG
 from ...constants import ERROR_STACK
@@ -23,6 +20,9 @@
 from ...internal.logger import get_logger
 from ...internal.schema import schematize_url_operation
 from ...propagation.http import HTTPPropagator
+from .. import trace_utils
+from . import constants
+from . import utils
 
 
 log = get_logger(__name__)

ddtrace/contrib/grpc/patch.py

@@ -5,9 +5,9 @@
 from ddtrace import config
 from ddtrace.internal.schema import schematize_service_name
 
+from ..trace_utils import unwrap as _u
 from . import constants
 from . import utils
-from ..trace_utils import unwrap as _u
 from .client_interceptor import create_client_interceptor
 from .client_interceptor import intercept_channel
 from .server_interceptor import create_server_interceptor

ddtrace/contrib/grpc/server_interceptor.py

@@ -7,15 +7,15 @@
 from ddtrace.internal.schema import schematize_url_operation
 from ddtrace.internal.schema.span_attribute_schema import SpanDirection
 
-from . import constants
-from .. import trace_utils
 from ...constants import ANALYTICS_SAMPLE_RATE_KEY
 from ...constants import ERROR_MSG
 from ...constants import ERROR_TYPE
 from ...constants import SPAN_KIND
 from ...constants import SPAN_MEASURED_KEY
 from ...ext import SpanKind
 from ...ext import SpanTypes
+from .. import trace_utils
+from . import constants
 from .utils import set_grpc_method_meta
 
 

ddtrace/contrib/grpc/utils.py

@@ -2,8 +2,8 @@
 
 from ddtrace.internal.compat import parse
 
-from . import constants
 from ...ext import net
+from . import constants
 
 
 log = logging.getLogger(__name__)