Merge branch 'master' into cmanallen/release-optimize-another-query

Author: cmanallen

src/sentry/analytics/event.py

@@ -113,7 +113,13 @@ def from_instance(cls, instance: Any, **kwargs: Any) -> Self:
             **{
                 f.name: kwargs.get(f.name, getattr(instance, f.name, None))
                 for f in fields(cls)
-                if f.name not in ("type", "uuid_", "datetime_")
+                if f.name
+                not in (
+                    "type",
+                    "uuid_",
+                    "datetime_",
+                    "data",  # TODO: remove this data field once migrated
+                )
             }
         )
 

src/sentry/api/endpoints/project_details.py

@@ -36,11 +36,7 @@
 from sentry.deletions.models.scheduleddeletion import RegionScheduledDeletion
 from sentry.dynamic_sampling import get_supported_biases_ids, get_user_biases
 from sentry.dynamic_sampling.types import DynamicSamplingMode
-from sentry.dynamic_sampling.utils import (
-    has_custom_dynamic_sampling,
-    has_dynamic_sampling,
-    has_dynamic_sampling_minimum_sample_rate,
-)
+from sentry.dynamic_sampling.utils import has_custom_dynamic_sampling, has_dynamic_sampling
 from sentry.grouping.enhancer import Enhancements
 from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.grouping.fingerprinting import FingerprintingRules, InvalidFingerprintingConfig
@@ -131,7 +127,6 @@ class ProjectMemberSerializer(serializers.Serializer):
         "copy_from_project",
         "targetSampleRate",
         "dynamicSamplingBiases",
-        "dynamicSamplingMinimumSampleRate",
         "tempestFetchScreenshots",
         "tempestFetchDumps",
         "autofixAutomationTuning",
@@ -225,7 +220,6 @@ class ProjectAdminSerializer(ProjectMemberSerializer):
     copy_from_project = serializers.IntegerField(required=False)
     targetSampleRate = serializers.FloatField(required=False, min_value=0, max_value=1)
     dynamicSamplingBiases = DynamicSamplingBiasSerializer(required=False, many=True)
