Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ddtrace/_monkey.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import importlib
import os
from pathlib import Path
from types import ModuleType
from typing import TYPE_CHECKING # noqa:F401
from typing import Set
from typing import Union

from wrapt.importer import when_imported

from ddtrace.internal.compat import Path
from ddtrace.internal.settings._config import config
from ddtrace.internal.telemetry.constants import TELEMETRY_NAMESPACE
from ddtrace.vendor.debtcollector import deprecate
Expand Down
2 changes: 1 addition & 1 deletion ddtrace/debugging/_exception/replay.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from collections import deque
from dataclasses import dataclass
from pathlib import Path
from threading import current_thread
from types import FrameType
from types import TracebackType
Expand All @@ -14,7 +15,6 @@
from ddtrace.debugging._uploader import SignalUploader
from ddtrace.debugging._uploader import UploaderProduct
from ddtrace.internal import core
from ddtrace.internal.compat import Path
from ddtrace.internal.logger import get_logger
from ddtrace.internal.packages import is_user_code
from ddtrace.internal.rate_limiter import BudgetRateLimiterWithJitter as RateLimiter
Expand Down
2 changes: 1 addition & 1 deletion ddtrace/debugging/_origin/span.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from dataclasses import dataclass
from itertools import count
from pathlib import Path
import sys
from threading import current_thread
from time import monotonic_ns
Expand All @@ -20,7 +21,6 @@
from ddtrace.debugging._uploader import SignalUploader
from ddtrace.debugging._uploader import UploaderProduct
from ddtrace.ext import EXIT_SPAN_TYPES
from ddtrace.internal.compat import Path
from ddtrace.internal.forksafe import Lock
from ddtrace.internal.logger import get_logger
from ddtrace.internal.packages import is_user_code
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from functools import lru_cache as cached
from pathlib import Path
import sys
import types
from types import ModuleType

from ddtrace.errortracking._handled_exceptions.bytecode_injector import _inject_handled_exception_reporting
from ddtrace.errortracking._handled_exceptions.callbacks import _default_bytecode_exc_callback
from ddtrace.internal.bytecode_injection.core import CallbackType
from ddtrace.internal.compat import Path
from ddtrace.internal.module import BaseModuleWatchdog
from ddtrace.internal.packages import is_stdlib
from ddtrace.internal.packages import is_third_party
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from functools import lru_cache as cached
from pathlib import Path
import sys
from types import CodeType
from types import ModuleType
from typing import Callable

from ddtrace import tracer
from ddtrace.errortracking._handled_exceptions.callbacks import _default_errortracking_exc_callback
from ddtrace.internal.compat import Path
from ddtrace.internal.module import BaseModuleWatchdog
from ddtrace.internal.packages import filename_to_package # noqa: F401
from ddtrace.internal.packages import is_stdlib # noqa: F401
Expand Down
2 changes: 1 addition & 1 deletion ddtrace/internal/ci_visibility/api/_module.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from pathlib import Path
from typing import Dict
from typing import Optional

Expand All @@ -16,7 +17,6 @@
from ddtrace.internal.ci_visibility.telemetry.constants import EVENT_TYPES
from ddtrace.internal.ci_visibility.telemetry.events import record_event_created
from ddtrace.internal.ci_visibility.telemetry.events import record_event_finished
from ddtrace.internal.compat import Path
from ddtrace.internal.logger import get_logger


Expand Down
17 changes: 0 additions & 17 deletions ddtrace/internal/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,23 +89,6 @@ def _register(self, cls, method=None):
singledispatchmethod.register = _register # type: ignore[method-assign]


if PYTHON_VERSION_INFO >= (3, 9):
from pathlib import Path
else:
from pathlib import Path

# Taken from Python 3.9. This is not implemented in older versions of Python
def is_relative_to(self, other):
"""Return True if the path is relative to another path or False."""
try:
self.relative_to(other)
return True
except ValueError:
return False

Path.is_relative_to = is_relative_to # type: ignore[assignment]


def get_mp_context():
import multiprocessing

