[collectd 6] Allow arbitrary UTF-8 strings as label names. #4212
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
eero-t
requested changes
Dec 27, 2023
Done. |
Co-authored-by: Bjoern Hoehrmann <bjoern@hoehrmann.de>
* Import `"collectd.h"` for `<stdint.h>`.
* Make `decode` static, otherwise GCC complains about it reading from a
static variable.
This is arguably easier to read.
|
Rebased to resolve a merge conflict. |
eero-t
approved these changes
Dec 28, 2023
Comment on lines
-38
to
+48
| #define VALID_LABEL_CHARS \ | ||
| /* If these characters are used in resource attribute names or metric label | ||
| * names, they will not cause quotes to be printed when formatting the metric | ||
| * name. Resource attribute values and metric label values are always printed in | ||
| * quotes. */ | ||
| #define UNQUOTED_LABEL_CHARS \ | ||
| "abcdefghijklmnopqrstuvwxyz" \ | ||
| "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ | ||
| "0123456789_.-" | ||
| "0123456789_.-:" | ||
|
|
||
| /* Metric names must match the regex `[a-zA-Z_:][a-zA-Z0-9_:]*` */ | ||
| // instrument-name = ALPHA 0*254 ("_" / "." / "-" / "/" / ALPHA / DIGIT) | ||
| #define VALID_NAME_CHARS VALID_LABEL_CHARS "/" | ||
| #define VALID_NAME_CHARS \ | ||
| "abcdefghijklmnopqrstuvwxyz" \ | ||
| "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ | ||
| "0123456789_.-/" |
There was a problem hiding this comment.
After git grep abcdefghijklmnopqrstuvwxyz, I wonder whether it would make sense to add ALNUM_CHARS define that would be used by both of these:
#define UNQUOTED_LABEL_CHARS ALNUM_CHARS "_.-:"
#define VALID_NAME_CHARS ALNUM_CHARS "_.-/"
And also in:
write_prometheus.c:VALID_LABEL_CHARS/VALID_NAME_CHARSformat_stackdriver.c:metric_type()::valid_chars
But that could be another PR.
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.
Source: https://opentelemetry.io/docs/specs/semconv/general/attribute-naming/
ChangeLog: Daemon: All valid UTF-8 strings are now accepted as resource attribute name and metric label name.