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
40 changes: 22 additions & 18 deletions src/sentry/mail/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,29 @@ 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_by_identifier_key = {
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():
# If any of the records are added immediately, we can deliver the digest immediately
if parsed_rules:
immediate_delivery = immediate_delivery or digests.backend.add(
digest_key,
event_to_record(
event,
parsed_rules,
notification_uuid=notification_uuid,
identifier_key=identifier_key,
),
increment_delay=get_digest_option("increment_delay"),
maximum_delay=get_digest_option("maximum_delay"),
workflow_rules = []
for rule in rules:
if rule.workflow_id is None:
logger.warning(
"mail.adapter.notification.missing_workflow_id",
extra={"rule_id": rule.legacy_rule_id, "project_id": project.id},
)
continue
workflow_rules.append(rule)

immediate_delivery = False
if workflow_rules:
immediate_delivery = digests.backend.add(
digest_key,
event_to_record(
event,
workflow_rules,
notification_uuid=notification_uuid,
identifier_key=IdentifierKey.WORKFLOW,
),
increment_delay=get_digest_option("increment_delay"),
maximum_delay=get_digest_option("maximum_delay"),
)
if immediate_delivery:
deliver_digest.delay(digest_key, notification_uuid=notification_uuid)
else:
Expand Down
18 changes: 18 additions & 0 deletions tests/sentry/mail/test_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -1639,6 +1639,24 @@ def test_digest_with_perf_issue(self, digests: MagicMock) -> None:
self.adapter.rule_notify(event, futures, ActionTargetType.ISSUE_OWNERS)
assert digests.backend.add.call_count == 1

@mock.patch("sentry.mail.adapter.digests")
@mock.patch("sentry.mail.adapter.logger")
def test_digest_skips_rule_without_workflow_id(
self, mock_logger: MagicMock, digests: MagicMock
) -> None:
digests.backend.enabled.return_value = True
event = self.store_event(data={}, project_id=self.project.id)
rule = self.create_project_rule(project=self.project, include_workflow_id=False)
future = RuleFuture(NotificationActionContext.from_legacy_rule(rule), {})

self.adapter.rule_notify(event, [future], ActionTargetType.ISSUE_OWNERS)

digests.backend.add.assert_not_called()
mock_logger.warning.assert_called_once_with(
"mail.adapter.notification.missing_workflow_id",
extra={"rule_id": rule.id, "project_id": self.project.id},
)

def test_notify_includes_uuid(self) -> None:
event = self.store_event(data={}, project_id=self.project.id)
rule = self.create_project_rule(name="my rule")
Expand Down
Loading