Merge branch 'master' into stories/nm/urls

Author: natemoo-re

migrations_lockfile.txt

@@ -27,7 +27,7 @@ preprod: 0010_actual_drop_preprod_artifact_analysis_file_id_col
 
 replays: 0006_add_bulk_delete_job
 
-sentry: 0948_ds_waiver_org_fk_not_db_constr
+sentry: 0949_add_dashboard_widget_snapshot_model
 
 social_auth: 0003_social_auth_json_field
 

package.json

@@ -264,7 +264,7 @@
     "diff-docs": "pnpm run install-api-docs && node --experimental-transform-types api-docs/openapi-diff.ts",
     "deref-api-docs": "node --experimental-transform-types api-docs/index.ts tests/apidocs/openapi-spectacular.json tests/apidocs/openapi-derefed.json",
     "build-chartcuterie-config": "node --experimental-transform-types config/build-chartcuterie.ts",
-    "build-acceptance": "CODECOV_ENABLE_BA=false IS_ACCEPTANCE_TEST=1 NODE_ENV=production pnpm run build",
+    "build-acceptance": "CODECOV_ENABLE_BA=false IS_ACCEPTANCE_TEST=1 STORYBOOK_TYPES=0 NODE_ENV=production pnpm run build",
     "build-production": "NODE_OPTIONS='--experimental-transform-types' NODE_ENV=production rspack --mode production --config ./rspack.config.ts",
     "build": "NODE_OPTIONS='--max-old-space-size=4096 --experimental-transform-types' rspack --config ./rspack.config.ts",
     "build-js-loader": "node --experimental-transform-types scripts/build-js-loader.ts",

src/sentry/digests/notifications.py