-    dynamicSamplingMinimumSampleRate = serializers.BooleanField(required=False)
     tempestFetchScreenshots = serializers.BooleanField(required=False)
     tempestFetchDumps = serializers.BooleanField(required=False)
     autofixAutomationTuning = serializers.ChoiceField(
@@ -434,15 +428,6 @@ def validate_targetSampleRate(self, value):
 
         return value
 
-    def validate_dynamicSamplingMinimumSampleRate(self, value):
-        organization = self.context["project"].organization
-        actor = self.context["request"].user
-        if not has_dynamic_sampling_minimum_sample_rate(organization, actor=actor):
-            raise serializers.ValidationError(
-                "Organization does not have the dynamic sampling minimum sample rate feature enabled."
-            )
-        return value
-
     def validate_tempestFetchScreenshots(self, value):
         organization = self.context["project"].organization
         actor = self.context["request"].user
@@ -773,14 +758,6 @@ def put(self, request: Request, project) -> Response:
                 changed_proj_settings["sentry:dynamic_sampling_biases"] = result[
                     "dynamicSamplingBiases"
                 ]
-        if result.get("dynamicSamplingMinimumSampleRate") is not None:
-            if project.update_option(
-                "sentry:dynamic_sampling_minimum_sample_rate",
-                result["dynamicSamplingMinimumSampleRate"],
-            ):
-                changed_proj_settings["sentry:dynamic_sampling_minimum_sample_rate"] = result[
-                    "dynamicSamplingMinimumSampleRate"
-                ]
 
         if result.get("autofixAutomationTuning") is not None:
             if project.update_option(

src/sentry/api/serializers/models/project.py

@@ -25,7 +25,6 @@
 from sentry.dynamic_sampling.utils import (
     has_custom_dynamic_sampling,
     has_dynamic_sampling,
-    has_dynamic_sampling_minimum_sample_rate,
     is_project_mode_sampling,
 )
 from sentry.eventstore.models import DEFAULT_SUBJECT_TEMPLATE
@@ -950,7 +949,6 @@ class DetailedProjectResponse(ProjectWithTeamResponseDict):
     relayPiiConfig: str | None
     builtinSymbolSources: list[str]
     dynamicSamplingBiases: list[dict[str, str | bool]]
-    dynamicSamplingMinimumSampleRate: bool
     eventProcessing: dict[str, bool]
     symbolSources: str
     isDynamicallySampled: bool
@@ -1101,9 +1099,6 @@ def serialize(
             "dynamicSamplingBiases": self.get_value_with_default(
                 attrs, "sentry:dynamic_sampling_biases"
             ),
-            "dynamicSamplingMinimumSampleRate": self.get_value_with_default(
-                attrs, "sentry:dynamic_sampling_minimum_sample_rate"
-            ),
             "eventProcessing": {
                 "symbolicationDegraded": False,
             },
@@ -1123,11 +1118,6 @@ def serialize(
             )
             data["tempestFetchDumps"] = attrs["options"].get("sentry:tempest_fetch_dumps", False)
 
-        if has_dynamic_sampling_minimum_sample_rate(obj.organization, user):
-            data["dynamicSamplingMinimumSampleRate"] = bool(
-                obj.get_option("sentry:dynamic_sampling_minimum_sample_rate")
-            )
-
         return data
 
     def format_options(self, attrs: Mapping[str, Any]) -> dict[str, Any]:

src/sentry/apidocs/examples/project_examples.py

@@ -152,7 +152,6 @@
         "filters:releases": "",
         "filters:error_messages": "",
         "feedback:branding": True,
-        "sentry:dynamic_sampling_minimum_sample_rate": True,
     },
     "digestsMinDelay": 180,
     "digestsMaxDelay": 600,
@@ -260,7 +259,6 @@
         {"id": "boostReplayId", "active": True},
         {"id": "recalibrationRule", "active": True},
     ],
-    "dynamicSamplingMinimumSampleRate": True,
     "eventProcessing": {"symbolicationDegraded": False},
     "symbolSources": "[]",
     "tempestFetchScreenshots": False,

src/sentry/conf/server.py

@@ -853,6 +853,8 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "sentry.integrations.vsts.tasks.kickoff_subscription_check",
     "sentry.integrations.tasks",
     "sentry.demo_mode.tasks",
+    "sentry.workflow_engine.tasks.workflows",
+    "sentry.workflow_engine.tasks.actions",
 )
 
 # Enable split queue routing
@@ -1023,6 +1025,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     Queue("release_registry", routing_key="release_registry"),
     Queue("seer.seer_automation", routing_key="seer.seer_automation"),
     Queue("workflow_engine.process_workflows", routing_key="workflow_engine.process_workflows"),
+    Queue("workflow_engine.trigger_action", routing_key="workflow_engine.trigger_action"),
 ]
 
 from celery.schedules import crontab
@@ -1516,6 +1519,8 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "sentry.uptime.rdap.tasks",
     "sentry.uptime.subscriptions.tasks",
     "sentry.workflow_engine.processors.delayed_workflow",
+    "sentry.workflow_engine.tasks.workflows",
+    "sentry.workflow_engine.tasks.actions",
     # Used for tests
     "sentry.taskworker.tasks.examples",
 )

src/sentry/dynamic_sampling/utils.py

@@ -25,18 +25,6 @@ def has_custom_dynamic_sampling(
     )
 
 
