Merge branch 'master' into sentry-sdk-2.0

sentrivana · sentrivana · commit d30d52d79606 · 2024-02-14T11:08:56.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.40.4
+
+### Various fixes & improvements
+
+- Only start metrics flusher thread on demand (#2727) by @sentrivana
+- Bump checkouts/data-schemas from `aa7058c` to `6121fd3` (#2724) by @dependabot
+
+## 1.40.3
+
+### Various fixes & improvements
+
+- Turn off metrics for uWSGI (#2720) by @sentrivana
+- Minor improvements (#2714) by @antonpirker
+
 ## 1.40.2
 
 ### Various fixes & improvements
diff --git a/checkouts/data-schemas b/checkouts/data-schemas
@@ -1 +1 @@
-Subproject commit aa7058c466cddfe2b7a7a365f893c8a2c3950820
+Subproject commit 6121fd368469c498515c13feb9c28a804ef42e2e
diff --git a/docs/conf.py b/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.2"
+release = "1.40.4"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -229,15 +229,28 @@ 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)
-                    ),
-                )
+            if experiments.get("enable_metrics", True) or experiments.get(
+                "force_enable_metrics", False
+            ):
+                try:
+                    import uwsgi  # type: ignore
+                except ImportError:
+                    uwsgi = None
+
+                if uwsgi is not None and not experiments.get(
+                    "force_enable_metrics", False
+                ):
+                    logger.warning("Metrics currently not supported with uWSGI.")
+
+                else:
+                    from sentry_sdk.metrics import MetricsAggregator
+
+                    self.metrics_aggregator = MetricsAggregator(
+                        capture_func=_capture_envelope,
+                        enable_code_locations=bool(
+                            experiments.get("metric_code_locations", True)
+                        ),
+                    )
 
             max_request_body_size = ("always", "never", "small", "medium")
             if self.options["max_request_body_size"] not in max_request_body_size:
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -59,6 +59,7 @@ class EndpointType(Enum):
             "transport_zlib_compression_level": Optional[int],
             "transport_num_pools": Optional[int],
             "enable_metrics": Optional[bool],
+            "force_enable_metrics": Optional[bool],
             "metrics_summary_sample_rate": Optional[float],
             "should_summarize_metric": Optional[Callable[[str, MetricTags], bool]],
             "before_emit_metric": Optional[Callable[[str, MetricTags], bool]],
@@ -329,4 +330,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.40.2"
+VERSION = "1.40.4"
diff --git a/sentry_sdk/metrics.py b/sentry_sdk/metrics.py
@@ -437,7 +437,6 @@ def __init__(
 
         self._flusher = None  # type: Optional[Union[threading.Thread, ThreadPool]]
         self._flusher_pid = None  # type: Optional[int]
-        self._ensure_thread()
 
     def _ensure_thread(self):
         # type: (...) -> bool
@@ -452,6 +451,11 @@ def _ensure_thread(self):
             return True
 
         with self._lock:
+            # Recheck to make sure another thread didn't get here and start the
+            # the flusher in the meantime
+            if self._flusher_pid == pid:
+                return True
+
             self._flusher_pid = pid
 
             if not is_gevent():
@@ -476,9 +480,9 @@ def _flush_loop(self):
         # type: (...) -> None
         _in_metrics.set(True)
         while self._running or self._force_flush:
-            self._flush()
             if self._running:
                 self._flush_event.wait(self.FLUSHER_SLEEP_TIME)
+            self._flush()
 
     def _flush(self):
         # type: (...) -> None
diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.40.2",
+    version="1.40.4",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
@@ -139,11 +139,11 @@ def lambda_client():
 
 @pytest.fixture(
     params=[
-        "python3.7",
         "python3.8",
         "python3.9",
         "python3.10",
         "python3.11",
+        "python3.12",
     ]
 )
 def lambda_runtime(request):
diff --git a/tests/test_metrics.py b/tests/test_metrics.py
@@ -264,7 +264,6 @@ def test_timing_basic(sentry_init, capture_envelopes, maybe_monkeypatched_thread
     metrics.timing("timing", 3.0, tags={"a": "b"}, timestamp=ts)
     Hub.current.flush()
 
-    (envelope,) = envelopes
     (envelope,) = envelopes
     statsd_item, meta_item = envelope.items
 

Original file line number	Diff line number	Diff line change
`@@ -139,11 +139,11 @@ def lambda_client():`
`139`	`139`
`140`	`140`	`@pytest.fixture(`
`141`	`141`	`params=[`
`142`		`- "python3.7",`
`143`	`142`	`"python3.8",`
`144`	`143`	`"python3.9",`
`145`	`144`	`"python3.10",`
`146`	`145`	`"python3.11",`
	`146`	`+ "python3.12",`
`147`	`147`	`]`
`148`	`148`	`)`
`149`	`149`	`def lambda_runtime(request):`