desc: Replace regex name validation with functions #89
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
This allows dropping the dependency on regex, making the instrumentation library much more lightweight. This also fixes a bug with metric name validation, where an initial colon was incorrectly disallowed. See data model for correct format: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels This may be because the library closely follows the official Go library, which also had this issue. Refs tikv#85 Refs prometheus/client_golang#255
siddontang
reviewed
Nov 6, 2016
| static ref VALID_LABEL_NAME: Regex = Regex::new(r"^[a-zA-Z_][a-zA-Z0-9_]*$").unwrap(); | ||
| // Details of required format are at | ||
| // https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels | ||
| fn is_valid_metric_name(name: &str) -> bool { |
There was a problem hiding this comment.
I prefer adding some tests to test these function directly now:-)
siddontang
reviewed
Nov 7, 2016
| use errors::Error; | ||
|
|
||
| #[test] | ||
| fn test_is_valid_metric_name() { | ||
| assert_eq!(is_valid_metric_name(":"), true); |
There was a problem hiding this comment.
I prefer using tuple tables like:
let tbls = vec![("_", true), ("a", true), ("a-", false)];
for (name, valid) in tbls {
assert_eq!(is_valid_metric_name(name), valid);
}
|
LGTM Thanks @kamalmarhubi |
|
PTAL @overvenus |
overvenus
approved these changes
Nov 7, 2016
| ("a_b_9_d:x_", false), | ||
| ]; | ||
|
|
||
| for &(name, expected) in tbl.iter() { |
There was a problem hiding this comment.
Clippy complains explicit-iter-loop.
There was a problem hiding this comment.
maybe for (name, expected) in tbl is enough.
|
LGTM |
This was referenced Nov 11, 2016
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.
This allows dropping the dependency on regex, making the instrumentation
library much more lightweight.
This also fixes a bug with metric name validation, where an initial
colon was incorrectly disallowed. See data model for correct format:
https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
This may be because the library closely follows the official Go library,
which also had this issue.
Refs #85
Refs prometheus/client_golang#255