-
Notifications
You must be signed in to change notification settings - Fork 4.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
stats/opencensus: Fix flaky metrics test #6372
Merged
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -237,6 +237,23 @@ func distributionDataLatencyCount(vi *viewInformation, countWant int64, wantTags | |
return nil | ||
} | ||
|
||
// waitForServerCompletedRPCs waits until both Unary and Streaming metric rows | ||
// appear for server completed RPC's view (by checking for length of rows to be | ||
// 2). Returns an error if both the Unary and Streaming metric not found within | ||
// the passed context's timeout. | ||
func waitForServerCompletedRPCs(ctx context.Context, fe *fakeExporter) error { | ||
for ; ctx.Err() == nil; <-time.After(time.Millisecond) { | ||
arvindbr8 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
rows, err := view.RetrieveData("grpc.io/server/completed_rpcs") | ||
arvindbr8 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if err != nil { | ||
continue | ||
} | ||
if len(rows) == 2 { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Instead of a len check here, should we implicitly check for 1 Unary and 1 Streaming RPC metric? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Explicitly*. But sure. |
||
return nil | ||
} | ||
} | ||
return fmt.Errorf("timeout when waiting for Unary and Streaming rows to be present for \"grpc.io/server/completed_rpcs\"") | ||
} | ||
|
||
// TestAllMetricsOneFunction tests emitted metrics from gRPC. It registers all | ||
// the metrics provided by this package. It then configures a system with a gRPC | ||
// Client and gRPC server with the OpenCensus Dial and Server Option configured, | ||
|
@@ -987,10 +1004,13 @@ func (s) TestAllMetricsOneFunction(t *testing.T) { | |
}, | ||
}, | ||
} | ||
// Unregister all the views. Unregistering a view causes a synchronous | ||
// upload of any collected data for the view to any registered exporters. | ||
// Thus, after this unregister call, the exporter has the data to make | ||
// assertions on immediately. | ||
// Server Side stats.End call happens asynchronously for both Unary and | ||
// Streaming calls with respect to the RPC returning client side. Thus, add | ||
// a sync point at the global view package level for these two rows to be | ||
// recorded, which will be synchronously uploaded to exporters right after. | ||
if err := waitForServerCompletedRPCs(ctx, fe); err != nil { | ||
t.Fatal(err) | ||
} | ||
view.Unregister(allViews...) | ||
// Assert the expected emissions for each metric match the expected | ||
// emissions. | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unused function argument: you may want to remove
fe *fakeExporter
fromwaitForServerCompletedRPCs
function.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, great catch. Deleted.