@@ -68,6 +68,8 @@ def unsplit_key(
 def event_to_record(
     event: Event, rules: Sequence[Rule], notification_uuid: str | None = None
 ) -> Record:
+    from sentry.notifications.notification_action.utils import should_fire_workflow_actions
+
     if not rules:
         logger.warning("Creating record for %s that does not contain any rules!", event)
 
@@ -77,7 +79,7 @@ def event_to_record(
         identifier_key = IdentifierKey.WORKFLOW
         for rule in rules:
             rule_ids.append(int(get_key_from_rule_data(rule, "workflow_id")))
-    elif features.has("organizations:workflow-engine-trigger-actions", event.organization):
+    elif should_fire_workflow_actions(event.organization):
         for rule in rules:
             rule_ids.append(int(get_key_from_rule_data(rule, "legacy_rule_id")))
     else:
@@ -166,6 +168,8 @@ def _build_digest_impl(
 
 
 def get_rules_from_workflows(project: Project, workflow_ids: set[int]) -> dict[int, Rule]:
+    from sentry.notifications.notification_action.utils import should_fire_workflow_actions
+
     rules: dict[int, Rule] = {}
     if not workflow_ids:
         return rules
@@ -219,14 +223,16 @@ def get_rules_from_workflows(project: Project, workflow_ids: set[int]) -> dict[i
 
             assert rule.project_id == project.id, "Rule must belong to Project"
 
-            if features.has("organizations:workflow-engine-trigger-actions", project.organization):
+            if should_fire_workflow_actions(project.organization):
                 rule.data["actions"][0]["legacy_rule_id"] = rule.id
 
             rules[workflow_id] = rule
     return rules
 
 
 def build_digest(project: Project, records: Sequence[Record]) -> DigestInfo:
+    from sentry.notifications.notification_action.utils import should_fire_workflow_actions
+
     if not records:
         return DigestInfo({}, {}, {})
 
@@ -253,7 +259,7 @@ def build_digest(project: Project, records: Sequence[Record]) -> DigestInfo:
     group_ids = list(groups)
     rules = Rule.objects.in_bulk(rule_ids)
 
-    if features.has("organizations:workflow-engine-trigger-actions", project.organization):
+    if should_fire_workflow_actions(project.organization):
         for rule in rules.values():
             rule.data["actions"][0]["legacy_rule_id"] = rule.id
 

src/sentry/features/temporary.py

@@ -430,6 +430,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:trace-spans-format", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable feature to use trace admin ui.
     manager.add("organizations:trace-view-admin-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable displaying span links in the attribute tree
+    manager.add("organizations:trace-view-span-links", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable feature to use trace tabs layout ui
     manager.add("organizations:trace-tabs-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable feature to load new traces onboarding guide.
@@ -495,6 +497,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:workflow-engine-process-metric-issue-workflows", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable workflow engine for issue alerts
     manager.add("organizations:workflow-engine-process-workflows", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable single processing through workflow engine for issue alerts
+    manager.add("organizations:workflow-engine-single-process-workflows", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable logging to debug workflow engine process workflows
     manager.add("organizations:workflow-engine-process-workflows-logs", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable firing actions for workflow engine issue alerts

src/sentry/incidents/action_handlers.py

@@ -503,6 +503,8 @@ def generate_incident_trigger_email_context(
     user: User | RpcUser | None = None,
     notification_uuid: str | None = None,
 ):
+    from sentry.notifications.notification_action.utils import should_fire_workflow_actions
+
     snuba_query = metric_issue_context.snuba_query
     is_active = trigger_status == TriggerStatus.ACTIVE
     is_threshold_type_above = alert_context.threshold_type == AlertRuleThresholdType.ABOVE
@@ -579,7 +581,7 @@ def generate_incident_trigger_email_context(
             ),
             query=urlencode(alert_link_params),
         )
-    elif features.has("organizations:workflow-engine-trigger-actions", organization):
+    elif should_fire_workflow_actions(organization):
         # lookup the incident_id from the open_period_identifier
         try:
             incident_group_open_period = IncidentGroupOpenPeriod.objects.get(

src/sentry/integrations/discord/message_builder/issues.py

@@ -22,6 +22,7 @@
 from sentry.models.group import Group, GroupStatus
 from sentry.models.project import Project
 from sentry.models.rule import Rule
+from sentry.notifications.notification_action.utils import should_fire_workflow_actions
 from sentry.notifications.notifications.base import ProjectNotification
 from sentry.notifications.utils.rules import get_key_from_rule_data
 
@@ -60,9 +61,7 @@ def build(self, notification_uuid: str | None = None) -> dict[str, object]:
             rule_environment_id = self.rules[0].environment_id
             if features.has("organizations:workflow-engine-ui-links", self.group.organization):
                 rule_id = int(get_key_from_rule_data(self.rules[0], "workflow_id"))
-            elif features.has(
-                "organizations:workflow-engine-trigger-actions", self.group.organization
-            ):
+            elif should_fire_workflow_actions(self.group.organization):
                 rule_id = int(get_key_from_rule_data(self.rules[0], "legacy_rule_id"))
             else:
                 rule_id = self.rules[0].id

src/sentry/integrations/messaging/message_builder.py

@@ -14,6 +14,7 @@
 from sentry.models.project import Project
 from sentry.models.rule import Rule
 from sentry.models.team import Team
+from sentry.notifications.notification_action.utils import should_fire_workflow_actions
 from sentry.notifications.notifications.base import BaseNotification
 from sentry.notifications.notifications.rules import AlertRuleNotification
 from sentry.notifications.utils.links import create_link_to_workflow
@@ -109,7 +110,7 @@ def get_rule_environment_param_from_rule(
     rule_id: int, rule_environment_id: int | None, organization: Organization
 ) -> dict[str, str]:
     params = {}
-    if features.has("organizations:workflow-engine-trigger-actions", organization):
+    if should_fire_workflow_actions(organization):
         if (
             rule_environment_id is not None
             and (environment_name := fetch_environment_name(rule_environment_id)) is not None
@@ -269,7 +270,7 @@ def build_attachment_replay_link(
 def build_rule_url(rule: Any, group: Group, project: Project) -> str:
     org_slug = group.organization.slug
     project_slug = project.slug
-    if features.has("organizations:workflow-engine-trigger-actions", group.organization):
+    if should_fire_workflow_actions(group.organization):
         rule_id = get_key_from_rule_data(rule, "legacy_rule_id")
         rule_url = f"/organizations/{org_slug}/alerts/rules/{project_slug}/{rule_id}/details/"
     else:

src/sentry/integrations/metric_alerts.py

@@ -194,6 +194,8 @@ def incident_attachment_info(
     referrer: str = "metric_alert",
     notification_uuid: str | None = None,
 ) -> AttachmentInfo:
+    from sentry.notifications.notification_action.utils import should_fire_workflow_actions
+
     status = get_status_text(metric_issue_context.new_status)
 
     text = ""
@@ -220,7 +222,7 @@ def incident_attachment_info(
     if notification_uuid:
         title_link_params["notification_uuid"] = notification_uuid
 
-    if features.has("organizations:workflow-engine-trigger-actions", organization):
+    if should_fire_workflow_actions(organization):
         try:
             alert_rule_id = AlertRuleDetector.objects.values_list("alert_rule_id", flat=True).get(
                 detector_id=alert_context.action_identifier_id

src/sentry/integrations/opsgenie/client.py

@@ -11,6 +11,7 @@
 from sentry.integrations.services.integration.model import RpcIntegration
 from sentry.integrations.types import IntegrationProviderSlug
 from sentry.models.group import Group
+from sentry.notifications.notification_action.utils import should_fire_workflow_actions
 from sentry.notifications.utils.links import create_link_to_workflow
 from sentry.notifications.utils.rules import get_key_from_rule_data
 from sentry.shared_integrations.exceptions import ApiError
@@ -58,7 +59,7 @@ def _get_rule_urls(self, group, rules):
         rule_urls = []
         for rule in rules:
             rule_id = rule.id
-            if features.has("organizations:workflow-engine-trigger-actions", organization):
+            if should_fire_workflow_actions(organization):
                 rule_id = get_key_from_rule_data(rule, "legacy_rule_id")
 
             path = f"/organizations/{organization.slug}/alerts/rules/{group.project.slug}/{rule_id}/details/"

src/sentry/integrations/slack/actions/notification.py

@@ -9,7 +9,6 @@
 import sentry_sdk
 from slack_sdk.errors import SlackApiError
 
-from sentry import features
 from sentry.api.serializers.rest_framework.rule import ACTION_UUID_KEY
 from sentry.constants import ISSUE_ALERTS_THREAD_DEFAULT
 from sentry.eventstore.models import GroupEvent
@@ -39,6 +38,7 @@
 from sentry.models.organization import Organization
 from sentry.models.rule import Rule
 from sentry.notifications.additional_attachment_manager import get_additional_attachment
+from sentry.notifications.notification_action.utils import should_fire_workflow_actions
 from sentry.notifications.utils.open_period import open_period_start_for_group
 from sentry.rules.actions import IntegrationEventAction
 from sentry.rules.base import CallbackFuture
@@ -479,7 +479,7 @@ def send_notification_noa(event: GroupEvent, futures: Sequence[RuleFuture]) -> N
             },
             skip_internal=False,
         )
-        if features.has("organizations:workflow-engine-trigger-actions", self.project.organization):
+        if should_fire_workflow_actions(self.project.organization):
             yield self.future(send_notification_noa, key=key)
         else:
             yield self.future(send_notification, key=key)