Skip to content

Commit a5edb0b

Browse files
committed
Merge remote-tracking branches 'mwitkow/bugfix/grpc-timeouts' and 'mikeatlas/remote-addr-context' into master
Also, * Resolved conflicts * Unified two proposed metadta names "RemoteAddr" and "X-Forwarded-For" into "X-Forwarded-For" * Add error handlings * Add more tests * Replaced test values with the ones defined in RFC 5737
3 parents 2d6296e + d9d99f4 + 2732962 commit a5edb0b

File tree

11 files changed

+611
-133
lines changed

11 files changed

+611
-133
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ More examples are available under `examples` directory.
204204
* Mapping streaming APIs to JSON streams
205205
* Mapping HTTP headers with `Grpc-Metadata-` prefix to gRPC metadata
206206
* Optionally emitting API definition for [Swagger](http://swagger.io).
207-
* Import path parameters compatible to protoc-gen-go.
207+
* Setting [gRPC timeouts](http://www.grpc.io/docs/guides/wire.html) through inbound HTTP `Grpc-Timeout` header.
208208
209209
### Want to support
210210
But not yet.

examples/examplepb/a_bit_of_everything.pb.go

Lines changed: 109 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/examplepb/a_bit_of_everything.pb.gw.go

Lines changed: 101 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/examplepb/a_bit_of_everything.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,9 @@ service ABitOfEverythingService {
123123
body: "*"
124124
};
125125
}
126+
rpc Timeout(EmptyMessage) returns (EmptyMessage) {
127+
option (google.api.http) = {
128+
get: "/v2/example/timeout",
129+
};
130+
}
126131
}

examples/examplepb/echo_service.pb.gw.go

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)