diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py index 3c86564ef8..4d07974809 100644 --- a/sentry_sdk/utils.py +++ b/sentry_sdk/utils.py @@ -31,8 +31,6 @@ from typing import TYPE_CHECKING if TYPE_CHECKING: - from collections.abc import Awaitable - from types import FrameType, TracebackType from typing import ( Any, @@ -1731,12 +1729,6 @@ def _no_op(*_a, **_k): pass -async def _no_op_async(*_a, **_k): - # type: (*Any, **Any) -> None - """No-op function for ensure_integration_enabled_async.""" - pass - - if TYPE_CHECKING: @overload @@ -1803,59 +1795,6 @@ def runner(*args: "P.args", **kwargs: "P.kwargs"): return patcher -if TYPE_CHECKING: - - # mypy has some trouble with the overloads, hence the ignore[no-overload-impl] - @overload # type: ignore[no-overload-impl] - def ensure_integration_enabled_async( - integration, # type: type[sentry_sdk.integrations.Integration] - original_function, # type: Callable[P, Awaitable[R]] - ): - # type: (...) -> Callable[[Callable[P, Awaitable[R]]], Callable[P, Awaitable[R]]] - ... - - @overload - def ensure_integration_enabled_async( - integration, # type: type[sentry_sdk.integrations.Integration] - ): - # type: (...) -> Callable[[Callable[P, Awaitable[None]]], Callable[P, Awaitable[None]]] - ... - - -# The ignore[no-redef] also needed because mypy is struggling with these overloads. -def ensure_integration_enabled_async( # type: ignore[no-redef] - integration, # type: type[sentry_sdk.integrations.Integration] - original_function=_no_op_async, # type: Union[Callable[P, Awaitable[R]], Callable[P, Awaitable[None]]] -): - # type: (...) -> Callable[[Callable[P, Awaitable[R]]], Callable[P, Awaitable[R]]] - """ - Version of `ensure_integration_enabled` for decorating async functions. - - Please refer to the `ensure_integration_enabled` documentation for more information. - """ - - if TYPE_CHECKING: - # Type hint to ensure the default function has the right typing. The overloads - # ensure the default _no_op function is only used when R is None. - original_function = cast(Callable[P, Awaitable[R]], original_function) - - def patcher(sentry_patched_function): - # type: (Callable[P, Awaitable[R]]) -> Callable[P, Awaitable[R]] - async def runner(*args: "P.args", **kwargs: "P.kwargs"): - # type: (...) -> R - if sentry_sdk.get_client().get_integration(integration) is None: - return await original_function(*args, **kwargs) - - return await sentry_patched_function(*args, **kwargs) - - if original_function is _no_op_async: - return wraps(sentry_patched_function)(runner) - - return wraps(original_function)(runner) - - return patcher - - if PY37: def nanosecond_time(): diff --git a/tests/test_utils.py b/tests/test_utils.py index eaf382c773..87e2659a12 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -31,14 +31,12 @@ _get_installed_modules, _generate_installed_modules, ensure_integration_enabled, - ensure_integration_enabled_async, ) class TestIntegration(Integration): """ - Test integration for testing ensure_integration_enabled and - ensure_integration_enabled_async decorators. + Test integration for testing ensure_integration_enabled decorator. """ identifier = "test" @@ -783,90 +781,6 @@ def function_to_patch(): assert patched_function.__name__ == "function_to_patch" -@pytest.mark.asyncio -async def test_ensure_integration_enabled_async_integration_enabled(sentry_init): - # Setup variables and functions for the test - async def original_function(): - return "original" - - async def function_to_patch(): - return "patched" - - sentry_init(integrations=[TestIntegration()]) - - # Test the decorator by applying to function_to_patch - patched_function = ensure_integration_enabled_async( - TestIntegration, original_function - )(function_to_patch) - - assert await patched_function() == "patched" - assert patched_function.__name__ == "original_function" - - -@pytest.mark.asyncio -async def test_ensure_integration_enabled_async_integration_disabled(sentry_init): - # Setup variables and functions for the test - async def original_function(): - return "original" - - async def function_to_patch(): - return "patched" - - sentry_init(integrations=[]) # TestIntegration is disabled - - # Test the decorator by applying to function_to_patch - patched_function = ensure_integration_enabled_async( - TestIntegration, original_function - )(function_to_patch) - - assert await patched_function() == "original" - assert patched_function.__name__ == "original_function" - - -@pytest.mark.asyncio -async def test_ensure_integration_enabled_async_no_original_function_enabled( - sentry_init, -): - shared_variable = "original" - - async def function_to_patch(): - nonlocal shared_variable - shared_variable = "patched" - - sentry_init(integrations=[TestIntegration]) - - # Test the decorator by applying to function_to_patch - patched_function = ensure_integration_enabled_async(TestIntegration)( - function_to_patch - ) - await patched_function() - - assert shared_variable == "patched" - assert patched_function.__name__ == "function_to_patch" - - -@pytest.mark.asyncio -async def test_ensure_integration_enabled_async_no_original_function_disabled( - sentry_init, -): - shared_variable = "original" - - async def function_to_patch(): - nonlocal shared_variable - shared_variable = "patched" - - sentry_init(integrations=[]) - - # Test the decorator by applying to function_to_patch - patched_function = ensure_integration_enabled_async(TestIntegration)( - function_to_patch - ) - await patched_function() - - assert shared_variable == "original" - assert patched_function.__name__ == "function_to_patch" - - @pytest.mark.parametrize( "delta,expected_milliseconds", [