chore(deletions): Remove option

src/sentry/deletions/defaults/group.py

@@ -21,7 +21,6 @@
 from typing import Any
 
 from sentry import models, options
-from sentry.db.models.base import Model
 from sentry.deletions.tasks.nodestore import delete_events_for_groups_from_nodestore_and_eventstore
 from sentry.issues.grouptype import GroupCategory, InvalidGroupTypeError
 from sentry.models.group import Group, GroupStatus
@@ -76,6 +75,7 @@
     models.GroupEmailThread,
     models.GroupSubscription,
     models.GroupReaction,
+    models.Activity,
     RuleFireHistory,
 )
 
@@ -96,16 +96,6 @@
 _GROUP_RELATED_MODELS = DIRECT_GROUP_RELATED_MODELS + ADDITIONAL_GROUP_RELATED_MODELS
 
 
-def get_group_related_models() -> Sequence[type[Model]]:
-    """
-    Returns the tuple of models related to groups that should be deleted.
-    Checks options at runtime to allow dynamic configuration.
-    """
-    if options.get("deletions.activity.delete-in-bulk"):
-        return _GROUP_RELATED_MODELS + (models.Activity,)
-    return _GROUP_RELATED_MODELS
-
-
 class EventsBaseDeletionTask(BaseDeletionTask[Group]):
     """
     Base class to delete events associated to groups and its related models.
@@ -217,7 +207,7 @@ def _delete_children(self, instance_list: Sequence[Group]) -> None:
         group_ids = [group.id for group in instance_list]
         # Remove child relations for all groups first.
         child_relations: list[BaseRelation] = []
-        for model in get_group_related_models():
+        for model in _GROUP_RELATED_MODELS:
             child_relations.append(ModelRelation(model, {"group_id__in": group_ids}))
 
         error_groups, issue_platform_groups = separate_by_group_category(instance_list)

src/sentry/options/defaults.py

@@ -354,12 +354,6 @@
     type=Bool,
     flags=FLAG_AUTOMATOR_MODIFIABLE,
 )
-register(
-    "deletions.activity.delete-in-bulk",
-    default=False,
-    type=Bool,
-    flags=FLAG_AUTOMATOR_MODIFIABLE,
-)
 
 register(
     "cleanup.abort_execution",

src/sentry/reprocessing2.py

@@ -114,12 +114,10 @@
 
 # Group-related models are only a few per-group and are migrated at
 # once.
-GROUP_MODELS_TO_MIGRATE_RAW = DIRECT_GROUP_RELATED_MODELS + (models.Activity,)
-
 # If we were to move groupinbox to the new, empty group, inbox would show the
 # empty, unactionable group while it is reprocessing. Let post-process take
 # care of assigning GroupInbox like normally.
-GROUP_MODELS_TO_MIGRATE = tuple(x for x in GROUP_MODELS_TO_MIGRATE_RAW if x != models.GroupInbox)
+GROUP_MODELS_TO_MIGRATE = tuple(x for x in DIRECT_GROUP_RELATED_MODELS if x != models.GroupInbox)
 
 # Event attachments and group reports are per-event. This means that:
 #

tests/sentry/deletions/test_group.py

@@ -12,6 +12,7 @@
 from sentry.deletions.tasks.groups import delete_groups_for_project
 from sentry.issues.grouptype import GroupCategory
 from sentry.issues.issue_occurrence import IssueOccurrence
+from sentry.models.activity import Activity
 from sentry.models.eventattachment import EventAttachment
 from sentry.models.group import Group
 from sentry.models.groupassignee import GroupAssignee
@@ -26,6 +27,7 @@
 from sentry.snuba.referrer import Referrer
 from sentry.testutils.cases import SnubaTestCase, TestCase
 from sentry.testutils.helpers.datetime import before_now
+from sentry.types.activity import ActivityType
 from sentry.utils.snuba import bulk_snuba_queries
 from tests.sentry.issues.test_utils import OccurrenceTestMixin
 
@@ -62,6 +64,9 @@ def _create_event_with_many_group_children(self) -> Event:
         GroupHash.objects.create(project=self.project, group=event.group, hash=uuid4().hex)
         GroupMeta.objects.create(group=event.group, key="foo", value="bar")
         GroupRedirect.objects.create(group_id=event.group.id, previous_group_id=1)
+        Activity.objects.create(
+            group=event.group, project=self.project, type=ActivityType.SET_RESOLVED.value
+        )
 
         return event
 
@@ -86,6 +91,7 @@ def test_delete_group_with_many_related_children(self) -> None:
         assert not UserReport.objects.filter(event_id=event.event_id).exists()
         assert not EventAttachment.objects.filter(event_id=event.event_id).exists()
 
+        assert not Activity.objects.filter(group_id=event.group.id).exists()
         assert not GroupRedirect.objects.filter(group_id=event.group.id).exists()
         assert not GroupHash.objects.filter(group_id=event.group.id).exists()
         assert not Group.objects.filter(id=event.group.id).exists()