transport: surface data when received non-grpc header, end stream without trailers by chengxilo · Pull Request #9217 · grpc/grpc-go

chengxilo · 2026-07-01T21:58:35Z

Follow up: #8929

Related to: #7406 (comment) . I don't have the captured packages for reference. But according to the code, I think what I fixed is the only code path that produces codes.Internal / "server closed the stream without sending trailers" when nonGRPCStatus is set.

With this change, if we were collecting non-gRPC response data, and received an end of stream while there is no trailers, finalize the status with whatever body we've buffered so far instead of discarding it. I added tests in both internal/transport_test.go and test/end2end_test.go to test it.

RELEASE NOTES:

client: Fix non-gRPC error being discarded when END_STREAM arrives without trailers

If we were collecting non-gRPC response data, finalize the status with whatever body we've buffered so far instead of discarding it. Add tests in both internal/transport_test.go and test/end2end_test.go to test it.

codecov · 2026-07-01T22:01:52Z

Codecov Report

❌ Patch coverage is 54.54545% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 83.14%. Comparing base (116e945) to head (7df5840).
⚠️ Report is 16 commits behind head on master.

Files with missing lines	Patch %	Lines
internal/transport/http2_client.go	54.54%	4 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #9217      +/-   ##
==========================================
+ Coverage   83.03%   83.14%   +0.11%     
==========================================
  Files         422      422              
  Lines       34826    34827       +1     
==========================================
+ Hits        28917    28958      +41     
+ Misses       4407     4381      -26     
+ Partials     1502     1488      -14

Files with missing lines	Coverage Δ
internal/transport/http2_client.go	`92.62% <54.54%> (+0.29%)`	⬆️

... and 27 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

drigz · 2026-07-03T07:32:22Z

I can confirm this works:

Error: API call failed: rpc error: code = Unauthenticated desc = unexpected HTTP status code received from server: 401 (Unauthorized); transport: received unexpected content-type "text/html"
data: "<html>\r\n<head><title>401 Authorization Required</title></head>\r\n<body>\r\n<center><h1>401 Authorization Required</h1></center>\r\n<hr><center>nginx</center>\r\n</body>\r\n</html>\r\n"

Thank you for the quick followup! Looking forward to pulling the next release in and enjoying more discoverable error messages.

chengxilo · 2026-07-03T16:18:18Z

I can confirm this works:

Error: API call failed: rpc error: code = Unauthenticated desc = unexpected HTTP status code received from server: 401 (Unauthorized); transport: received unexpected content-type "text/html"
data: "<html>\r\n<head><title>401 Authorization Required</title></head>\r\n<body>\r\n<center><h1>401 Authorization Required</h1></center>\r\n<hr><center>nginx</center>\r\n</body>\r\n</html>\r\n"

Thank you for the quick followup! Looking forward to pulling the next release in and enjoying more discoverable error messages.

Great!!! Thank you so much for your quick followup too! ❤️❤️❤️

chengxilo · 2026-07-14T03:29:38Z

Sorry I forgot update the PR title.

drigz · 2026-07-14T15:38:53Z

@easwars Any chance this fix could be considered for a cherry-pick into 1.82?

I couldn't find a doc with guidelines for cherry-pick requirements - but since I ran into this while debugging a 500 error today I thought it might be worth asking.

easwars · 2026-07-15T00:14:45Z

@drigz : If we get this reviewed and merged in time before the 1.83 release, which should happen sometime next week, we can consider cherry-picking it.

chengxilo · 2026-07-24T06:31:11Z

All issues addressed. Additionally, I removed the redundant seenHeaders channel in TestNonGRPCStatus_EmptyDataEndStream.

arjan-bal · 2026-07-27T09:28:15Z

/gemini review

gemini-code-assist

Code Review

This pull request ensures that when a non-gRPC response is followed by an empty DATA frame with END_STREAM, the client correctly surfaces the original non-gRPC error instead of discarding the collected buffer and returning an internal error. This is achieved by refactoring the handleData method in http2_client.go to process non-gRPC status checks outside of the data size block and only processing data frames when size > 0. Corresponding unit and end-to-end tests have been added and updated to verify this behavior. There are no review comments to address, and the changes look solid.

