s/find_existing_grouphash/find_existing_grouphash_legacy

Author: lobsterkatie

src/sentry/event_manager.py

@@ -50,7 +50,7 @@
     add_group_id_to_grouphashes,
     check_for_category_mismatch,
     check_for_group_creation_load_shed,
-    find_existing_grouphash,
+    find_existing_grouphash_legacy,
     find_existing_grouphash_new,
     get_hash_values,
     record_new_group_metrics,
@@ -1438,7 +1438,7 @@ def _save_aggregate_legacy(
     # this for select_for_update mostly provides sufficient synchronization
     # when groups are created and also relieves contention by locking a more
     # specific hash than `hierarchical_hashes[0]`.
-    existing_grouphash, root_hierarchical_hash = find_existing_grouphash(
+    existing_grouphash, root_hierarchical_hash = find_existing_grouphash_legacy(
         project, flat_grouphashes, hashes.hierarchical_hashes
     )
 
@@ -1500,7 +1500,7 @@ def _save_aggregate_legacy(
 
             flat_grouphashes = [gh for gh in all_grouphashes if gh.hash in hashes.hashes]
 
-            existing_grouphash, root_hierarchical_hash = find_existing_grouphash(
+            existing_grouphash, root_hierarchical_hash = find_existing_grouphash_legacy(
                 project, flat_grouphashes, hashes.hierarchical_hashes
             )
 

src/sentry/grouping/ingest.py

@@ -229,7 +229,7 @@ def _calculate_primary_hash(
     return _calculate_event_grouping(project, job["event"], grouping_config)
 
 
-def find_existing_grouphash(
+def find_existing_grouphash_legacy(
     project: Project,
     flat_grouphashes: Sequence[GroupHash],
     hierarchical_hashes: Sequence[str] | None,

tests/sentry/event_manager/grouping/test_assign_to_group.py

@@ -12,7 +12,7 @@
 from sentry.grouping.ingest import (
     _calculate_primary_hash,
     _calculate_secondary_hash,
-    find_existing_grouphash,
+    find_existing_grouphash_legacy,
     find_existing_grouphash_new,
 )
 from sentry.models.grouphash import GroupHash
@@ -32,7 +32,9 @@
 
 @contextmanager
 def patch_grouping_helpers(return_values: dict[str, Any]):
-    wrapped_find_existing_grouphash = capture_return_values(find_existing_grouphash, return_values)
+    wrapped_find_existing_grouphash_legacy = capture_return_values(
+        find_existing_grouphash_legacy, return_values
+    )
     wrapped_find_existing_grouphash_new = capture_return_values(
         find_existing_grouphash_new, return_values
     )
@@ -43,9 +45,9 @@ def patch_grouping_helpers(return_values: dict[str, Any]):
 
     with (
         mock.patch(
-            "sentry.event_manager.find_existing_grouphash",
-            wraps=wrapped_find_existing_grouphash,
-        ) as find_existing_grouphash_spy,
+            "sentry.event_manager.find_existing_grouphash_legacy",
+            wraps=wrapped_find_existing_grouphash_legacy,
+        ) as find_existing_grouphash_legacy_spy,
         mock.patch(
             "sentry.event_manager.find_existing_grouphash_new",
             wraps=wrapped_find_existing_grouphash_new,
@@ -66,7 +68,7 @@ def patch_grouping_helpers(return_values: dict[str, Any]):
         ) as create_group_spy,
     ):
         yield {
-            "find_existing_grouphash": find_existing_grouphash_spy,
+            "find_existing_grouphash_legacy": find_existing_grouphash_legacy_spy,
             "find_existing_grouphash_new": find_existing_grouphash_new_spy,
             "_calculate_primary_hash": calculate_primary_hash_spy,
             "_calculate_secondary_hash": calculate_secondary_hash_spy,
@@ -136,7 +138,7 @@ def get_results_from_saving_event(
     new_logic_enabled: bool = False,
 ):
     find_existing_grouphash_fn = (
-        "find_existing_grouphash_new" if new_logic_enabled else "find_existing_grouphash"
+        "find_existing_grouphash_new" if new_logic_enabled else "find_existing_grouphash_legacy"
     )
 
     # Whether or not these are assigned a value depends on the values of `in_transition` and