Skip to content

fix(dynamic-sampling): Show rules v2 in config #44569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2023
Merged

fix(dynamic-sampling): Show rules v2 in config #44569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/sentry/api/endpoints/project_details.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,10 @@ def get(self, request: Request, project) -> Response:

include_rules = request.GET.get("includeDynamicSamplingRules") == "1"
if include_rules and is_active_superuser(request):
data["dynamicSamplingRules"] = generate_rules(project)
data["dynamicSamplingRules"] = {
"rules": generate_rules(project),
"rulesV2": generate_rules(project, True),
}
else:
data["dynamicSamplingBiases"] = None
data["dynamicSamplingRules"] = None
Expand Down
9 changes: 6 additions & 3 deletions tests/sentry/api/endpoints/test_project_details.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,11 +1230,14 @@ def test_get_dynamic_sampling_rules_for_superuser_user(self, get_blended_sample_
includeDynamicSamplingRules=1,
)
# we expect 2 rules 1 for boostEnvironments and uniform rule
assert len(response.data["dynamicSamplingRules"]) == 2
assert len(response.data["dynamicSamplingRules"]["rules"]) == 2
assert len(response.data["dynamicSamplingRules"]["rulesV2"]) == 2
# 1001 is dev bias rule id
assert response.data["dynamicSamplingRules"][0]["id"] == 1001
assert response.data["dynamicSamplingRules"]["rules"][0]["id"] == 1001
assert response.data["dynamicSamplingRules"]["rulesV2"][0]["id"] == 1001
# 1000 uniform rule id
assert response.data["dynamicSamplingRules"][1]["id"] == 1000
assert response.data["dynamicSamplingRules"]["rules"][1]["id"] == 1000
assert response.data["dynamicSamplingRules"]["rulesV2"][1]["id"] == 1000

def test_get_dynamic_sampling_rules_disabled_if_no_feature_flag(self):
with Feature(
Expand Down