only use split enhancements when getting contributes and hints

Author: lobsterkatie

src/sentry/grouping/enhancer/__init__.py

@@ -611,91 +611,72 @@ def assemble_stacktrace_component(
         """
 
         with metrics.timer("grouping.enhancements.get_contributes_and_hint") as metrics_timer_tags:
-            metrics_timer_tags.update({"split": False, "variant": variant_name})
+            metrics_timer_tags.update({"split": True, "variant": variant_name})
 
-            # TODO: Fix this type to list[MatchFrame] once it's fixed in ophio
-            match_frames: list[Any] = [create_match_frame(frame, platform) for frame in frames]
-
-            rust_frames = [RustFrame(contributes=c.contributes) for c in frame_components]
             rust_exception_data = make_rust_exception_data(exception_data)
 
-            # Modify the rust frames by applying +group/-group rules and getting hints for both those
-            # changes and the `in_app` changes applied by earlier in the ingestion process by
-            # `apply_category_and_updated_in_app_to_frames`. Also, get `hint` and `contributes` values
-            # for the overall stacktrace (returned in `rust_results`).
-            rust_stacktrace_results = self.rust_enhancements.assemble_stacktrace_component(
-                match_frames, rust_exception_data, rust_frames
-            )
-
-        if self.run_split_enhancements:
-            with metrics.timer(
-                "grouping.enhancements.get_contributes_and_hint"
-            ) as metrics_timer_tags:
-                metrics_timer_tags.update({"split": True, "variant": variant_name})
-
-                # Create a set of rust frames to which we can ask rust to add in-app hints. (We know all
-                # hints generated by classifier enhancements are in-app by definition.)
-                in_app_rust_frames = [EmptyRustFrame() for frame in frames]
-                # Only spend the time to get in-app hints if we might use them
-                if variant_name == "app":
-                    self.classifier_rust_enhancements.assemble_stacktrace_component(
-                        match_frames, rust_exception_data, in_app_rust_frames
-                    )
-
-                # Do the same for contributes hints, this time using the contributes enhancements. These
-                # rust frames will also collect `contributes` values, along with the `contributes` and
-                # `hint` values for the stacktrace.
-                contributes_rust_frames = [
-                    RustFrame(contributes=c.contributes) for c in frame_components
-                ]
-                contributes_match_frames = [
-                    # We don't want to include `orig_in_app` here because otherwise +/-group hints can
-                    # get clobbered by +/-app hints
-                    {**match_frame, "orig_in_app": None}
-                    for match_frame in match_frames
-                ]
-                rust_stacktrace_results_split = (
-                    self.contributes_rust_enhancements.assemble_stacktrace_component(
-                        contributes_match_frames, rust_exception_data, contributes_rust_frames
-                    )
+            # Create a set of rust frames to which we can ask rust to add in-app hints. (We know all
+            # hints generated by classifier enhancements are in-app by definition.)
+            in_app_rust_frames = [EmptyRustFrame() for frame in frames]
+            # TODO: Fix this type to list[MatchFrame] once it's fixed in ophio
+            in_app_match_frames: list[Any] = [
+                create_match_frame(frame, platform) for frame in frames
+            ]
+            # Only spend the time to get in-app hints if we might use them
+            if variant_name == "app":
+                self.classifier_rust_enhancements.assemble_stacktrace_component(
+                    in_app_match_frames, rust_exception_data, in_app_rust_frames
                 )
 
-        else:
-            # We need to give these values so the zip below will work, but we're not going to use
-            # them if we're not running split enhancements, so we can just reuse the regular results
-            in_app_rust_frames = contributes_rust_frames = rust_frames
-            rust_stacktrace_results_split = rust_stacktrace_results
+            # Do the same for contributes hints, this time using the contributes enhancements. These
+            # rust frames will also collect `contributes` values, along with the `contributes` and
+            # `hint` values for the stacktrace.
+            contributes_rust_frames = [
+                RustFrame(contributes=c.contributes) for c in frame_components
+            ]
+            contributes_match_frames = [
+                # We don't want to include `orig_in_app` here because otherwise +/-group hints can
+                # get clobbered by +/-app hints
+                {**match_frame, "orig_in_app": None}
+                for match_frame in in_app_match_frames
+            ]
+            rust_stacktrace_results = (
+                self.contributes_rust_enhancements.assemble_stacktrace_component(
+                    contributes_match_frames, rust_exception_data, contributes_rust_frames
+                )
+            )
 
         # Tally the number of each type of frame in the stacktrace. Later on, this will allow us to
         # both collect metrics and use the information in decisions about whether to send the event
         # to Seer
         frame_counts: Counter[str] = Counter()
 
         # Update frame components with results from rust
-        for frame, frame_component, rust_frame, in_app_rust_frame, contributes_rust_frame in zip(
-            frames, frame_components, rust_frames, in_app_rust_frames, contributes_rust_frames
+        for frame, frame_component, in_app_rust_frame, contributes_rust_frame in zip(
+            frames, frame_components, in_app_rust_frames, contributes_rust_frames
         ):
             # System frames should never contribute in the app variant, so if that's what we have,
             # force `contribtues=False`, regardless of the rust results
             if variant_name == "app" and not frame_component.in_app:
                 contributes = False
             else:
-                contributes = rust_frame.contributes
+                contributes = bool(  # bool-ing this to please mypy
+                    contributes_rust_frame.contributes
+                )
 
             frame_component.update(contributes=contributes)
 
-            hint = get_hint_for_frame(variant_name, frame, frame_component, rust_frame)
-            if self.run_split_enhancements:
-                split_in_app_hint = (
-                    get_hint_for_frame(
-                        variant_name, frame, frame_component, in_app_rust_frame, "in-app"
-                    )
-                    if variant_name == "app"
-                    else None  # In-app hints don't apply to the system stacktrace
-                )
-                split_contributes_hint = get_hint_for_frame(
-                    variant_name, frame, frame_component, contributes_rust_frame, "contributes"
+            in_app_hint = (
+                get_hint_for_frame(
+                    variant_name, frame, frame_component, in_app_rust_frame, "in-app"
                 )
+                if variant_name == "app"
+                else None  # In-app hints don't apply to the system stacktrace
+            )
+            contributes_hint = get_hint_for_frame(
+                variant_name, frame, frame_component, contributes_rust_frame, "contributes"
+            )
+            hint = _combine_hints(variant_name, frame_component, in_app_hint, contributes_hint)
 
             frame_component.update(hint=hint)