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(relay): Implement factor based multi-matching #1790

Merged
merged 50 commits into from
Feb 14, 2023
Merged

feat(relay): Implement factor based multi-matching #1790

Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
ee1e1d0
feat(relay): Implement factor based multi-matching
iambriccardo Jan 30, 2023
f3fc373
Improve code
iambriccardo Jan 30, 2023
b731c30
Add new sampling algorithm
iambriccardo Jan 30, 2023
b2a8c02
Fix clippy
iambriccardo Jan 30, 2023
a341eae
Add first implementation of configuration merging
iambriccardo Jan 31, 2023
3686e7f
Add tests and improve logic
iambriccardo Jan 31, 2023
bc4b05d
Improve tests
iambriccardo Jan 31, 2023
8f4e0f7
Fix warnings
iambriccardo Jan 31, 2023
46a5756
Improve tests
iambriccardo Feb 1, 2023
b31d545
Remove override
iambriccardo Feb 1, 2023
6d45744
Improve code
iambriccardo Feb 1, 2023
9025a30
Merge branch 'master' into riccardo/feat/multi-matching-and-factors
iambriccardo Feb 1, 2023
a308493
Add clarified todos
iambriccardo Feb 1, 2023
de3b00f
Improve code
iambriccardo Feb 2, 2023
bd94d6e
Add rule ids match
iambriccardo Feb 2, 2023
1987baa
Improve code
iambriccardo Feb 2, 2023
85b3dee
Cleanup
iambriccardo Feb 3, 2023
c2e8dc7
Cleanup
iambriccardo Feb 3, 2023
412ba23
Fix some integration tests
iambriccardo Feb 3, 2023
1d60c9a
Fix tests
iambriccardo Feb 3, 2023
03237db
Fix tests
iambriccardo Feb 3, 2023
306e53d
Use assert_eq from similar asserts
iambriccardo Feb 3, 2023
c492ac4
Improve tests
iambriccardo Feb 3, 2023
5805180
Improve tests
iambriccardo Feb 3, 2023
cc571c8
Improve tests
iambriccardo Feb 3, 2023
cf19980
Improve tests
iambriccardo Feb 3, 2023
1a451d3
Rename sampling strategy
iambriccardo Feb 6, 2023
7f86a01
Add back sample_rate field
iambriccardo Feb 6, 2023
b356be1
Improve tests
iambriccardo Feb 6, 2023
84affe1
Improve tests
iambriccardo Feb 6, 2023
e810c8e
Remove backward comp
iambriccardo Feb 6, 2023
a95b664
Remove backward comp
iambriccardo Feb 6, 2023
6810e04
Add support for rules v2
iambriccardo Feb 7, 2023
a3281e0
Fix integration tests
iambriccardo Feb 7, 2023
9d9eb07
Fix deserialization
iambriccardo Feb 8, 2023
80fa369
Add comment
iambriccardo Feb 8, 2023
4ea39be
Add test
iambriccardo Feb 8, 2023
053a08d
Fix PR comments
iambriccardo Feb 8, 2023
5ac2cff
Improve code
iambriccardo Feb 9, 2023
f5d626f
Improve code
iambriccardo Feb 9, 2023
32d2377
Refactor
iambriccardo Feb 9, 2023
8f5636b
Merge branch 'master' into riccardo/feat/multi-matching-and-factors
iambriccardo Feb 9, 2023
14522ac
ref: simplify
jjbayer Feb 10, 2023
1784ba7
Improve pr
iambriccardo Feb 10, 2023
fb1faea
Merge branch 'master' into riccardo/feat/multi-matching-and-factors
iambriccardo Feb 10, 2023
1a7c78c
Fix old dependency
iambriccardo Feb 10, 2023
f2c7859
Fix tests
iambriccardo Feb 13, 2023
599f571
Add changelog
iambriccardo Feb 13, 2023
e33d6db
Improve logging
iambriccardo Feb 13, 2023
cee2258
Add test
iambriccardo Feb 14, 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
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions py/tests/test_processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,10 @@ def test_validate_sampling_configuration():
"rules": [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be rulesV2 now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, i didn't catch it as CI was blocked and integration tests weren't run again. Will fix!

{
"type": "trace",
"sampleRate": 0.7,
"samplingValue": {
"type": "sampleRate",
"value": 0.7
},
"condition": {
"op": "custom",
"name": "event.legacy_browser",
Expand All @@ -252,7 +255,10 @@ def test_validate_sampling_configuration():
},
{
"type": "trace",
"sampleRate": 0.9,
"samplingValue": {
"type": "sampleRate",
"value": 0.9
},
"condition": {
"op": "eq",
"name": "event.release",
Expand Down
1 change: 1 addition & 0 deletions relay-sampling/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ rand = "0.6.5"
rand_pcg = "0.1.2"
unicase = "2.6.0"
chrono = "0.4.11"
similar-asserts = "1.4.2"

[dev-dependencies]
insta = { version = "1.19.0", features = ["ron"] }
Loading