Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/sentry/digests/notifications.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from sentry.digests.types import IdentifierKey, Notification, Record, RecordWithRuleObjects
from sentry.models.group import Group, GroupStatus
from sentry.models.project import Project
from sentry.models.rule import Rule
from sentry.notifications.types import ActionTargetType, FallthroughChoiceType, NotificationOrigin
from sentry.notifications.utils.rules import get_notification_origins
from sentry.services.eventstore.models import Event, GroupEvent
Expand Down Expand Up @@ -74,7 +73,7 @@ def unsplit_key(

def event_to_record(
event: Event | GroupEvent,
rules: Sequence[Rule | NotificationOrigin],
rules: Sequence[NotificationOrigin],
notification_uuid: str | None = None,
identifier_key: IdentifierKey = IdentifierKey.RULE,
) -> Record:
Expand All @@ -85,12 +84,7 @@ def event_to_record(
# TODO(iamrajjoshi): Creating a PR to fix this
assert event.group is not None
rule_ids = []
for rule in rules:
origin = (
rule
if isinstance(rule, NotificationOrigin)
else NotificationOrigin.from_legacy_rule(rule)
)
for origin in rules:
rule_id = (
origin.legacy_rule_id if identifier_key == IdentifierKey.RULE else origin.workflow_id
)
Expand Down
6 changes: 2 additions & 4 deletions src/sentry/mail/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
RuleFuture as RuleFuture,
)
from sentry.notifications.utils.participants import get_notification_recipients
from sentry.notifications.utils.rules import split_rules_by_rule_workflow_id
from sentry.plugins.base.structs import Notification
from sentry.services.eventstore.models import Event, GroupEvent
from sentry.tasks.digests import deliver_digest
Expand Down Expand Up @@ -84,10 +83,9 @@ def get_digest_option(key: str) -> int | None:

digest_key = unsplit_key(project, target_type, target_identifier, fallthrough_choice)
extra["digest_key"] = digest_key
rules_and_workflows = split_rules_by_rule_workflow_id(rules, prefer="workflow_id")
rules_by_identifier_key = {
IdentifierKey.RULE: rules_and_workflows.rules,
IdentifierKey.WORKFLOW: rules_and_workflows.workflow_rules,
IdentifierKey.RULE: [rule for rule in rules if rule.workflow_id is None],
IdentifierKey.WORKFLOW: [rule for rule in rules if rule.workflow_id is not None],
}
immediate_delivery = False
for identifier_key, parsed_rules in rules_by_identifier_key.items():
Expand Down
24 changes: 1 addition & 23 deletions src/sentry/notifications/utils/rules.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from collections.abc import Iterable, Sequence
from dataclasses import dataclass
from collections.abc import Iterable
from typing import Literal

from sentry.models.project import Project
Expand Down Expand Up @@ -96,27 +95,6 @@ def get_key_from_rule_data(rule: Rule | NotificationOrigin, key: str) -> str:
return value


@dataclass
class RulesAndWorkflows:
rules: list[Rule | NotificationOrigin]
workflow_rules: list[Rule | NotificationOrigin]


def split_rules_by_rule_workflow_id(
rules: Sequence[Rule | NotificationOrigin], *, prefer: RuleIdType = "legacy_rule_id"
) -> RulesAndWorkflows:
parsed_rules = []
workflow_rules = []
for rule in rules:
key, _ = get_rule_or_workflow_id(rule, prefer=prefer)
match key:
case "workflow_id":
workflow_rules.append(rule)
case "legacy_rule_id":
parsed_rules.append(rule)
return RulesAndWorkflows(rules=parsed_rules, workflow_rules=workflow_rules)


def get_rule_or_workflow_id(
rule: Rule | NotificationOrigin, *, prefer: RuleIdType = "legacy_rule_id"
) -> tuple[RuleIdType, str]:
Expand Down
2 changes: 1 addition & 1 deletion tests/sentry/digests/test_notifications.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def rule(self) -> Rule:

@cached_property
def record(self) -> Record:
return event_to_record(self.event, (self.rule,), self.notification_uuid)
return event_to_record(self.event, (self.origin,), self.notification_uuid)

@cached_property
def origin(self) -> NotificationOrigin:
Expand Down
25 changes: 13 additions & 12 deletions tests/sentry/digests/test_utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
from sentry.models.project import Project
from sentry.models.projectownership import ProjectOwnership
from sentry.models.rule import Rule as RuleModel
from sentry.notifications.types import ActionTargetType, FallthroughChoiceType
from sentry.notifications.utils.rules import split_rules_by_rule_workflow_id
from sentry.notifications.types import ActionTargetType, FallthroughChoiceType, NotificationOrigin
from sentry.services.eventstore.models import Event
from sentry.testutils.cases import SnubaTestCase, TestCase
from sentry.testutils.helpers.datetime import before_now
Expand All @@ -32,10 +31,10 @@


def _get_records(project: Project, rules: Collection[RuleModel], event: Event) -> list[Record]:
rules_and_workflows = split_rules_by_rule_workflow_id(list(rules))
origins = [NotificationOrigin.from_legacy_rule(rule) for rule in rules]
rules_by_identifier_key = {
IdentifierKey.RULE: rules_and_workflows.rules,
IdentifierKey.WORKFLOW: rules_and_workflows.workflow_rules,
IdentifierKey.RULE: [origin for origin in origins if origin.legacy_rule_id is not None],
IdentifierKey.WORKFLOW: [origin for origin in origins if origin.legacy_rule_id is None],
}
return [
event_to_record(event, parsed_rules, identifier_key=identifier_key)
Expand Down Expand Up @@ -76,7 +75,8 @@ def test_get_event_from_groups_in_digest(self) -> None:
),
]

