fix: infinite loop in index writer #3356
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
kolesnikovae
commented
Jun 14, 2024
Comment on lines
+71
to
+106
| func Test_LabelsBuilder_Unique(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| input Labels | ||
| add Labels | ||
| expected Labels | ||
| }{ | ||
| { | ||
| name: "duplicates in input are preserved", | ||
| input: Labels{ | ||
| {Name: "unique", Value: "yes"}, | ||
| {Name: "unique", Value: "no"}, | ||
| }, | ||
| add: Labels{ | ||
| {Name: "foo", Value: "bar"}, | ||
| {Name: "foo", Value: "baz"}, | ||
| }, | ||
| expected: Labels{ | ||
| {Name: "foo", Value: "baz"}, | ||
| {Name: "unique", Value: "yes"}, | ||
| {Name: "unique", Value: "no"}, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, test := range tests { | ||
| t.Run(test.name, func(t *testing.T) { | ||
| builder := NewLabelsBuilder(test.input) | ||
| for _, l := range test.add { | ||
| builder.Set(l.Name, l.Value) | ||
| } | ||
| assert.Equal(t, test.expected, builder.Labels()) | ||
| }) | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
I do not see any practical sense in fixing LabelsBuilder we borrowed from prometheus. Instead, in our case, a reusable map would work way better (and I'm 99.(9)% sure, more efficiently).
To be addressed in a separate PR.
kolesnikovae
commented
Jun 14, 2024
| @@ -60,6 +60,7 @@ func CreateProfileLabels(enforceOrder bool, p *profilev1.Profile, externalLabels | |||
| } else { | |||
| sort.Sort(lbs) | |||
| } | |||
| lbs = lbs.Unique() | |||
There was a problem hiding this comment.
Just in case: Unique works fine with LabelsEnforcedOrder
korniltsev
approved these changes
Jun 14, 2024
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.
Manual backporting of prometheus/prometheus#12505. Thanks @pracucci!
I only wonder why it took so long to surface.