arjan-bal

LGTM! Adding a second reviewer.

easwars · 2026-07-31T17:38:30Z

@chengxilo : Thanks for your contribution!

fix: surface data when end stream without trailers

fbb26c5

If we were collecting non-gRPC response data, finalize the status with whatever body we've buffered so far instead of discarding it. Add tests in both internal/transport_test.go and test/end2end_test.go to test it.

chengxilo changed the title ~~fix: surface data when end stream without trailers~~ fix: surface data when received non-grpc header, end stream without trailers Jul 1, 2026

chengxilo mentioned this pull request Jul 3, 2026

Surface response body when receiving an unexpected status code and content-type #7406

Closed

chengxilo changed the title ~~fix: surface data when received non-grpc header, end stream without trailers~~ transport: surface data when received non-grpc header, end stream without trailers Jul 14, 2026

easwars added this to the 1.84 Release milestone Jul 14, 2026

easwars added the Type: Bug label Jul 15, 2026

easwars self-assigned this Jul 15, 2026

arjan-bal reviewed Jul 23, 2026

View reviewed changes

Comment thread internal/transport/http2_client.go Outdated

arjan-bal assigned chengxilo Jul 23, 2026

arjan-bal reviewed Jul 23, 2026

View reviewed changes

Comment thread test/end2end_test.go Outdated

arjan-bal reviewed Jul 23, 2026

View reviewed changes

Comment thread internal/transport/transport_test.go

fix(transport): address review comments

4408566

Merge branch 'master' into follow-up-surface-non-grpc-data

7df5840

arjan-bal assigned arjan-bal and unassigned easwars and chengxilo Jul 24, 2026

gemini-code-assist Bot reviewed Jul 27, 2026

View reviewed changes

arjan-bal approved these changes Jul 27, 2026

View reviewed changes

arjan-bal assigned easwars and unassigned arjan-bal Jul 27, 2026

arjan-bal requested a review from easwars July 27, 2026 09:30

Sahilb315 mentioned this pull request Jul 27, 2026

fix(container): cut image vulnerabilities with x dep bumps and base image refresh safedep/pmg#394

Merged

easwars approved these changes Jul 31, 2026

View reviewed changes

easwars merged commit d7025c5 into grpc:master Jul 31, 2026
14 checks passed

chengxilo deleted the follow-up-surface-non-grpc-data branch August 1, 2026 22:05

This was referenced Aug 17, 2026

fix: refresh the access token before it expires netboxlabs/diode-sdk-go#84

Merged

chore(deps): bump github.com/netboxlabs/diode-sdk-go to v1.11.1 netboxlabs/orb-agent#538

Merged

Navigation Menu

transport: surface data when received non-grpc header, end stream without trailers - #9217

transport: surface data when received non-grpc header, end stream without trailers#9217
easwars merged 3 commits into
grpc:masterfrom
chengxilo:follow-up-surface-non-grpc-data

chengxilo commented Jul 1, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Jul 1, 2026 •

edited

Loading

Uh oh!

drigz commented Jul 3, 2026 •

edited

Loading

Uh oh!

chengxilo commented Jul 3, 2026

Uh oh!

chengxilo commented Jul 14, 2026

Uh oh!

drigz commented Jul 14, 2026

Uh oh!

easwars commented Jul 15, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chengxilo commented Jul 24, 2026

Uh oh!

arjan-bal commented Jul 27, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

arjan-bal left a comment

Uh oh!

Uh oh!

easwars commented Jul 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

chengxilo commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

drigz commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chengxilo commented Jul 3, 2026

Uh oh!

chengxilo commented Jul 14, 2026

Uh oh!

drigz commented Jul 14, 2026

Uh oh!

easwars commented Jul 15, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chengxilo commented Jul 24, 2026

Uh oh!

arjan-bal commented Jul 27, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

arjan-bal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

easwars commented Jul 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

chengxilo commented Jul 1, 2026 •

edited

Loading

codecov Bot commented Jul 1, 2026 •

edited

Loading

drigz commented Jul 3, 2026 •

edited

Loading