records = [event_to_record(event, (rule,)) for event in events]
origin = NotificationOrigin.from_legacy_rule(rule)
records = [event_to_record(event, (origin,)) for event in events]

digest = build_digest(project, sort_records(records))[0]

Expand Down Expand Up @@ -285,8 +285,9 @@ def create_events_from_filenames(
]

def test_simple(self) -> None:
origin = NotificationOrigin.from_legacy_rule(self.rule)
records = [
event_to_record(event, (self.rule,))
event_to_record(event, (origin,))
for event in self.team1_events + self.team2_events + self.user4_events
]
digest = build_digest(self.project, sort_records(records))[0]
Expand Down Expand Up @@ -337,11 +338,9 @@ def test_legacy_rule_id_records_include_workflow_id(self) -> None:
workflow_id = AlertRuleWorkflow.objects.get(rule_id=rule.id).workflow_id
records = _get_records(self.project, (rule,), self.team1_events[0])

with patch("sentry.digests.notifications.Rule.objects.in_bulk") as rule_in_bulk:
digest = build_digest(self.project, sort_records(records))[0]
digest = build_digest(self.project, sort_records(records))[0]

[digest_rule] = digest.keys()
rule_in_bulk.assert_not_called()
assert digest_rule.legacy_rule_id == rule.id
assert digest_rule.workflow_id == workflow_id

Expand All @@ -362,7 +361,8 @@ def test_legacy_rule_id_records_without_workflow(self) -> None:
def test_direct_email(self) -> None:
"""When the action type is not Issue Owners, then the target actor gets a digest."""
self.project_ownership.update(fallthrough=False)
records = [event_to_record(event, (self.rule,)) for event in self.team1_events]
origin = NotificationOrigin.from_legacy_rule(self.rule)
records = [event_to_record(event, (origin,)) for event in self.team1_events]
digest = build_digest(self.project, sort_records(records))[0]

