Fix hubble metrics label ordering with contextOptions #21732
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
maintainer-s-little-helper
bot
added
the
dont-merge/needs-release-note-label
chancez
force-pushed
the
pr/chancez/hubble_metrics_label_order
branch
from
b23c843
to
6f6f8bc
Compare
|
The commit messages are empty. Would you mind adding the context around these changes from your PR description to the commits as well?
If the PR fixes something that isn't yet in any release, then you should use the |
rolinh
added
the
release-note/misc
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
rolinh
added
area/metrics
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
rolinh
added
sig/hubble
maintainer-s-little-helper
bot
removed
the
dont-merge/needs-release-note-label
|
/test Job 'Cilium-PR-K8s-1.24-kernel-4.19' failed: Click to show.Test NameFailure OutputIf it is a flake and a GitHub issue doesn't already exist to track it, comment |
michi-covalent
approved these changes
Oct 14, 2022
|
/mlh new-flake Cilium-PR-K8s-1.24-kernel-4.19 👍 created #21740 |
|
/test-1.24-4.19 |
chancez
force-pushed
the
pr/chancez/hubble_metrics_label_order
branch
from
6f6f8bc
to
9f6bdec
Compare
Label names and label values need to be in the same order. Context label names were at the end of the labels list, but at the beginning of the label values so the label names were mismatched with their label values. Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com>
Label names and label values need to be in the same order. Refactor DNS metrics handler to be a bit simpler, with less branches and fix the label order mismatch between label names and label values. Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com>
Label names and label values need to be in the same order. Label names were at the end of the list while hte values were at the beginning, this fixes it so they both are at the beginning. Signed-off-by: Chance Zibolski <chance.zibolski@gmail.com>
chancez
force-pushed
the
pr/chancez/hubble_metrics_label_order
branch
from
9f6bdec
to
8300d26
Compare
|
/test |
|
marking ready to merge, 2 approvals from sig-hubble members. |
michi-covalent
added
the
ready-to-merge
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 fixes an issue introduced by d4d7368 in #21079 where metrics labels for drop, dns, and tcp metrics are incorrect when using any contextOptions. This is because the order labels are registered in, was different from the order the labels are used when incrementing the counters.
I had to refactor DNS a little bit because the logic was so complicated, and I tried to make it less "stateful" with the labels, which is part of the reason that one got done incorrectly in the first place. drop/tcp were simpler.
I'm not sure this actually needs a release note because I don't think the contextLabels PR has made it into a release yet, but I added one anyways.