Merge branch 'master' into sentry-sdk-2.0

Author: sentrivana

.craft.yml

@@ -8,7 +8,9 @@ targets:
       pypi:sentry-sdk:
   - name: github
   - name: aws-lambda-layer
-    includeNames: /^sentry-python-serverless-\d+(\.\d+)*\.zip$/
+    # This regex that matches the version is taken from craft:
+    # https://github.com/getsentry/craft/blob/8d77c38ddbe4be59f98f61b6e42952ca087d3acd/src/utils/version.ts#L11
+    includeNames: /^sentry-python-serverless-\bv?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(?:-?([\da-z-]+(?:\.[\da-z-]+)*))?(?:\+([\da-z-]+(?:\.[\da-z-]+)*))?\b.zip$/
     layerName: SentryPythonServerlessSDK
     compatibleRuntimes:
       - name: python

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.40.6
+
+### Various fixes & improvements
+
+- Fix compatibility with `greenlet`/`gevent` (#2756) by @sentrivana
+- Fix query source relative filepath (#2717) by @gggritso
+- Support `clickhouse-driver==0.2.7` (#2752) by @sentrivana
+- Bump `checkouts/data-schemas` from `6121fd3` to `eb941c2` (#2747) by @dependabot
+
 ## 1.40.5
 
 ### Various fixes & improvements

docs/conf.py

@@ -28,7 +28,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "1.40.5"
+release = "1.40.6"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

sentry_sdk/client.py

@@ -5,7 +5,7 @@
 from datetime import datetime, timezone
 from importlib import import_module
 
-from sentry_sdk._compat import check_uwsgi_thread_support
+from sentry_sdk._compat import PY37, check_uwsgi_thread_support
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     current_stacktrace,
@@ -15,6 +15,7 @@
     get_type_name,
     get_default_release,
     handle_in_app,
+    is_gevent,
     logger,
 )
 from sentry_sdk.serializer import serialize
@@ -315,14 +316,22 @@ def _capture_envelope(envelope):
             self.metrics_aggregator = None  # type: Optional[MetricsAggregator]
             experiments = self.options.get("_experiments", {})
             if experiments.get("enable_metrics", True):
-                from sentry_sdk.metrics import MetricsAggregator
-
-                self.metrics_aggregator = MetricsAggregator(
-                    capture_func=_capture_envelope,
-                    enable_code_locations=bool(
-                        experiments.get("metric_code_locations", True)
-                    ),
-                )
+                # Context vars are not working correctly on Python <=3.6
+                # with gevent.
+                metrics_supported = not is_gevent() or PY37
+                if metrics_supported:
+                    from sentry_sdk.metrics import MetricsAggregator
+
+                    self.metrics_aggregator = MetricsAggregator(
+                        capture_func=_capture_envelope,
+                        enable_code_locations=bool(
+                            experiments.get("metric_code_locations", True)
+                        ),
+                    )
+                else:
+                    logger.info(
+                        "Metrics not supported on Python 3.6 and lower with gevent."
+                    )
 
             max_request_body_size = ("always", "never", "small", "medium")
             if self.options["max_request_body_size"] not in max_request_body_size:

sentry_sdk/consts.py

@@ -326,4 +326,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.40.5"
+VERSION = "1.40.6"

sentry_sdk/metrics.py

@@ -19,7 +19,6 @@
     to_timestamp,
     serialize_frame,
     json_dumps,
-    is_gevent,
 )
 from sentry_sdk.envelope import Envelope, Item
 from sentry_sdk.tracing import (
@@ -54,18 +53,7 @@
     from sentry_sdk._types import MetricValue
 
 
-try:
-    from gevent.monkey import get_original  # type: ignore
-    from gevent.threadpool import ThreadPool  # type: ignore
-except ImportError:
-    import importlib
-
-    def get_original(module, name):
-        # type: (str, str) -> Any
-        return getattr(importlib.import_module(module), name)
-
-
-_in_metrics = ContextVar("in_metrics")
+_in_metrics = ContextVar("in_metrics", default=False)
 _sanitize_key = partial(re.compile(r"[^a-zA-Z0-9_/.-]+").sub, "_")
 _sanitize_value = partial(re.compile(r"[^\w\d_:/@\.{}\[\]$-]+", re.UNICODE).sub, "_")
 _set = set  # set is shadowed below
@@ -96,7 +84,7 @@ def get_code_location(stacklevel):
 def recursion_protection():
     # type: () -> Generator[bool, None, None]
     """Enters recursion protection and returns the old flag."""
-    old_in_metrics = _in_metrics.get(False)
+    old_in_metrics = _in_metrics.get()
     _in_metrics.set(True)
     try:
         yield old_in_metrics
@@ -429,9 +417,7 @@ def __init__(
         self._running = True
         self._lock = threading.Lock()
 
-        event_cls = get_original("threading", "Event")
-        self._flush_event = event_cls()  # type: threading.Event
-
+        self._flush_event = threading.Event()  # type: threading.Event
         self._force_flush = False
 
         # The aggregator shifts its flushing by up to an entire rollup window to
@@ -442,7 +428,7 @@ def __init__(
         # jittering.
         self._flush_shift = random.random() * self.ROLLUP_IN_SECONDS
 
-        self._flusher = None  # type: Optional[Union[threading.Thread, ThreadPool]]
+        self._flusher = None  # type: Optional[threading.Thread]
         self._flusher_pid = None  # type: Optional[int]
 
     def _ensure_thread(self):
@@ -465,16 +451,11 @@ def _ensure_thread(self):
 
             self._flusher_pid = pid
 
-            if not is_gevent():
-                self._flusher = threading.Thread(target=self._flush_loop)
-                self._flusher.daemon = True
-                start_flusher = self._flusher.start
-            else:
-                self._flusher = ThreadPool(1)
-                start_flusher = partial(self._flusher.spawn, func=self._flush_loop)
+            self._flusher = threading.Thread(target=self._flush_loop)
+            self._flusher.daemon = True
 
             try:
-                start_flusher()
+                self._flusher.start()
             except RuntimeError:
                 # Unfortunately at this point the interpreter is in a state that no
                 # longer allows us to spawn a thread and we have to bail.

setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.40.5",
+    version="1.40.6",
     author="Sentry Team and Contributors",
     author_email="[email protected]",
     url="https://github.com/getsentry/sentry-python",

tests/test_metrics.py

@@ -9,6 +9,17 @@
 from sentry_sdk.tracing import TRANSACTION_SOURCE_ROUTE
 from sentry_sdk.envelope import parse_json
 
+try:
+    import gevent
+except ImportError:
+    gevent = None
+
+
+minimum_python_37_with_gevent = pytest.mark.skipif(
+    gevent and sys.version_info < (3, 7),
+    reason="Require Python 3.7 or higher with gevent",
+)
+
 
 def parse_metrics(bytes):
     rv = []
@@ -41,6 +52,7 @@ def parse_metrics(bytes):
     return rv
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_incr(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     sentry_init(
@@ -93,6 +105,7 @@ def test_incr(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_timing(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     sentry_init(
@@ -153,6 +166,7 @@ def test_timing(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     )
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_timing_decorator(
     sentry_init, capture_envelopes, maybe_monkeypatched_threading
@@ -248,6 +262,7 @@ def amazing_nano():
     assert line.strip() == "assert amazing() == 42"
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_timing_basic(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     sentry_init(
@@ -302,6 +317,7 @@ def test_timing_basic(sentry_init, capture_envelopes, maybe_monkeypatched_thread
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_distribution(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     sentry_init(
@@ -364,6 +380,7 @@ def test_distribution(sentry_init, capture_envelopes, maybe_monkeypatched_thread
     )
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_set(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     sentry_init(
@@ -417,6 +434,7 @@ def test_set(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_gauge(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     sentry_init(
@@ -450,6 +468,7 @@ def test_gauge(sentry_init, capture_envelopes, maybe_monkeypatched_threading):
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_multiple(sentry_init, capture_envelopes):
     sentry_init(
@@ -504,6 +523,7 @@ def test_multiple(sentry_init, capture_envelopes):
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_transaction_name(
     sentry_init, capture_envelopes, maybe_monkeypatched_threading
@@ -544,6 +564,7 @@ def test_transaction_name(
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 @pytest.mark.parametrize("sample_rate", [1.0, None])
 def test_metric_summaries(
@@ -654,6 +675,7 @@ def test_metric_summaries(
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_metrics_summary_disabled(
     sentry_init, capture_envelopes, maybe_monkeypatched_threading
@@ -698,6 +720,7 @@ def test_metrics_summary_disabled(
     assert "_metrics_summary" not in t["spans"][0]
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 @pytest.mark.skip(reason="Temporarily disable to release SDK 2.0a1.")
 def test_metrics_summary_filtered(
@@ -768,6 +791,7 @@ def should_summarize_metric(key, tags):
     } in t["d:foo@second"]
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_tag_normalization(
     sentry_init, capture_envelopes, maybe_monkeypatched_threading
@@ -811,6 +835,7 @@ def test_tag_normalization(
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_before_emit_metric(
     sentry_init, capture_envelopes, maybe_monkeypatched_threading
@@ -854,6 +879,7 @@ def before_emit(key, tags):
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_aggregator_flush(
     sentry_init, capture_envelopes, maybe_monkeypatched_threading
@@ -874,6 +900,7 @@ def test_aggregator_flush(
     assert Hub.current.client.metrics_aggregator.buckets == {}
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_tag_serialization(
     sentry_init, capture_envelopes, maybe_monkeypatched_threading
@@ -914,6 +941,7 @@ def test_tag_serialization(
     }
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_flush_recursion_protection(
     sentry_init, capture_envelopes, monkeypatch, maybe_monkeypatched_threading
@@ -946,11 +974,12 @@ def bad_capture_envelope(*args, **kwargs):
     assert m[0][1] == "counter@none"
 
 
+@minimum_python_37_with_gevent
 @pytest.mark.forked
 def test_flush_recursion_protection_background_flush(
     sentry_init, capture_envelopes, monkeypatch, maybe_monkeypatched_threading
 ):
-    monkeypatch.setattr(metrics.MetricsAggregator, "FLUSHER_SLEEP_TIME", 0.1)
+    monkeypatch.setattr(metrics.MetricsAggregator, "FLUSHER_SLEEP_TIME", 0.01)
     sentry_init(
         release="fun-release",
         environment="not-fun-env",
@@ -977,3 +1006,29 @@ def bad_capture_envelope(*args, **kwargs):
     m = parse_metrics(envelope.items[0].payload.get_bytes())
     assert len(m) == 1
     assert m[0][1] == "counter@none"
+
+
+@pytest.mark.skipif(
+    not gevent or sys.version_info >= (3, 7),
+    reason="Python 3.6 or lower and gevent required",
+)
+@pytest.mark.forked
+def test_disable_metrics_for_old_python_with_gevent(
+    sentry_init, capture_envelopes, maybe_monkeypatched_threading
+):
+    if maybe_monkeypatched_threading != "greenlet":
+        pytest.skip("Test specifically for gevent/greenlet")
+
+    sentry_init(
+        release="fun-release",
+        environment="not-fun-env",
+        _experiments={"enable_metrics": True},
+    )
+    envelopes = capture_envelopes()
+
+    metrics.incr("counter")
+
+    Hub.current.flush()
+
+    assert Hub.current.client.metrics_aggregator is None
+    assert not envelopes