expected_result = {self.user1.id: set(self.team1_events)}
Expand Down Expand Up @@ -488,7 +488,8 @@ def test_everyone_with_owners(self) -> None:
events = self.create_events_from_filenames(
self.project, ["hello.moz", "goodbye.moz", "hola.moz", "adios.moz"]
)
records = [event_to_record(event, (self.rule,)) for event in events + self.team1_events]
origin = NotificationOrigin.from_legacy_rule(self.rule)
records = [event_to_record(event, (origin,)) for event in events + self.team1_events]
digest = build_digest(self.project, sort_records(records))[0]
expected_result = {
self.user1.id: set(events),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,8 @@ def test_issue_alert_team_issue_owners_user_settings_off_digests(
)

key = f"mail:p:{self.project.id}"
backend.add(key, event_to_record(event, [rule]), increment_delay=0, maximum_delay=0)
origin = NotificationOrigin.from_legacy_rule(rule)
backend.add(key, event_to_record(event, [origin]), increment_delay=0, maximum_delay=0)

with self.tasks():
deliver_digest(key)
Expand Down Expand Up @@ -969,7 +970,8 @@ def test_digest_enabled_block(self, digests: MagicMock) -> None:
)

key = f"mail:p:{self.project.id}:IssueOwners::AllMembers"
backend.add(key, event_to_record(event, [rule]), increment_delay=0, maximum_delay=0)
origin = NotificationOrigin.from_legacy_rule(rule)
backend.add(key, event_to_record(event, [origin]), increment_delay=0, maximum_delay=0)

with self.tasks():
deliver_digest(key)
Expand Down
17 changes: 12 additions & 5 deletions tests/sentry/mail/test_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
ActionTargetType,
FallthroughChoiceType,
NotificationActionContext,
NotificationOrigin,
RuleFuture,
)
from sentry.notifications.utils.digest import get_digest_subject
Expand Down Expand Up @@ -1400,9 +1401,10 @@ def test_notify_digest(self, notify: MagicMock) -> None:
)

rule = self.create_project_rule(project=project)
origin = NotificationOrigin.from_legacy_rule(rule)
ProjectOwnership.objects.create(project_id=self.project.id, fallthrough=True)
digest = build_digest(
project, (event_to_record(event, (rule,)), event_to_record(event2, (rule,)))
project, (event_to_record(event, (origin,)), event_to_record(event2, (origin,)))
)

with self.tasks():
Expand Down Expand Up @@ -1456,9 +1458,10 @@ def test_notify_digest_replay_id(self, notify: MagicMock) -> None:
)

rule = self.create_project_rule(project=project)
origin = NotificationOrigin.from_legacy_rule(rule)
ProjectOwnership.objects.create(project_id=self.project.id, fallthrough=True)
digest = build_digest(
project, (event_to_record(event, (rule,)), event_to_record(event2, (rule,)))
project, (event_to_record(event, (origin,)), event_to_record(event2, (origin,)))
)

features = ["organizations:session-replay"]
Expand All @@ -1484,8 +1487,9 @@ def test_notify_digest_replay_id(self, notify: MagicMock) -> None:
def test_notify_digest_single_record(self, send_async: MagicMock, notify: MagicMock) -> None:
event = self.store_event(data={}, project_id=self.project.id)
rule = self.create_project_rule(project=self.project)
origin = NotificationOrigin.from_legacy_rule(rule)
ProjectOwnership.objects.create(project_id=self.project.id, fallthrough=True)
digest = build_digest(self.project, (event_to_record(event, (rule,)),))
digest = build_digest(self.project, (event_to_record(event, (origin,)),))
self.adapter.notify_digest(
self.project,
digest,
Expand All @@ -1511,9 +1515,11 @@ def test_notify_digest_subject_prefix(self) -> None:
)

rule = self.create_project_rule(project=self.project)
origin = NotificationOrigin.from_legacy_rule(rule)

digest = build_digest(
self.project, (event_to_record(event, (rule,)), event_to_record(event2, (rule,)))
self.project,
(event_to_record(event, (origin,)), event_to_record(event2, (origin,))),
)

