Merge 9cf45e0 into 12f2849

cmanallen · web-flow · commit 8fef7cfcaf8d · 2026-03-16T17:53:55.000Z
diff --git a/src/sentry/scm/private/ipc.py b/src/sentry/scm/private/ipc.py
@@ -408,7 +408,6 @@ def run_webhook_handler_control_task(
         event_type_hint,
         stream=scm_event_stream,
         get_current_time=time.time,
-        report_error=report_error_to_sentry,
         record_count=record_count_metric,
         record_distribution=record_distribution_metric,
         record_timer=record_timer_metric,
@@ -430,7 +429,6 @@ def run_webhook_handler_region_task(
         event_type_hint,
         stream=scm_event_stream,
         get_current_time=time.time,
-        report_error=report_error_to_sentry,
         record_count=record_count_metric,
         record_distribution=record_distribution_metric,
         record_timer=record_timer_metric,
@@ -467,7 +465,6 @@ def run_listener(
     *,
     stream: SourceCodeManagerEventStream,
     get_current_time: Callable[[], float] = time.monotonic,
-    report_error: Callable[[Exception], None] = report_error_to_sentry,
     record_count: Callable[[str, int, dict[str, str]], None] = record_count_metric,
     record_distribution: Callable[
         [str, int, dict[str, str], str], None
@@ -479,10 +476,9 @@ def run_listener(
 
     try:
         event = deserialize_event(event_data, event_type_hint)
-    except msgspec.MsgspecError as e:
-        report_error(e)
+    except msgspec.MsgspecError:
         record_count(f"{METRIC_PREFIX}.failed", 1, {"reason": "parse", "fn": listener})
-        return None
+        raise
 
     if isinstance(event, CheckRunEvent):
         exec_listener(listener, stream.check_run_listeners, event, record_count)
diff --git a/tests/sentry/scm/unit/private/test_ipc.py b/tests/sentry/scm/unit/private/test_ipc.py
@@ -110,7 +110,6 @@ def call_me_maybe(e):
         "check_run",
         stream=scm,
         get_current_time=lambda: 0.0,
-        report_error=lambda e: None,
         record_count=lambda a, b, c: None,
         record_timer=lambda a, b, c: None,
     )
@@ -149,7 +148,6 @@ def comment_handler(e):
         "comment",
         stream=scm,
         get_current_time=lambda: 0.0,
-        report_error=lambda e: None,
         record_count=lambda a, b, c: None,
         record_timer=lambda a, b, c: None,
     )
@@ -196,7 +194,6 @@ def pr_handler(e):
         "pull_request",
         stream=scm,
         get_current_time=lambda: 0.0,
-        report_error=lambda e: None,
         record_count=lambda a, b, c: None,
         record_timer=lambda a, b, c: None,
     )
@@ -246,7 +243,6 @@ def record_timer(key, amount, tags):
         "check_run",
         stream=scm,
         get_current_time=lambda: 200.0,
-        report_error=lambda e: None,
         record_count=record_count,
         record_distribution=record_distribution,
         record_timer=record_timer,
@@ -287,7 +283,6 @@ def record_count(key, amount, tags):
         "check_run",
         stream=SourceCodeManagerEventStream(),
         get_current_time=lambda: 0.0,
-        report_error=lambda e: None,
         record_count=record_count,
         record_timer=lambda a, b, c: None,
     )
@@ -328,7 +323,6 @@ def record_count(key, amount, tags):
             "check_run",
             stream=scm,
             get_current_time=lambda: 0.0,
-            report_error=lambda e: None,
             record_count=record_count,
             record_timer=lambda a, b, c: None,
         )
@@ -341,29 +335,22 @@ def record_count(key, amount, tags):
 
 
 def test_run_listener_malformed_input():
-    error = None
     metrics = []
 
-    def report_error(e):
-        nonlocal error
-        error = e
-
     def record_count(a, b, c):
         metrics.append((a, b, c))
 
-    # Implicitly tests no exception was raised.
-    run_listener(
-        "t",
-        "",
-        "check_run",
-        stream=SourceCodeManagerEventStream(),
-        get_current_time=lambda: 0.0,
-        report_error=report_error,
-        record_count=record_count,
-        record_timer=lambda a, b, c: None,
-    )
+    with pytest.raises(msgspec.MsgspecError):
+        run_listener(
+            "t",
+            "",
+            "check_run",
+            stream=SourceCodeManagerEventStream(),
+            get_current_time=lambda: 0.0,
+            record_count=record_count,
+            record_timer=lambda a, b, c: None,
+        )
 
-    assert isinstance(error, msgspec.MsgspecError)
     assert metrics == [("sentry.scm.run_listener.failed", 1, {"reason": "parse", "fn": "t"})]
 
 
