Revert "chore(dynamic-sampling): remove dynamic sampling minimum samplerate project option (#95104)"

This reverts commit 885e367.

Author: constantinius

src/sentry/api/endpoints/project_details.py

@@ -36,7 +36,11 @@
 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
+from sentry.dynamic_sampling.utils import (
+    has_custom_dynamic_sampling,
+    has_dynamic_sampling,
+    has_dynamic_sampling_minimum_sample_rate,
+)
 from sentry.grouping.enhancer import Enhancements
 from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.grouping.fingerprinting import FingerprintingRules, InvalidFingerprintingConfig
@@ -127,6 +131,7 @@ class ProjectMemberSerializer(serializers.Serializer):
         "copy_from_project",
         "targetSampleRate",
         "dynamicSamplingBiases",
+        "dynamicSamplingMinimumSampleRate",
         "tempestFetchScreenshots",
         "tempestFetchDumps",
         "autofixAutomationTuning",
@@ -220,6 +225,7 @@ 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(
@@ -428,6 +434,15 @@ 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
@@ -758,6 +773,14 @@ 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,6 +25,7 @@
 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
@@ -949,6 +950,7 @@ 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
@@ -1099,6 +1101,9 @@ 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,
             },
@@ -1118,6 +1123,11 @@ 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,6 +152,7 @@
         "filters:releases": "",
         "filters:error_messages": "",
         "feedback:branding": True,
+        "sentry:dynamic_sampling_minimum_sample_rate": True,
     },
     "digestsMinDelay": 180,
     "digestsMaxDelay": 600,
@@ -259,6 +260,7 @@
         {"id": "boostReplayId", "active": True},
         {"id": "recalibrationRule", "active": True},
     ],
+    "dynamicSamplingMinimumSampleRate": True,
     "eventProcessing": {"symbolicationDegraded": False},
     "symbolSources": "[]",
     "tempestFetchScreenshots": False,

src/sentry/dynamic_sampling/utils.py

@@ -25,6 +25,18 @@ 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/models/options/project_option.py

@@ -59,6 +59,7 @@
         "sentry:relay_pii_config",
         "sentry:dynamic_sampling",
         "sentry:dynamic_sampling_biases",
+        "sentry:dynamic_sampling_minimum_sample_rate",
         "sentry:target_sample_rate",
         "sentry:tempest_fetch_screenshots",
         "sentry:tempest_fetch_dumps",

src/sentry/projectoptions/defaults.py

@@ -193,6 +193,9 @@
 # Dynamic sampling rate in project-level "manual" configuration mode
 register(key="sentry:target_sample_rate", default=TARGET_SAMPLE_RATE_DEFAULT)
 
+# Dynamic sampling minimum sample rate
+register(key="sentry:dynamic_sampling_minimum_sample_rate", default=False)
+
 # Should tempest fetch screenshots for this project
 register(key="sentry:tempest_fetch_screenshots", default=False)
 

tests/sentry/api/endpoints/test_project_details.py

@@ -1874,6 +1874,130 @@ def test_put_new_dynamic_sampling_incorrect_rules_with_correct_flags(self):
                 "Error: Only 'id' and 'active' fields are allowed for bias."
             ]
 
