Skip to content

Commit 7c58e7c

Browse files
author
Riccardo Busetti
authored
fix(dynamic-sampling): Show rules v2 in config (#44569)
1 parent 32c6036 commit 7c58e7c

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/sentry/api/endpoints/project_details.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,10 @@ def get(self, request: Request, project) -> Response:
383383

384384
include_rules = request.GET.get("includeDynamicSamplingRules") == "1"
385385
if include_rules and is_active_superuser(request):
386-
data["dynamicSamplingRules"] = generate_rules(project)
386+
data["dynamicSamplingRules"] = {
387+
"rules": generate_rules(project),
388+
"rulesV2": generate_rules(project, True),
389+
}
387390
else:
388391
data["dynamicSamplingBiases"] = None
389392
data["dynamicSamplingRules"] = None

tests/sentry/api/endpoints/test_project_details.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,11 +1230,14 @@ def test_get_dynamic_sampling_rules_for_superuser_user(self, get_blended_sample_
12301230
includeDynamicSamplingRules=1,
12311231
)
12321232
# we expect 2 rules 1 for boostEnvironments and uniform rule
1233-
assert len(response.data["dynamicSamplingRules"]) == 2
1233+
assert len(response.data["dynamicSamplingRules"]["rules"]) == 2
1234+
assert len(response.data["dynamicSamplingRules"]["rulesV2"]) == 2
12341235
# 1001 is dev bias rule id
1235-
assert response.data["dynamicSamplingRules"][0]["id"] == 1001
1236+
assert response.data["dynamicSamplingRules"]["rules"][0]["id"] == 1001
1237+
assert response.data["dynamicSamplingRules"]["rulesV2"][0]["id"] == 1001
12361238
# 1000 uniform rule id
1237-
assert response.data["dynamicSamplingRules"][1]["id"] == 1000
1239+
assert response.data["dynamicSamplingRules"]["rules"][1]["id"] == 1000
1240+
assert response.data["dynamicSamplingRules"]["rulesV2"][1]["id"] == 1000
12381241

12391242
def test_get_dynamic_sampling_rules_disabled_if_no_feature_flag(self):
12401243
with Feature(

0 commit comments

Comments
 (0)