-def has_dynamic_sampling_minimum_sample_rate(
-    organization: Organization | None, actor: User | RpcUser | AnonymousUser | None = None
-) -> bool:
-    return (
-        organization is not None
-        and features.has(
-            "organizations:dynamic-sampling-minimum-sample-rate", organization, actor=actor
-        )
-        and has_custom_dynamic_sampling(organization, actor=actor)
-    )
-
-
 def is_project_mode_sampling(organization: Organization | None) -> bool:
     return (
         organization is not None

src/sentry/features/temporary.py

@@ -161,8 +161,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:issue-search-snuba", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable the new issue category mapping
     manager.add("organizations:issue-taxonomy", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # When enabled, search bars in the application will immediately search the query is modified instead of waiting for the enter key
-    manager.add("organizations:ui-search-on-change", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:metric-issue-poc", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("projects:metric-issue-creation", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     manager.add("organizations:issue-open-periods", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
@@ -515,6 +513,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:workflow-engine-rule-serializers", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable async processing of event workflows in a task rather than as part of post_process.
     manager.add("organizations:workflow-engine-post-process-async", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable async processing of actions in a task rather than as part of post_process.
+    manager.add("organizations:workflow-engine-action-trigger-async", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable EventUniqueUserFrequencyConditionWithConditions special alert condition
     manager.add("organizations:event-unique-user-frequency-condition-with-conditions", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Use spans instead of transactions for dynamic sampling calculations. This will become the new default.

src/sentry/integrations/opsgenie/actions/form.py

@@ -11,6 +11,7 @@
 from sentry.integrations.opsgenie.utils import get_team
 from sentry.integrations.services.integration import integration_service
 from sentry.integrations.services.integration.model import RpcOrganizationIntegration
+from sentry.integrations.types import IntegrationProviderSlug
 from sentry.utils.forms import set_field_choices
 
 INVALID_TEAM = 1
@@ -69,7 +70,7 @@ def _validate_team(self, team_id: str | None, integration_id: int | None) -> Non
                 "team": dict(self._teams).get(team_id),
             }
             integration = integration_service.get_integration(
-                integration_id=integration_id, provider="opsgenie"
+                integration_id=integration_id, provider=IntegrationProviderSlug.OPSGENIE.value
             )
             org_integration = integration_service.get_organization_integration(
                 integration_id=integration_id,

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

@@ -13,6 +13,7 @@
 )
 from sentry.integrations.opsgenie.utils import get_team
 from sentry.integrations.services.integration import integration_service
+from sentry.integrations.types import IntegrationProviderSlug
 from sentry.rules.actions import IntegrationEventAction
 from sentry.shared_integrations.exceptions import ApiError
 
@@ -25,7 +26,7 @@ class OpsgenieNotifyTeamAction(IntegrationEventAction):
         "Send a notification to Opsgenie account {account} and team {team} with {priority} priority"
     )
     prompt = "Send an Opsgenie notification"
-    provider = "opsgenie"
+    provider = IntegrationProviderSlug.OPSGENIE.value
     integration_key = "account"
 
     def __init__(self, *args, **kwargs):

src/sentry/integrations/opsgenie/client.py

@@ -9,6 +9,7 @@
 from sentry.integrations.on_call.metrics import OnCallInteractionType
 from sentry.integrations.opsgenie.metrics import record_event, record_lifecycle_termination_level
 from sentry.integrations.services.integration.model import RpcIntegration
+from sentry.integrations.types import IntegrationProviderSlug
 from sentry.models.group import Group
 from sentry.notifications.utils.links import create_link_to_workflow
 from sentry.notifications.utils.rules import get_key_from_rule_data
@@ -22,7 +23,7 @@
 
 
 class OpsgenieClient(ApiClient):
-    integration_name = "opsgenie"
+    integration_name = IntegrationProviderSlug.OPSGENIE.value
 
     def __init__(self, integration: RpcIntegration | Integration, integration_key: str) -> None:
         self.integration = integration
@@ -86,7 +87,7 @@ def build_issue_alert_payload(
         if group:
             payload["alias"] = f"sentry: {group.id}"
             payload["entity"] = group.culprit if group.culprit else ""
-            group_params = {"referrer": "opsgenie"}
+            group_params = {"referrer": IntegrationProviderSlug.OPSGENIE.value}
             if notification_uuid:
                 group_params["notification_uuid"] = notification_uuid
             rule_workflow_context = {}