Skip to content

Fix grpc middleware interceptor not PostCall-ing when a streaming RPC with non-streaming server finishes successfully. #725

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Oct 31, 2024
Merged

Fix grpc middleware interceptor not PostCall-ing when a streaming RPC with non-streaming server finishes successfully. #725

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d6ee85
Fix grpc middleware interceptor not PostCall-ing when a streaming RPC…
Ormin Sep 28, 2024
776bfe9
add test, bump grpc
Ormin Oct 27, 2024
85459da
Rename client stream method
Ormin Oct 28, 2024
0496c87
Lint fixes
Ormin Oct 30, 2024
1f9bd2b
Even more linting
Ormin Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions interceptors/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func StreamClientInterceptor(reportable ClientReportable) grpc.StreamClientInter
reporter.PostCall(err, time.Since(r.startTime))
return nil, err
}
return &monitoredClientStream{ClientStream: clientStream, startTime: r.startTime, reporter: reporter}, nil
return &monitoredClientStream{ClientStream: clientStream, startTime: r.startTime, hasServerStream: desc.ServerStreams, reporter: reporter}, nil
}
}

Expand All @@ -47,6 +47,7 @@ type monitoredClientStream struct {
grpc.ClientStream

startTime time.Time
hasServerStream bool
reporter Reporter
}

Expand All @@ -62,13 +63,17 @@ func (s *monitoredClientStream) RecvMsg(m any) error {
err := s.ClientStream.RecvMsg(m)
s.reporter.PostMsgReceive(m, err, time.Since(start))

if err == nil {
return nil
}
var postErr error
if err != io.EOF {
postErr = err
if s.hasServerStream {
if err == nil {
return nil
}
var postErr error
if err != io.EOF {
postErr = err
}
s.reporter.PostCall(postErr, time.Since(s.startTime))
} else {
s.reporter.PostCall(err, time.Since(s.startTime))
}
s.reporter.PostCall(postErr, time.Since(s.startTime))
return err
return err
}
Loading