+    @with_feature(
+        {
+            "organizations:dynamic-sampling-minimum-sample-rate": True,
+            "organizations:dynamic-sampling-custom": True,
+        }
+    )
+    def test_dynamic_sampling_minimum_sample_rate_with_feature(self):
+        """Test setting and getting dynamicSamplingMinimumSampleRate with feature flag enabled"""
+        # Test setting to True
+        response = self.get_success_response(
+            self.organization.slug,
+            self.project.slug,
+            method="put",
+            dynamicSamplingMinimumSampleRate=True,
+        )
+        assert response.data["dynamicSamplingMinimumSampleRate"] is True
+        assert self.project.get_option("sentry:dynamic_sampling_minimum_sample_rate") is True
+
+        # Test getting the field after setting it
+        get_response = self.get_success_response(
+            self.organization.slug, self.project.slug, method="get"
+        )
+        assert "dynamicSamplingMinimumSampleRate" in get_response.data
+        assert get_response.data["dynamicSamplingMinimumSampleRate"] is True
+
+        # Test setting to False
+        response = self.get_success_response(
+            self.organization.slug,
+            self.project.slug,
+            method="put",
+            dynamicSamplingMinimumSampleRate=False,
+        )
+        assert response.data["dynamicSamplingMinimumSampleRate"] is False
+        assert self.project.get_option("sentry:dynamic_sampling_minimum_sample_rate") is False
+
+        # Test getting the field after setting it to False
+        get_response = self.get_success_response(
+            self.organization.slug, self.project.slug, method="get"
+        )
+        assert "dynamicSamplingMinimumSampleRate" in get_response.data
+        assert get_response.data["dynamicSamplingMinimumSampleRate"] is False
+
+    def test_dynamic_sampling_minimum_sample_rate_without_feature(self):
+        """Test setting and getting dynamicSamplingMinimumSampleRate without feature flag"""
+        # Test setting the field without feature flag - should fail
+        self.get_error_response(
+            self.organization.slug,
+            self.project.slug,
+            method="put",
+            dynamicSamplingMinimumSampleRate=True,
+            status_code=400,
+        )
+
+        # Test that the field is not present in GET response without feature flag
+        get_response = self.get_success_response(
+            self.organization.slug, self.project.slug, method="get"
+        )
+        assert not get_response.data["dynamicSamplingMinimumSampleRate"]
+
+    @with_feature(
+        {
+            "organizations:dynamic-sampling-minimum-sample-rate": True,
+            "organizations:dynamic-sampling-custom": True,
+        }
+    )
+    def test_dynamic_sampling_minimum_sample_rate_validation(self):
+        """Test validation of dynamicSamplingMinimumSampleRate parameter types"""
+        # Ensure initial state is False
+        assert self.project.get_option("sentry:dynamic_sampling_minimum_sample_rate") is False
+
+        # Test with valid boolean value
+        response = self.get_success_response(
+            self.organization.slug,
+            self.project.slug,
+            method="put",
+            dynamicSamplingMinimumSampleRate=True,
+        )
+        assert response.data["dynamicSamplingMinimumSampleRate"] is True
+        assert self.project.get_option("sentry:dynamic_sampling_minimum_sample_rate") is True
+
+        # Test with valid string value
+        response = self.get_success_response(
+            self.organization.slug,
+            self.project.slug,
+            method="put",
+            dynamicSamplingMinimumSampleRate="true",
+        )
+        assert response.data["dynamicSamplingMinimumSampleRate"] is True
+        assert self.project.get_option("sentry:dynamic_sampling_minimum_sample_rate") is True
+
+        # Test with valid number value
+        response = self.get_success_response(
+            self.organization.slug,
+            self.project.slug,
+            method="put",
+            dynamicSamplingMinimumSampleRate=1,
+        )
+        assert response.data["dynamicSamplingMinimumSampleRate"] is True
+        assert self.project.get_option("sentry:dynamic_sampling_minimum_sample_rate") is True
+
+        # Test with invalid float value
+        response = self.get_error_response(
+            self.organization.slug,
+            self.project.slug,
+            method="put",
+            dynamicSamplingMinimumSampleRate=0.5,
+            status_code=400,
+        )
+        assert "Must be a valid boolean." in response.data["dynamicSamplingMinimumSampleRate"][0]
+        # Ensure the project option wasn't changed by invalid request
+        assert self.project.get_option("sentry:dynamic_sampling_minimum_sample_rate") is True
+
+        # Test with null/None value
+        response = self.get_error_response(
+            self.organization.slug,
+            self.project.slug,
+            method="put",
+            dynamicSamplingMinimumSampleRate=None,
+            status_code=400,
+        )
+        assert "This field may not be null." in response.data["dynamicSamplingMinimumSampleRate"][0]
+        # Ensure the project option wasn't changed by invalid request
+        assert self.project.get_option("sentry:dynamic_sampling_minimum_sample_rate") is True
+
     @with_feature("organizations:tempest-access")
     def test_put_tempest_fetch_screenshots(self):
         # assert default value is False, and that put request updates the value