chore(dynamic-sampling): remove org recalibration feature flag (#102207)

Author: shellmayr

src/sentry/dynamic_sampling/rules/combine.py

@@ -26,11 +26,7 @@ def get_relay_biases_combinator(organization: Organization) -> BiasesCombinator:
 
     default_combinator.add(RuleType.BOOST_REPLAY_ID_RULE, BoostReplayIdBias())
     default_combinator.add(RuleType.BOOST_ENVIRONMENTS_RULE, BoostEnvironmentsBias())
-    default_combinator.add_if(
-        RuleType.RECALIBRATION_RULE,
-        RecalibrationBias(),
-        lambda: features.has("organizations:ds-org-recalibration", organization, actor=None),
-    )
+    default_combinator.add(RuleType.RECALIBRATION_RULE, RecalibrationBias())
     default_combinator.add(RuleType.BOOST_LATEST_RELEASES_RULE, BoostLatestReleasesBias())
     default_combinator.add(
         RuleType.BOOST_LOW_VOLUME_TRANSACTIONS_RULE, BoostLowVolumeTransactionsBias()

src/sentry/features/temporary.py

@@ -132,8 +132,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:migrate-transaction-queries-to-spans", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable new cell actions styling and features for tables that use the component
     manager.add("organizations:discover-cell-actions-v2", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable the org recalibration
-    manager.add("organizations:ds-org-recalibration", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=False)
     # Enable custom dynamic sampling rates
     manager.add("organizations:dynamic-sampling-custom", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable dynamic sampling minimum sample rate

tests/sentry/dynamic_sampling/test_generate_rules.py

@@ -115,19 +115,18 @@ def test_generate_rules_return_only_always_allowed_rules_if_sample_rate_is_100_a
         0.5,
     )
 
-    with Feature("organizations:ds-org-recalibration"):
-        assert generate_rules(default_old_project) == [
-            {
-                "condition": {"inner": [], "op": "and"},
-                "id": 1000,
-                "samplingValue": {"type": "sampleRate", "value": 1.0},
-                "type": "trace",
-            },
-        ]
-        get_blended_sample_rate.assert_called_with(
-            organization_id=default_old_project.organization.id, project=default_old_project
-        )
-        _validate_rules(default_old_project)
+    assert generate_rules(default_old_project) == [
+        {
+            "condition": {"inner": [], "op": "and"},
+            "id": 1000,
+            "samplingValue": {"type": "sampleRate", "value": 1.0},
+            "type": "trace",
+        },
+    ]
+    get_blended_sample_rate.assert_called_with(
+        organization_id=default_old_project.organization.id, project=default_old_project
+    )
+    _validate_rules(default_old_project)
 
 
 @django_db_all
@@ -647,22 +646,21 @@ def test_generate_rules_return_uniform_rules_and_recalibrate_orgs_rule(
         default_factor,
     )
 
-    with Feature("organizations:ds-org-recalibration"):
-        assert generate_rules(default_old_project) == [
-            {
-                "condition": {"inner": [], "op": "and"},
-                "id": 1004,
-                "samplingValue": {"type": "factor", "value": default_factor},
-                "type": "trace",
-            },
-            {
-                "condition": {"inner": [], "op": "and"},
-                "id": 1000,
-                "samplingValue": {"type": "sampleRate", "value": 0.1},
-                "type": "trace",
-            },
-        ]
-        _validate_rules(default_project)
+    assert generate_rules(default_old_project) == [
+        {
+            "condition": {"inner": [], "op": "and"},
+            "id": 1004,
+            "samplingValue": {"type": "factor", "value": default_factor},
+            "type": "trace",
+        },
+        {
+            "condition": {"inner": [], "op": "and"},
+            "id": 1000,
+            "samplingValue": {"type": "sampleRate", "value": 0.1},
+            "type": "trace",
+        },
+    ]
+    _validate_rules(default_project)
 
 
 @django_db_all
@@ -997,9 +995,7 @@ def test_generate_rules_project_mode(
     )
     default_old_project.update_option("sentry:target_sample_rate", 0.2)
 
-    with Feature(
-        {"organizations:ds-org-recalibration": True, "organizations:dynamic-sampling-custom": True}
-    ):
+    with Feature({"organizations:dynamic-sampling-custom": True}):
         assert generate_rules(default_old_project) == [
             {
                 "condition": {"inner": [], "op": "and"},

tests/sentry/relay/test_config.py

@@ -471,12 +471,6 @@ def test_project_config_with_all_biases_enabled(
                 "samplingValue": {"type": "sampleRate", "value": 1.0},
                 "type": "trace",
             },
-            # {
-            #     "condition": {"inner": [], "op": "and"},
-            #     "id": 1004,
-            #     "samplingValue": {"type": "factor", "value": default_factor},
-            #     "type": "trace",
-            # },
             {
                 "samplingValue": {"type": "sampleRate", "value": 1.0},
                 "type": "trace",
@@ -492,6 +486,12 @@ def test_project_config_with_all_biases_enabled(
                 },
                 "id": 1001,
             },
+            {
+                "condition": {"inner": [], "op": "and"},
+                "id": 1004,
+                "samplingValue": {"type": "factor", "value": default_factor},
+                "type": "trace",
+            },
             {
                 "samplingValue": {"type": "factor", "value": 1.5},
                 "type": "trace",