exporter/collector/integrationtest: fix lack of sort expectFixture fields #445
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
|
cc: @dashpole |
zchee
changed the title
|
gotcha. This change should be don't flaky. |
zchee
commented
Jun 28, 2022
| @@ -72,14 +72,23 @@ func TestMetrics(t *testing.T) { | |||
| fixture, | |||
| expectFixture, | |||
| func(i, j int) bool { | |||
| return fixture.CreateTimeSeriesRequests[i].Name > fixture.CreateTimeSeriesRequests[j].Name | |||
| return fixture.CreateTimeSeriesRequests[i].Name < fixture.CreateTimeSeriesRequests[j].Name | |||
There was a problem hiding this comment.
change to not reverse sort
|
still fail... |
Fix: GoogleCloudPlatform#421 Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
|
added pre-sorting. |
|
/gcbrun |
damemi
reviewed
Jun 28, 2022
Comment on lines
+62
to
+70
| sort.Slice(expectFixture.CreateTimeSeriesRequests, func(i, j int) bool { | ||
| return expectFixture.CreateTimeSeriesRequests[i].Name < expectFixture.CreateTimeSeriesRequests[j].Name | ||
| }) | ||
| sort.Slice(expectFixture.CreateMetricDescriptorRequests, func(i, j int) bool { | ||
| return expectFixture.CreateMetricDescriptorRequests[i].Name < expectFixture.CreateMetricDescriptorRequests[j].Name | ||
| }) | ||
| sort.Slice(expectFixture.CreateServiceTimeSeriesRequests, func(i, j int) bool { | ||
| return expectFixture.CreateServiceTimeSeriesRequests[i].Name < expectFixture.CreateServiceTimeSeriesRequests[j].Name | ||
| }) |
There was a problem hiding this comment.
do you need these sorts? or does just adding the expectFixture sorts in the call to DiffMetricProtos fix it? Just seems like you're sorting twice
There was a problem hiding this comment.
yep, I don't know why, But needs sort twice. If removed, flaky again.
There was a problem hiding this comment.
I tried go test -run=30 ./..., if removed above line, fail on my local machine.
Comment on lines
+80
to
+88
| sort.Slice(fixture.CreateTimeSeriesRequests, func(i, j int) bool { | ||
| return fixture.CreateTimeSeriesRequests[i].Name < fixture.CreateTimeSeriesRequests[j].Name | ||
| }) | ||
| sort.Slice(fixture.CreateMetricDescriptorRequests, func(i, j int) bool { | ||
| return fixture.CreateMetricDescriptorRequests[i].Name < fixture.CreateMetricDescriptorRequests[j].Name | ||
| }) | ||
| sort.Slice(fixture.CreateServiceTimeSeriesRequests, func(i, j int) bool { | ||
| return fixture.CreateServiceTimeSeriesRequests[i].Name < fixture.CreateServiceTimeSeriesRequests[j].Name | ||
| }) |
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
|
@damemi try to remove less func |
|
@damemi seems passes?(still not sure why cmpopts not sorted... |
|
/gcbrun |
|
@damemi still running |
damemi
approved these changes
Jun 29, 2022
|
@zchee yeah that's a known bug right now in CI reporting, looks good to me, I'll merge |
|
@damemi Thanks! at least current main branch's tests are green. I hope this PR solved the flaky. |
damemi
added a commit
to damemi/opentelemetry-operations-go
that referenced
this pull request
Jul 26, 2022
Same issue as fixed in GoogleCloudPlatform#445, however that was just fixed for the test itself (the issue still existed for recording new fixtures)
damemi
added a commit
that referenced
this pull request
Jul 26, 2022
* Add Makefile target to generate test fixtures * update fixtures * Add sorting to metrics record fixtures Same issue as fixed in #445, however that was just fixed for the test itself (the issue still existed for recording new fixtures) * record fixtures
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.
exporter/collector/integrationtest: fix lack of sort
expectFixturefields.Fix: #421