Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions reporter/grpc_upload_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ func (c *GrpcUploadClient) grpcUpload(ctx context.Context, uploadInstructions *d
return 0, fmt.Errorf("initiate upload: %w", err)
}

defer func() {
if stream != nil {
stream.CloseAndRecv()
}
}()

err = stream.Send(&debuginfopb.UploadRequest{
Data: &debuginfopb.UploadRequest_Info{
Info: &debuginfopb.UploadInfo{
Expand Down
16 changes: 15 additions & 1 deletion reporter/parca_reporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -1001,6 +1001,7 @@ func (r *ParcaReporter) reportDataToBackend(ctx context.Context, buf *bytes.Buff
if err != nil {
return err
}
defer client.CloseSend()

if err := client.Send(&profilestorepb.WriteRequest{
Record: buf.Bytes(),
Expand Down Expand Up @@ -1085,7 +1086,20 @@ func (r *ParcaReporter) reportDataToBackend(ctx context.Context, buf *bytes.Buff
}
r.stacktraceWriteRequestBytes.Add(float64(buf.Len()))

return client.CloseSend()
// CloseSend() is deferred at the top of this function.
// Drain any remaining responses so the gRPC helper goroutine
// (newClientStreamWithParams.func4) can exit.
for {
_, err := client.Recv()
if err == io.EOF {
break
}
if err != nil {
return err
}
}

return nil
}

func (r *ParcaReporter) writeCommonLabels(w *SampleWriter, rows uint64) {
Expand Down