Expand Down
2 changes: 1 addition & 1 deletion ddtrace/internal/coverage/code.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
from copy import deepcopy
from inspect import getmodule
import os
from pathlib import Path
import sys
from types import CodeType
from types import ModuleType
import typing as t

from ddtrace.internal.compat import Path
from ddtrace.internal.coverage.instrumentation import instrument_all_lines
from ddtrace.internal.coverage.report import gen_json_report
from ddtrace.internal.coverage.report import print_coverage_report
Expand Down
2 changes: 1 addition & 1 deletion ddtrace/internal/ipc.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from contextlib import contextmanager
import os
from pathlib import Path
import secrets
import tempfile
import typing

from ddtrace.internal._unpatched import unpatched_open
from ddtrace.internal.compat import Path
from ddtrace.internal.logger import get_logger


Expand Down
2 changes: 1 addition & 1 deletion ddtrace/internal/packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
from functools import singledispatch
import inspect
import logging
from pathlib import Path
import sys
import sysconfig
from types import ModuleType
import typing as t

from ddtrace.internal.compat import Path
from ddtrace.internal.module import origin
from ddtrace.internal.settings.third_party import config as tp_config
from ddtrace.internal.utils.cache import callonce
Expand Down
2 changes: 1 addition & 1 deletion ddtrace/internal/settings/dynamic_instrumentation.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from pathlib import Path
import re
import typing as t

from ddtrace import config as ddconfig
from ddtrace.internal import gitmetadata
from ddtrace.internal.compat import Path
from ddtrace.internal.constants import DEFAULT_SERVICE_NAME
from ddtrace.internal.settings._agent import config as agent_config
from ddtrace.internal.settings._core import DDConfig
Expand Down
2 changes: 1 addition & 1 deletion tests/debugging/exploration/utils.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import os
from pathlib import Path
from types import ModuleType

from _config import ExplorationConfig

from ddtrace.internal.compat import Path
from ddtrace.internal.module import origin


Expand Down
2 changes: 1 addition & 1 deletion tests/debugging/test_debugger.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from decimal import Decimal
import json
import os.path
from pathlib import Path
import sys
import tempfile
from threading import Thread
Expand All @@ -26,7 +27,6 @@
from ddtrace.debugging._signal.snapshot import _EMPTY_CAPTURED_CONTEXT
from ddtrace.debugging._signal.tracing import SPAN_NAME
from ddtrace.debugging._signal.utils import redacted_value
from ddtrace.internal.compat import Path
from ddtrace.internal.remoteconfig.worker import remoteconfig_poller
from ddtrace.internal.service import ServiceStatus
from ddtrace.internal.utils.formats import format_trace_id
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import atexit
import dis
from pathlib import Path
import sys
import types
from types import ModuleType
Expand All @@ -16,7 +17,6 @@
from ddtrace.internal.bytecode_injection.core import CallbackType
from ddtrace.internal.bytecode_injection.core import InjectionContext
from ddtrace.internal.bytecode_injection.core import inject_invocation
from ddtrace.internal.compat import Path
from ddtrace.internal.module import BaseModuleWatchdog


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
from pathlib import Path
from types import ModuleType

from ddtrace.internal.compat import Path
from ddtrace.internal.module import origin


Expand Down
1 change: 0 additions & 1 deletion tests/internal/test_auto.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def test_auto():
assert uds.socket.socket is not None


@pytest.mark.skipif(sys.version_info < (3, 8), reason="Test requires Python 3.8+")
def test_pytest_with_gevent_and_ddtrace_auto():
"""
Test that pytest works when a module imports ddtrace.auto and gevent is installed.
Expand Down
2 changes: 1 addition & 1 deletion tests/internal/test_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def test_third_party_packages_symlinks(tmp_path):

assert not is_user_code(code_file)
# Symlinks with `.runfiles` in the path should not be considered user code.
from ddtrace.internal.compat import Path
from pathlib import Path

p = Path(symlink_file)
p2 = Path(symlink_file).resolve()
Expand Down
Loading