Implement extended sampling #2384
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PROFeNoM
reviewed
Nov 23, 2023
PROFeNoM
reviewed
Nov 24, 2023
PROFeNoM
approved these changes
Nov 24, 2023
PROFeNoM
force-pushed
the
bob/extended-sampling
branch
from
75407c6
to
a6dfb4b
Compare
pierotibou
force-pushed
the
bob/extended-sampling
branch
from
4ff93ff
to
1453ab9
Compare
PROFeNoM
reviewed
Dec 11, 2023
Comment on lines
+9
to
+10
| bool dd_rule_matches(zval *pattern, zval *prop, int rulesFormat); | ||
| bool dd_glob_rule_matches(zval *pattern, zend_string* value); |
There was a problem hiding this comment.
Thinking about it, I may have put them in compat_string.[h|c], not to do an additional #include in priority_sampling.c, but this may be irrelevant 🤷
There was a problem hiding this comment.
I understand the will not to do additional includes, but compat_string seems not to be the good placeholder for this. As rule matching as nothing to see with string compatibility.
I could move to a dedicated file if we believe it's not meant in ddshared, but it wouldn't solve the extra incude part of the comment
9 tasks
Support for tags and resources in sampling rules Allows looking at arbitrary spans too, not only root spans Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
Sampling rules now use glob pattern matching. We used to have regexes, so it's a breaking change. To work around this, we add a new DD_TRACE_SAMPLING_RULES_FORMAT parameter. This parameter allows `regex` and `glob`. `regex` is the default for retrocompatibility reasons. That said we will drop this parameter in 1.0. Glob matching was already implemented for single span samplling so I just factorized some code.
There was one issue when you were using only `?`. I've added a circuit break that fixes that issue and also improve the perf of the algo in the case of patterns with no `*` and shorter than the length of the input string.
We test that sampling works on resources with the same glob patterns Also adds a test where we test all criterias in one sampling rule.
pierotibou
force-pushed
the
bob/extended-sampling
branch
from
8f7fc87
to
ef2686c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Sampling rules use glob pattern matching
We used to have regexes, so it would be a breaking change. To work around this, we add a new
DD_TRACE_SAMPLING_RULES_FORMATparameter. This parameter allowsregexandglob.regexis the default for retrocompatibility reasons. That said we will drop this parameter in 1.0.Glob matching algo
It already existed for single spans sampling. So we're just factorizing some code. The previous algo had a small bug so there's one commit dedicated to this fix.
Readiness checklist
Reviewer checklist