Skip to content
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

feat(protocol): Support comparisons in rule conditions on strings #2730

Merged
merged 11 commits into from
Nov 16, 2023
Merged

feat(protocol): Support comparisons in rule conditions on strings #2730

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6aedc4f
feat(protocol): Support comparisons in rule conditions on strings
jan-auer Nov 14, 2023
70df1d4
ref: Introduce versioning for dynamic sampling
jan-auer Nov 14, 2023
9bff636
ref(dynamic-config): Bump metrics and sampling config versions
jan-auer Nov 14, 2023
761e366
fix(py): Test name
jan-auer Nov 14, 2023
636d382
fix: Broken tests
jan-auer Nov 14, 2023
b94bfe7
test(integration): Move sampling config
jan-auer Nov 15, 2023
a910d4b
meta: Changelog
jan-auer Nov 15, 2023
55912c3
ref: Address review feedback
jan-auer Nov 15, 2023
cb7db8e
fix(integration): Update tests with simpler assertion
jan-auer Nov 15, 2023
367100e
Merge branch 'master' into feat/rule-condition-str-cmp
jan-auer Nov 16, 2023
730328d
meta: Changelog
jan-auer Nov 16, 2023
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
Prev Previous commit
Next Next commit
fix(integration): Update tests with simpler assertion
  • Loading branch information
@jan-auer
jan-auer committed Nov 15, 2023
commit cb7db8e8a0db78ba5464204e33474ace73b62d0d
74 changes: 9 additions & 65 deletions tests/integration/test_projectconfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,27 +268,8 @@ def test_unparsable_project_config(buffer_config, mini_sentry, relay):
public_key = mini_sentry.get_dsn_public_key(project_key)

# Config is broken and will produce the invalid project state.
config = mini_sentry.project_configs[project_key]["config"]
ds = config.setdefault("sampling", {})
ds.setdefault("version", 2)
ds.setdefault("rules", []).append(
{
"condition": {
"op": "and",
"inner": [
{"op": "glob", "name": "releases", "value": ["1.1.1", "1.1.2"]}
],
},
"samplingValue": {"strategy": "sampleRate", "value": 0.7},
"type": "trace",
"id": 1,
"timeRange": {
"start": "2022-10-10T00:00:00.000000Z",
"end": "2022-10-20T00:00:00.000000Z",
},
"decayingFn": {"function": "linear", "decayedSampleRate": 0.9},
}
)
config = mini_sentry.project_configs[project_key]
config["slug"] = 99 # ERROR: Number not allowed

body = {"publicKeys": [public_key]}
packed, signature = SecretKey.parse(relay.secret_key).pack(body)
Expand Down Expand Up @@ -318,32 +299,14 @@ def test_unparsable_project_config(buffer_config, mini_sentry, relay):
relay.send_event(project_key)
assert mini_sentry.captured_events.empty()
assert {str(e) for _, e in mini_sentry.test_failures} == {
f"Relay sent us event: error fetching project state {public_key}: missing field `type`",
f"Relay sent us event: error fetching project state {public_key}: invalid type: integer `99`, expected a string",
}
finally:
mini_sentry.test_failures.clear()

# Fix the config.
config = mini_sentry.project_configs[project_key]["config"]
config["sampling"]["version"] = 2
config["sampling"]["rules"] = [
{
"condition": {
"op": "and",
"inner": [
{"op": "glob", "name": "releases", "value": ["1.1.1", "1.1.2"]}
],
},
"samplingValue": {"type": "sampleRate", "value": 0.7},
"type": "trace",
"id": 1,
"timeRange": {
"start": "2022-10-10T00:00:00.000000Z",
"end": "2022-10-20T00:00:00.000000Z",
},
"decayingFn": {"type": "linear", "decayedValue": 0.9},
}
]
config = mini_sentry.project_configs[project_key]
config["slug"] = "some-slug"

try:
relay.send_event(project_key)
Expand All @@ -353,7 +316,7 @@ def test_unparsable_project_config(buffer_config, mini_sentry, relay):
assert not mini_sentry.test_failures or {
str(e) for _, e in mini_sentry.test_failures
} == {
f"Relay sent us event: error fetching project state {public_key}: missing field `type`",
f"Relay sent us event: error fetching project state {public_key}: invalid type: integer `99`, expected a string",
}
finally:
mini_sentry.test_failures.clear()
Expand Down Expand Up @@ -402,27 +365,8 @@ def test_cached_project_config(mini_sentry, relay):
assert not data["configs"][public_key]["disabled"]

# Introduce unparsable config.
config = mini_sentry.project_configs[project_key]["config"]
ds = config.setdefault("sampling", {})
ds.setdefault("version", 2)
ds.setdefault("rules", []).append(
{
"condition": {
"op": "and",
"inner": [
{"op": "glob", "name": "releases", "value": ["1.1.1", "1.1.2"]}
],
},
"samplingValue": {"type": "sampleRate", "value": 0.7},
"type": "trace",
"id": 1,
"timeRange": {
"start": "2022-10-10T00:00:00.000000Z",
"end": "2022-10-20T00:00:00.000000Z",
},
"decayingFn": {"function": "linear", "decayedSampleRate": 0.9},
}
)
config = mini_sentry.project_configs[project_key]
config["slug"] = 99 # ERROR: Number not allowed

# Give it a bit time for update to go through.
time.sleep(1)
Expand All @@ -437,7 +381,7 @@ def test_cached_project_config(mini_sentry, relay):
relay.send_event(project_key)
time.sleep(0.5)
assert {str(e) for _, e in mini_sentry.test_failures} == {
f"Relay sent us event: error fetching project state {public_key}: missing field `type`",
f"Relay sent us event: error fetching project state {public_key}: invalid type: integer `99`, expected a string",
}
finally:
mini_sentry.test_failures.clear()
Expand Down
Loading