Correct nh sample span structure and parsing #1082
Merged
Conversation
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
Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it>
…le-span-structure Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it>
… be None Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it>
Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it>
Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it>
Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it>
krajorama
reviewed
Jan 10, 2025
|
|
||
|
|
||
| def _compose_spans(spans, spans_name): | ||
| try: |
There was a problem hiding this comment.
nit: i'd prefer early return instead of exception handling
if spans_name not in spans:
return None
Comment on lines
349
to
351
| pos_spans_text = spans[spans_name] | ||
| pos_spans = [] | ||
| for start, end in pos_spans_text: |
There was a problem hiding this comment.
That _text is Hungarian notation :)
Suggested change
| pos_spans_text = spans[spans_name] | |
| pos_spans = [] | |
| for start, end in pos_spans_text: | |
| for start, end in spans[spans_name]: |
| re_deltas = re.compile(r'(positive_deltas|negative_deltas):\[(-?\d+(?:,-?\d+)*)\]') | ||
|
|
||
| items = dict(re.findall(pattern, text)) | ||
| spans = dict(re_spans.findall(text)) | ||
| matches = re_spans.findall(text) | ||
| spans = {} |
There was a problem hiding this comment.
Adding this here makes the code a little inconsistent, you do the text->data conversion here for spans, but in a helper function for the deltas. Let's move this into the helper function.
Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it>
krajorama
approved these changes
Jan 16, 2025
| @@ -364,6 +336,31 @@ def _parse_nh_struct(text): | |||
| pos_deltas=pos_deltas, | |||
| neg_deltas=neg_deltas | |||
| ) | |||
|
|
|||
|
|
|||
| def _compose_spans(span_matches, spans_name): | |||
There was a problem hiding this comment.
nit: might want to add a comment what this does, because the list comprehension takes a minute to understand :)
There was a problem hiding this comment.
Yes, that makes sense! I've also added comments to the other less complicated function, while I was at it :D
csmarchbanks
approved these changes
Jan 16, 2025
Signed-off-by: Arianna Vespri <arianna.vespri@yahoo.it>
csmarchbanks
approved these changes
Jan 17, 2025
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.
While working on the exposition part of the issue prometheus/OpenMetrics#279, I realized I made a mistake in the code relative to the NH spans and deltas parsing, in that I was not taking into account that span lists have no fixed length, span lists can be absent and that deltas can consequently also not be there. I thought I’d get this right before continuing on the rest of the work.