use helper

Author: lobsterkatie

src/sentry/grouping/ingest/seer.py

@@ -22,6 +22,7 @@
     filter_null_from_string,
     get_stacktrace_string_with_metrics,
     killswitch_enabled,
+    record_did_call_seer_metric,
 )
 from sentry.utils import metrics
 from sentry.utils.circuit_breaker2 import CircuitBreaker
@@ -96,22 +97,14 @@ def _has_customized_fingerprint(event: Event, variants: Mapping[str, BaseVariant
 
         # Hybrid fingerprinting ({{ default }} + some other value(s))
         else:
-            metrics.incr(
-                "grouping.similarity.did_call_seer",
-                sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-                tags={"call_made": False, "blocker": "hybrid-fingerprint"},
-            )
+            record_did_call_seer_metric(call_made=False, blocker="hybrid-fingerprint")
             return True
 
     # Fully customized fingerprint (from either us or the user)
     fingerprint_variant = variants.get("custom_fingerprint") or variants.get("built_in_fingerprint")
 
     if fingerprint_variant:
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": fingerprint_variant.type},
-        )
+        record_did_call_seer_metric(call_made=False, blocker=fingerprint_variant.type)
         return True
 
     return False
@@ -133,12 +126,7 @@ def _ratelimiting_enabled(event: Event, project: Project) -> bool:
     if ratelimiter.backend.is_limited("seer:similarity:global-limit", **global_ratelimit):
         logger_extra["limit_per_sec"] = global_limit_per_sec
         logger.warning("should_call_seer_for_grouping.global_ratelimit_hit", extra=logger_extra)
-
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "global-rate-limit"},
-        )
+        record_did_call_seer_metric(call_made=False, blocker="global-rate-limit")
 
         return True
 
@@ -147,12 +135,7 @@ def _ratelimiting_enabled(event: Event, project: Project) -> bool:
     ):
         logger_extra["limit_per_sec"] = project_limit_per_sec
         logger.warning("should_call_seer_for_grouping.project_ratelimit_hit", extra=logger_extra)
-
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "project-rate-limit"},
-        )
+        record_did_call_seer_metric(call_made=False, blocker="project-rate-limit")
 
         return True
 
@@ -173,11 +156,7 @@ def _circuit_breaker_broken(event: Event, project: Project) -> bool:
                 **breaker_config,
             },
         )
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "circuit-breaker"},
-        )
+        record_did_call_seer_metric(call_made=False, blocker="circuit-breaker")
 
     return circuit_broken
 
@@ -188,14 +167,7 @@ def _has_empty_stacktrace_string(event: Event, variants: Mapping[str, BaseVarian
     )
     if not stacktrace_string:
         if stacktrace_string == "":
-            metrics.incr(
-                "grouping.similarity.did_call_seer",
-                sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-                tags={
-                    "call_made": False,
-                    "blocker": "empty-stacktrace-string",
-                },
-            )
+            record_did_call_seer_metric(call_made=False, blocker="empty-stacktrace-string")
         return True
     # Store the stacktrace string in the event so we only calculate it once. We need to pop it
     # later so it isn't stored in the database.
@@ -286,11 +258,7 @@ def maybe_check_seer_for_matching_grouphash(
     seer_matched_grouphash = None
 
     if should_call_seer_for_grouping(event, variants):
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": True, "blocker": "none"},
-        )
+        record_did_call_seer_metric(call_made=True, blocker="none")
 
         try:
             # If no matching group is found in Seer, we'll still get back result

src/sentry/seer/similarity/utils.py

@@ -291,7 +291,6 @@ def get_stacktrace_string_with_metrics(
     data: dict[str, Any], platform: str | None, referrer: ReferrerOptions
 ) -> str | None:
     stacktrace_string = None
-    key = "grouping.similarity.did_call_seer"
     sample_rate = options.get("seer.similarity.metrics_sample_rate")
     try:
         stacktrace_string = get_stacktrace_string(data, platform)
@@ -303,11 +302,7 @@ def get_stacktrace_string_with_metrics(
             tags={"platform": platform, "referrer": referrer},
         )
         if referrer == ReferrerOptions.INGEST:
-            metrics.incr(
-                key,
-                sample_rate=sample_rate,
-                tags={"call_made": False, "blocker": "over-threshold-frames"},
-            )
+            record_did_call_seer_metric(call_made=False, blocker="over-threshold-frames")
     except Exception:
         logger.exception("Unexpected exception in stacktrace string formatting")
 
@@ -376,23 +371,17 @@ def killswitch_enabled(
             "should_call_seer_for_grouping.seer_global_killswitch_enabled",
             extra=logger_extra,
         )
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "global-killswitch"},
-        )
+        record_did_call_seer_metric(call_made=False, blocker="global-killswitch")
+
         return True
 
     if options.get("seer.similarity-killswitch.enabled"):
         logger.warning(
             "should_call_seer_for_grouping.seer_similarity_killswitch_enabled",
             extra=logger_extra,
         )
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "similarity-killswitch"},
-        )
+        record_did_call_seer_metric(call_made=False, blocker="similarity-killswitch")
+
         return True
 
     if killswitch_matches_context(
@@ -402,11 +391,8 @@ def killswitch_enabled(
             "should_call_seer_for_grouping.seer_similarity_project_killswitch_enabled",
             extra=logger_extra,
         )
-        metrics.incr(
-            "grouping.similarity.did_call_seer",
-            sample_rate=options.get("seer.similarity.metrics_sample_rate"),
-            tags={"call_made": False, "blocker": "project-killswitch"},
-        )
+        record_did_call_seer_metric(call_made=False, blocker="project-killswitch")
+
         return True
 
     return False

tests/sentry/grouping/ingest/test_seer.py

@@ -176,8 +176,8 @@ def test_obeys_customized_fingerprint_check(self) -> None:
                 is expected_result
             ), f'Case with fingerprint {event.data["fingerprint"]} failed.'
 
