Merge branch 'master' into sentry-sdk-2.0

Author: sentrivana

sentry_sdk/crons/decorator.py

@@ -9,6 +9,7 @@
 if TYPE_CHECKING:
     from types import TracebackType
     from typing import (
+        Any,
         Awaitable,
         Callable,
         Optional,
@@ -51,15 +52,18 @@ def test(arg):
     ```
     """
 
-    def __init__(self, monitor_slug=None):
-        # type: (Optional[str]) -> None
+    def __init__(self, monitor_slug=None, monitor_config=None):
+        # type: (Optional[str], Optional[dict[str, Any]]) -> None
         self.monitor_slug = monitor_slug
+        self.monitor_config = monitor_config
 
     def __enter__(self):
         # type: () -> None
         self.start_timestamp = now()
         self.check_in_id = capture_checkin(
-            monitor_slug=self.monitor_slug, status=MonitorStatus.IN_PROGRESS
+            monitor_slug=self.monitor_slug,
+            status=MonitorStatus.IN_PROGRESS,
+            monitor_config=self.monitor_config,
         )
 
     def __exit__(self, exc_type, exc_value, traceback):
@@ -76,6 +80,7 @@ def __exit__(self, exc_type, exc_value, traceback):
             check_in_id=self.check_in_id,
             status=status,
             duration=duration_s,
+            monitor_config=self.monitor_config,
         )
 
     def __call__(self, fn):

tests/test_crons.py

@@ -58,6 +58,22 @@ async def _break_world_contextmanager_async(name):
         return "Hello, {}".format(name)
 
 
+@sentry_sdk.monitor(monitor_slug="ghi789", monitor_config=None)
+def _no_monitor_config():
+    return
+
+
+@sentry_sdk.monitor(
+    monitor_slug="ghi789",
+    monitor_config={
+        "schedule": {"type": "crontab", "value": "0 0 * * *"},
+        "failure_issue_threshold": 5,
+    },
+)
+def _with_monitor_config():
+    return
+
+
 def test_decorator(sentry_init):
     sentry_init()
 
@@ -70,7 +86,9 @@ def test_decorator(sentry_init):
         # Check for initial checkin
         fake_capture_checkin.assert_has_calls(
             [
-                mock.call(monitor_slug="abc123", status="in_progress"),
+                mock.call(
+                    monitor_slug="abc123", status="in_progress", monitor_config=None
+                ),
             ]
         )
 
@@ -95,7 +113,9 @@ def test_decorator_error(sentry_init):
         # Check for initial checkin
         fake_capture_checkin.assert_has_calls(
             [
-                mock.call(monitor_slug="def456", status="in_progress"),
+                mock.call(
+                    monitor_slug="def456", status="in_progress", monitor_config=None
+                ),
             ]
         )
 
@@ -118,7 +138,9 @@ def test_contextmanager(sentry_init):
         # Check for initial checkin
         fake_capture_checkin.assert_has_calls(
             [
-                mock.call(monitor_slug="abc123", status="in_progress"),
+                mock.call(
+                    monitor_slug="abc123", status="in_progress", monitor_config=None
+                ),
             ]
         )
 
@@ -143,7 +165,9 @@ def test_contextmanager_error(sentry_init):
         # Check for initial checkin
         fake_capture_checkin.assert_has_calls(
             [
-                mock.call(monitor_slug="def456", status="in_progress"),
+                mock.call(
+                    monitor_slug="def456", status="in_progress", monitor_config=None
+                ),
             ]
         )
 
@@ -219,6 +243,8 @@ def test_monitor_config(sentry_init, capture_envelopes):
 
     monitor_config = {
         "schedule": {"type": "crontab", "value": "0 0 * * *"},
+        "failure_issue_threshold": 5,
+        "recovery_threshold": 5,
     }
 
     capture_checkin(monitor_slug="abc123", monitor_config=monitor_config)
@@ -236,6 +262,41 @@ def test_monitor_config(sentry_init, capture_envelopes):
     assert "monitor_config" not in check_in
 
 
+def test_decorator_monitor_config(sentry_init, capture_envelopes):
+    sentry_init()
+    envelopes = capture_envelopes()
+
+    _with_monitor_config()
+
+    assert len(envelopes) == 2
+
+    for check_in_envelope in envelopes:
+        assert len(check_in_envelope.items) == 1
+        check_in = check_in_envelope.items[0].payload.json
+
+        assert check_in["monitor_slug"] == "ghi789"
+        assert check_in["monitor_config"] == {
+            "schedule": {"type": "crontab", "value": "0 0 * * *"},
+            "failure_issue_threshold": 5,
+        }
+
+
+def test_decorator_no_monitor_config(sentry_init, capture_envelopes):
+    sentry_init()
+    envelopes = capture_envelopes()
+
+    _no_monitor_config()
+
+    assert len(envelopes) == 2
+
+    for check_in_envelope in envelopes:
+        assert len(check_in_envelope.items) == 1
+        check_in = check_in_envelope.items[0].payload.json
+
+        assert check_in["monitor_slug"] == "ghi789"
+        assert "monitor_config" not in check_in
+
+
 def test_capture_checkin_sdk_not_initialized():
     # Tests that the capture_checkin does not raise an error when Sentry SDK is not initialized.
     # sentry_init() is intentionally omitted.
@@ -320,7 +381,9 @@ async def test_decorator_async(sentry_init):
         # Check for initial checkin
         fake_capture_checkin.assert_has_calls(
             [
-                mock.call(monitor_slug="abc123", status="in_progress"),
+                mock.call(
+                    monitor_slug="abc123", status="in_progress", monitor_config=None
+                ),
             ]
         )
 
@@ -346,7 +409,9 @@ async def test_decorator_error_async(sentry_init):
         # Check for initial checkin
         fake_capture_checkin.assert_has_calls(
             [
-                mock.call(monitor_slug="def456", status="in_progress"),
+                mock.call(
+                    monitor_slug="def456", status="in_progress", monitor_config=None
+                ),
             ]
         )
 
@@ -370,7 +435,9 @@ async def test_contextmanager_async(sentry_init):
         # Check for initial checkin
         fake_capture_checkin.assert_has_calls(
             [
-                mock.call(monitor_slug="abc123", status="in_progress"),
+                mock.call(
+                    monitor_slug="abc123", status="in_progress", monitor_config=None
+                ),
             ]
         )
 
@@ -396,7 +463,9 @@ async def test_contextmanager_error_async(sentry_init):
         # Check for initial checkin
         fake_capture_checkin.assert_has_calls(
             [
-                mock.call(monitor_slug="def456", status="in_progress"),
+                mock.call(
+                    monitor_slug="def456", status="in_progress", monitor_config=None
+                ),
             ]
         )