Add missing fields in overrides API merged response #3018
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
yvrhdn
requested review from
joe-elliott,
annanay25,
mdisibio,
mapno,
zalegrala,
electron0zero,
ie-pham and
stoewer
as code owners
mdisibio
approved these changes
Oct 13, 2023
| limitsJson, err := json.MarshalIndent(limits, "", " ") | ||
| assert.NoError(t, err) | ||
|
|
||
| expectedJson := `{ |
There was a problem hiding this comment.
Does this test pick up if we forget to add a new field to limitsFromOverrides ? I think it does since the output json will get a null but just checking.
There was a problem hiding this comment.
It does because overrides.MetricsGeneratorOverrides will set the new value to the zero value which will be omitted in the json and you get a diff.
This what happens if I remove collection_interval from both the input overrides and the expected result:
Diff:
--- Expected
+++ Actual
@@ -9,2 +9,3 @@
"disable_collection": true,
+ "collection_interval": "0s",
"processor": {
Test: Test_limitsFromOverrides
--- FAIL: Test_limitsFromOverrides (0.00s)
added 2 commits
October 13, 2023 15:22
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.
What this PR does:
While reviewing #3012 I noticed some fields weren't being populated correctly. This was a massive oversight on my part as the PR adding the merge logic (#2915) was merged during the same time window as PRs adding extending the limits struct (#2899, #2928, #2945, ).
When merged the code got merged without issues but the merge function wasn't updated.
Fields that weren't being populated:
metrics_generator.collection_intervalmetrics_generator.service_graphs.histogram_bucketsmetrics_generator.span_metrics.histogram_bucketsmetrics_generator.span_metrics.target_info_excluded_dimensionsBefore this change they would always be returned from the result even though a value would be set.
Which issue(s) this PR fixes:
Fixes #Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]