Add global labels value regression tests #191
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
A basic test to verify the converted bug in handling tags.
Refactor to allow running the same test logic with different inputs and expected results.
Add an e2e test for global labels values with multiple events. A batch of 2 events in input with different labels Values but same key should produce in output events with all different Values added to the same key.
endorama
force-pushed
the
global-labels-test
branch
from
d2abbb7
to
3f629f5
Compare
|
This PR adds 2 tests to catch a bug in Global Labels values marshalling/unmarshalling:
I expect test 1 to not fail in this branch, as the bug should have been fixed. What is puzzling me and I don't yet have an answer for is test 2 because:
I investigated a bit where this bug may be but haven't found it yet. |
carsonip
reviewed
Aug 14, 2024
We only retain the latest tags in a batch of events.
TestAggregateAndHarvest sort logic only used Metricset.Name. The latest test added to it s flappy with such a logic, as we are evaluating the same Metricset.Names in 2 different events with global labels with equal key and different values. Enhance the sorting logic to account for equal Metricset.Name and leverage labels (keys, Value and Values) in the lessFn.
When 2 events in a batch have the same service name but different tags we output 2 different sets of metrics, one for each tag set. This was not considered in the previous expected values.
endorama
commented
Aug 14, 2024
aggregators/aggregator_test.go
Outdated
Comment on lines
1132
to
1139
| if akeys[i] != bkeys[i] { | ||
| return akeys[i] < bkeys[i] | ||
| } | ||
|
|
||
| akey := akeys[i] | ||
| if a.Labels[akey].Value != "" && a.Labels[akey].Value != b.Labels[akey].Value { | ||
| return a.Labels[akey].Value < b.Labels[akey].Value | ||
| } |
There was a problem hiding this comment.
For reviewers: these tests are not directly used with the current tests. I added them anyway to make this sorting function more robust and prevent unexpected failures in the future if we update the test cases.
This reverts commit 49d0906. The same test is covered by TestMarshalEventGlobalLabelsRace, which also test for a possible race condition.
1pkg
reviewed
Aug 14, 2024
aggregators/aggregator_test.go
Outdated
| return a.Metricset.Name < b.Metricset.Name | ||
| } | ||
|
|
||
| // otherwise sort by sorted labels |
There was a problem hiding this comment.
nit: not sure if it ever can manifest, but probably worth checking that both a and b Labels slices have the same size, otherwise this sorting can panic if slices are not equal.
There was a problem hiding this comment.
I added a guard clause to prevent this, what do you think? 3b3a56b (#191)
1pkg
previously approved these changes
Aug 14, 2024
The previous implementation could panic if len(b) > len(a). Add a guard clause that limit iterating over label based on len(b). If len(a.Labels) > len(b.Labels), everything else equal we conclude that a > b.
carsonip
reviewed
Aug 19, 2024
Leverage a string comparison as a sort function, as used in https://github.com/elastic/apm-data/blob/81d77648a3b17d4e52859110e233e40683fcdfe3/input/otlp/metrics_test.go#L1146-L1148 Adds an additional tag to the test case to ensure expected results.
carsonip
approved these changes
Aug 20, 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.
Provide tests to ensure no regression will happen in handling global labels
Valuesfield.Closes #189