Grpc transcoding: set content-type to json for tailer-only #8158
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
Signed-off-by: Wayne Zhang <[email protected]>
lizan
reviewed
Sep 6, 2019
| const absl::optional<Grpc::Status::GrpcStatus> grpc_status = | ||
| Grpc::Common::getGrpcStatus(trailers); | ||
| if (!grpc_status || grpc_status.value() == Grpc::Status::GrpcStatus::InvalidCode) { | ||
| response_headers_->Status()->value(enumToInt(Http::Code::ServiceUnavailable)); |
There was a problem hiding this comment.
if upstream doesn't return grpc-status, it usually means the HTTP status is not 200 (5xx etc), in that case shall we override the HTTP status?
There was a problem hiding this comment.
Updated, not to set Status() if upstream grpc-status is not available.
There was a problem hiding this comment.
There should be if (!grpc_status) { return; } before this if (grpc_status.value() == ...).
There was a problem hiding this comment.
Done. Thanks for catching this crash.
| @@ -365,14 +381,16 @@ Http::FilterHeadersStatus JsonTranscoderFilter::encodeHeaders(Http::HeaderMap& h | |||
|
|
|||
| response_headers_ = &headers; | |||
|
|
|||
| headers.insertContentType().value().setReference(Http::Headers::get().ContentTypeValues.Json); | |||
|
|
|||
| if (end_stream) { | |||
| // In gRPC wire protocol, headers frame with end_stream is a trailers-only response. | |||
| // The return value from encodeTrailers is ignored since it is always continue. | |||
|
cc @ascheglov |
Signed-off-by: Wayne Zhang <[email protected]>
Signed-off-by: Wayne Zhang <[email protected]>
|
This pull request has been automatically marked as stale because it has not had activity in the last 7 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions! |
stale
bot
added
the
stale
stale
bot
removed
the
stale
|
I have been asked to take over this change. I will make another PR rebased off #8009 |
nareddyt
added a commit
to nareddyt/envoy
that referenced
this pull request
Sep 20, 2019
…e that the returned content type is `application/json`. This is required because the response body is an empty JSON body by default. Risk Level: Low Testing: Modified integration test to catch this bug. Docs Changes: None Release Notes: None Fixes: envoyproxy#5011 Ref: envoyproxy#8158 Ref: envoyproxy#8009 Signed-off-by: Teju Nareddy <[email protected]>
lizan
pushed a commit
that referenced
this pull request
Sep 24, 2019
* When trailer indicates a gRPC error and there was no HTTP body, ensure that the returned content type is `application/json`. This is required because the response body is an empty JSON body by default. Risk Level: Low Testing: Modified integration test to catch this bug. Docs Changes: None Release Notes: None Fixes: #5011 Ref: #8158 Ref: #8009 Signed-off-by: Teju Nareddy <[email protected]>
danzh2010
pushed a commit
to danzh2010/envoy
that referenced
this pull request
Oct 4, 2019
…oxy#8312) * When trailer indicates a gRPC error and there was no HTTP body, ensure that the returned content type is `application/json`. This is required because the response body is an empty JSON body by default. Risk Level: Low Testing: Modified integration test to catch this bug. Docs Changes: None Release Notes: None Fixes: envoyproxy#5011 Ref: envoyproxy#8158 Ref: envoyproxy#8009 Signed-off-by: Teju Nareddy <[email protected]>
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.
Signed-off-by: Wayne Zhang [email protected]
Description:
Set the content-type as application/json for tailer only response.
Risk Level: Low
Testing: integration test.
Fixes #5011