fix: Do not disable contextvars if gevent successfully patched them (getsentry#695)

untitaker · web-flow · commit ad28065a5c6a · 2020-05-18T18:51:16.000+02:00
* fix: Do not disable contextvars if gevent successfully patched them

* fix: Fix tests
diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py
@@ -722,12 +722,15 @@ def strip_string(value, max_length=None):
     return value
 
 
-def _is_threading_local_monkey_patched():
+def _is_contextvars_broken():
     # type: () -> bool
     try:
         from gevent.monkey import is_object_patched  # type: ignore
 
         if is_object_patched("threading", "local"):
+            if is_object_patched("contextvars", "ContextVar"):
+                return False
+
             return True
     except ImportError:
         pass
@@ -752,7 +755,7 @@ def _get_contextvars():
 
     https://github.com/gevent/gevent/issues/1407
     """
-    if not _is_threading_local_monkey_patched():
+    if not _is_contextvars_broken():
         # aiocontextvars is a PyPI package that ensures that the contextvars
         # backport (also a PyPI package) works with asyncio under Python 3.6
         #
diff --git a/tests/utils/test_contextvars.py b/tests/utils/test_contextvars.py
@@ -3,17 +3,6 @@
 import time
 
 
-from sentry_sdk.utils import _is_threading_local_monkey_patched
-
-
-@pytest.mark.forked
-def test_thread_local_is_patched(maybe_monkeypatched_threading):
-    if maybe_monkeypatched_threading is None:
-        assert not _is_threading_local_monkey_patched()
-    else:
-        assert _is_threading_local_monkey_patched()
-
-
 @pytest.mark.forked
 def test_leaks(maybe_monkeypatched_threading):
     import threading
