Add validation to include/exlude jobs regular expressions#450
Merged
nikita-tkachenko-datadog merged 3 commits intoJan 13, 2025
Merged
Conversation
nikita-tkachenko-datadog
added
the
changelog/Fixed
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| } | ||
|
|
||
| @RequirePOST | ||
| public FormValidation doCheckIncluded(@QueryParameter("included") final String included) { |
Check warning
Code scanning / Jenkins Security Scan
Stapler: Missing permission check
| } | ||
|
|
||
| @RequirePOST | ||
| public FormValidation doCheckExcluded(@QueryParameter("excluded") final String excluded) { |
Check warning
Code scanning / Jenkins Security Scan
Stapler: Missing permission check
nikita-tkachenko-datadog
force-pushed
the
nikita-tkachenko/configuration-refactoring-updated
branch
from
September 18, 2024 15:20
9efa308 to
94211bd
Compare
nikita-tkachenko-datadog
force-pushed
the
nikita-tkachenko/validate-include-exlude-regex
branch
4 times, most recently
from
September 19, 2024 15:23
3db94aa to
98e20c1
Compare
nikita-tkachenko-datadog
force-pushed
the
nikita-tkachenko/configuration-refactoring-updated
branch
from
October 11, 2024 11:01
5f3a210 to
d20b98e
Compare
nikita-tkachenko-datadog
force-pushed
the
nikita-tkachenko/configuration-refactoring-updated
branch
from
November 20, 2024 10:03
d20b98e to
b8e26e6
Compare
nikita-tkachenko-datadog
force-pushed
the
nikita-tkachenko/configuration-refactoring-updated
branch
2 times, most recently
from
December 5, 2024 15:55
0404aa5 to
0260867
Compare
Base automatically changed from
nikita-tkachenko/configuration-refactoring-updated
to
master
December 11, 2024 09:53
nikita-tkachenko-datadog
force-pushed
the
nikita-tkachenko/validate-include-exlude-regex
branch
from
December 18, 2024 16:24
f362037 to
f5fcdc1
Compare
nikita-tkachenko-datadog
marked this pull request as ready for review
January 7, 2025 11:13
nikita-tkachenko-datadog
added
changelog/Added
drodriguezhdez
left a comment
drodriguezhdez
left a comment
Collaborator
There was a problem hiding this comment.
Dropped some comments
| String excludedEnvVar = System.getenv(EXCLUDED_PROPERTY); | ||
| if(StringUtils.isBlank(excludedEnvVar)){ | ||
| if (StringUtils.isNotBlank(excludedEnvVar)) { | ||
| this.excluded = DatadogUtilities.cstrToList(excludedEnvVar, Pattern::compile); |
Collaborator
There was a problem hiding this comment.
If a user has already a stored value that does not compile, this will throw an exception and won't be able to load the configuration, right?
Is it possible to have a unit test to check how this behaves?
Collaborator
Author
There was a problem hiding this comment.
This is a good point, added a unit test to ensure the config can still be loaded in this case
| this.excluded = DatadogUtilities.cstrToList(jobs, Pattern::compile); | ||
| } | ||
|
|
||
| public boolean isJobIncluded(@Nonnull final String jobName) { |
Collaborator
There was a problem hiding this comment.
Don't we need a isJobExcluded somewhere?
Collaborator
Author
There was a problem hiding this comment.
Yep, it's there on line 566
drodriguezhdez
approved these changes
Jan 13, 2025
nikita-tkachenko-datadog
deleted the
nikita-tkachenko/validate-include-exlude-regex
branch
January 13, 2025 16:01
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Requirements for Contributing to this repository
What does this PR do?
Adds validation to regular expressions for including/excluding jobs from tracing: regexes that cannot be compiled will not be saved.
Also updates the configuration to store compiled regexes, rather than strings (otherwise splitting the string and compiling the expressions is done on every job listener invocation, which is computationally expensive).
Description of the Change
Alternate Designs
Possible Drawbacks
Verification Process
Additional Notes
Release Notes
Review checklist (to be filled by reviewers)
changelog/label attached. If applicable it should have thebackward-incompatiblelabel attached.do-not-merge/label attached.kind/andseverity/labels attached at least.