-    @patch("sentry.grouping.ingest.seer.metrics")
-    def test_obeys_empty_stacktrace_string_check(self, mock_metrics: Mock) -> None:
+    @patch("sentry.grouping.ingest.seer.record_did_call_seer_metric")
+    def test_obeys_empty_stacktrace_string_check(self, mock_record_did_call_seer: Mock) -> None:
         self.project.update_option("sentry:similarity_backfill_completed", int(time()))
         new_event = Event(
             project_id=self.project.id,
@@ -190,14 +190,8 @@ def test_obeys_empty_stacktrace_string_check(self, mock_metrics: Mock) -> None:
         )
 
         assert should_call_seer_for_grouping(new_event, new_event.get_grouping_variants()) is False
-        sample_rate = options.get("seer.similarity.metrics_sample_rate")
-        mock_metrics.incr.assert_any_call(
-            "grouping.similarity.did_call_seer",
-            sample_rate=sample_rate,
-            tags={
-                "call_made": False,
-                "blocker": "empty-stacktrace-string",
-            },
+        mock_record_did_call_seer.assert_any_call(
+            call_made=False, blocker="empty-stacktrace-string"
         )
 
     @patch("sentry.grouping.ingest.seer.get_similarity_data_from_seer", return_value=[])
@@ -340,8 +334,11 @@ def test_returns_no_grouphash_and_empty_metadata_if_empty_stacktrace(
                 },
             )
 
+    @patch("sentry.seer.similarity.utils.record_did_call_seer_metric")
     @patch("sentry.seer.similarity.utils.metrics")
-    def test_too_many_frames(self, mock_metrics: Mock) -> None:
+    def test_too_many_frames(
+        self, mock_metrics: Mock, mock_record_did_call_seer: MagicMock
+    ) -> None:
         type = "FailedToFetchError"
         value = "Charlie didn't bring the ball back"
         context_line = f"raise {type}('{value}')"
@@ -386,17 +383,10 @@ def test_too_many_frames(self, mock_metrics: Mock) -> None:
             sample_rate=sample_rate,
             tags={"platform": "java", "referrer": "ingest"},
         )
-        mock_metrics.incr.assert_any_call(
-            "grouping.similarity.did_call_seer",
-            sample_rate=1.0,
-            tags={
-                "call_made": False,
-                "blocker": "over-threshold-frames",
-            },
-        )
+        mock_record_did_call_seer.assert_any_call(call_made=False, blocker="over-threshold-frames")
 
-    @patch("sentry.seer.similarity.utils.metrics")
-    def test_too_many_frames_allowed_platform(self, mock_metrics: Mock) -> None:
+    @patch("sentry.seer.similarity.utils.record_did_call_seer_metric")
+    def test_too_many_frames_allowed_platform(self, mock_record_did_call_seer: MagicMock) -> None:
         type = "FailedToFetchError"
         value = "Charlie didn't bring the ball back"
         context_line = f"raise {type}('{value}')"
@@ -436,15 +426,8 @@ def test_too_many_frames_allowed_platform(self, mock_metrics: Mock) -> None:
         )
 
         assert (
-            call(
-                "grouping.similarity.did_call_seer",
-                sample_rate=1.0,
-                tags={
-                    "call_made": False,
-                    "blocker": "over-threshold-frames",
-                },
-            )
-            not in mock_metrics.incr.call_args_list
+            call(call_made=False, blocker="over-threshold-frames")
+            not in mock_record_did_call_seer.call_args_list
         )
 
 
@@ -505,10 +488,14 @@ def test_valid_maybe_check_seer_for_matching_group_hash(
             }
         )
 
+    @patch("sentry.seer.similarity.utils.record_did_call_seer_metric")
     @patch("sentry.grouping.ingest.seer.get_seer_similar_issues")
     @patch("sentry.seer.similarity.utils.metrics")
     def test_too_many_only_system_frames_maybe_check_seer_for_matching_group_hash(
-        self, mock_metrics: MagicMock, mock_get_similar_issues: MagicMock
+        self,
+        mock_metrics: MagicMock,
+        mock_get_similar_issues: MagicMock,
+        mock_record_did_call_seer: MagicMock,
     ) -> None:
         self.project.update_option("sentry:similarity_backfill_completed", int(time()))
 
@@ -556,14 +543,7 @@ def test_too_many_only_system_frames_maybe_check_seer_for_matching_group_hash(
             sample_rate=sample_rate,
             tags={"platform": "java", "referrer": "ingest"},
         )
-        mock_metrics.incr.assert_any_call(
-            "grouping.similarity.did_call_seer",
-            sample_rate=1.0,
-            tags={
-                "call_made": False,
-                "blocker": "over-threshold-frames",
-            },
-        )
+        mock_record_did_call_seer.assert_any_call(call_made=False, blocker="over-threshold-frames")
 
         mock_get_similar_issues.assert_not_called()