with self.tasks():
Expand Down Expand Up @@ -1552,9 +1558,10 @@ def test_notify_digest_user_does_not_exist(self, notify: MagicMock) -> None:
"targetIdentifier": str(444),
}
rule = self.create_project_rule(name="a rule", action_data=[action_data])
origin = NotificationOrigin.from_legacy_rule(rule)

digest = build_digest(
project, (event_to_record(event, (rule,)), event_to_record(event2, (rule,)))
project, (event_to_record(event, (origin,)), event_to_record(event2, (origin,)))
)

with self.tasks():
Expand Down
14 changes: 8 additions & 6 deletions tests/sentry/notifications/notifications/test_digests.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from sentry.digests.notifications import event_to_record
from sentry.mail.analytics import EmailNotificationSent
from sentry.models.projectownership import ProjectOwnership
from sentry.notifications.types import NotificationOrigin
from sentry.services.eventstore.models import Event, GroupEvent
from sentry.tasks.digests import deliver_digest
from sentry.testutils.cases import PerformanceIssueTestCase, SlackActivityNotificationTest, TestCase
Expand Down Expand Up @@ -61,9 +62,8 @@ def add_event(self, fingerprint: str, backend: Backend, event_type: str = "error
)

assert event is not None
backend.add(
self.key, event_to_record(event, [self.rule]), increment_delay=0, maximum_delay=0
)
origin = NotificationOrigin.from_legacy_rule(self.rule)
backend.add(self.key, event_to_record(event, [origin]), increment_delay=0, maximum_delay=0)

def run_test(
self,
Expand Down Expand Up @@ -291,15 +291,16 @@ def test_slack_digest_notification_block(self, digests: MagicMock) -> None:
project_id=self.project.id,
)
notification_uuid = str(uuid.uuid4())
origin = NotificationOrigin.from_legacy_rule(rule)
backend.add(
key,
event_to_record(event1, [rule], notification_uuid),
event_to_record(event1, [origin], notification_uuid),
increment_delay=0,
maximum_delay=0,
)
backend.add(
key,
event_to_record(event2, [rule], notification_uuid),
event_to_record(event2, [origin], notification_uuid),
increment_delay=0,
maximum_delay=0,
)
Expand Down Expand Up @@ -352,6 +353,7 @@ def test_slack_digest_notification_truncates_at_48_blocks(self, digests: MagicMo
timestamp = before_now(days=1).isoformat()
key = f"slack:p:{self.project.id}:IssueOwners::AllMembers"
rule = self.create_project_rule(project=self.project)
origin = NotificationOrigin.from_legacy_rule(rule)
notification_uuid = str(uuid.uuid4())

# Create 17 events to exceed 48 blocks (each event generates ~3 blocks)
Expand All @@ -367,7 +369,7 @@ def test_slack_digest_notification_truncates_at_48_blocks(self, digests: MagicMo
)
backend.add(
key,
event_to_record(event, [rule], notification_uuid),
event_to_record(event, [origin], notification_uuid),
increment_delay=0,
maximum_delay=0,
)
Expand Down
6 changes: 4 additions & 2 deletions tests/sentry/tasks/test_digests.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from sentry.digests.backends.redis import RedisBackend
from sentry.digests.notifications import event_to_record
from sentry.models.projectownership import ProjectOwnership
from sentry.notifications.types import NotificationOrigin
from sentry.tasks.digests import deliver_digest
from sentry.testutils.cases import TestCase
from sentry.testutils.helpers.datetime import before_now
Expand Down Expand Up @@ -37,15 +38,16 @@ def run_test(self, key: str) -> None:
project_id=self.project.id,
)
notification_uuid = str(uuid.uuid4())
origin = NotificationOrigin.from_legacy_rule(rule)
backend.add(
key,
event_to_record(event, [rule], notification_uuid),
event_to_record(event, [origin], notification_uuid),
increment_delay=0,
maximum_delay=0,
)
backend.add(
key,
event_to_record(event_2, [rule], notification_uuid),
event_to_record(event_2, [origin], notification_uuid),
increment_delay=0,
maximum_delay=0,
)
Expand Down
Loading