sort output of partition_by_measure after set operations

Author: shellmayr

src/sentry/dynamic_sampling/tasks/boost_low_volume_projects.py

@@ -141,7 +141,7 @@ def partition_by_measure(
         metrics.incr(
             "dynamic_sampling.partition_by_measure.transactions", amount=len(filtered_org_ids)
         )
-        return {SamplingMeasure.TRANSACTIONS: list(filtered_org_ids)}
+        return {SamplingMeasure.TRANSACTIONS: sorted(filtered_org_ids)}
 
     span_org_ids = set(options.get("dynamic-sampling.measure.spans") or [])
     span_org_ids = span_org_ids & filtered_org_ids
@@ -157,8 +157,8 @@ def partition_by_measure(
         "dynamic_sampling.partition_by_measure.transactions", amount=len(transactions_org_ids)
     )
     return {
-        SamplingMeasure.SPANS: list(span_org_ids),
-        SamplingMeasure.TRANSACTIONS: list(transactions_org_ids),
+        SamplingMeasure.SPANS: sorted(span_org_ids),
+        SamplingMeasure.TRANSACTIONS: sorted(transactions_org_ids),
     }
 
 

tests/sentry/dynamic_sampling/tasks/test_boost_low_volume_projects.py

@@ -325,3 +325,38 @@ def test_partition_by_measure_with_span_feature_flag_disabled(self) -> None:
             assert SamplingMeasure.TRANSACTIONS in result
             assert SamplingMeasure.SPANS not in result
             assert result[SamplingMeasure.TRANSACTIONS] == [org.id]
+
+    def test_partition_by_measure_returns_sorted_output_multiple_orgs(self) -> None:
+        orgs = [self.create_organization(f"test-org{i}") for i in range(10)]
+        org_ids = [org.id for org in reversed(orgs)]
+
+        with self.options(
+            {
+                "dynamic-sampling.check_span_feature_flag": True,
+                "dynamic-sampling.measure.spans": [orgs[2].id, orgs[7].id, orgs[5].id],
+            }
+        ):
+            result = partition_by_measure(org_ids)
+
+            assert result[SamplingMeasure.SPANS] == sorted([orgs[2].id, orgs[7].id, orgs[5].id])
+            expected_transaction_orgs = sorted(
+                [org.id for org in orgs if org.id not in [orgs[2].id, orgs[7].id, orgs[5].id]]
+            )
+            assert result[SamplingMeasure.TRANSACTIONS] == expected_transaction_orgs
+
+    def test_partition_by_measure_returns_sorted_when_feature_disabled(self) -> None:
+        org1 = self.create_organization("test-org1")
+        org2 = self.create_organization("test-org2")
+        org3 = self.create_organization("test-org3")
+
+        org_ids = [org3.id, org1.id, org2.id]
+
+        with self.options(
+            {
+                "dynamic-sampling.check_span_feature_flag": False,
+            }
+        ):
+            result = partition_by_measure(org_ids)
+
+            assert result[SamplingMeasure.TRANSACTIONS] == sorted(org_ids)
+            assert SamplingMeasure.SPANS not in result