Merge remote-tracking branches 'mwitkow/bugfix/grpc-timeouts' and 'mi…

…keatlas/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
grpc-ecosystem · Jun 6, 2016 · a5edb0b · a5edb0b
3 parents 2d6296e + d9d99f4 + 2732962
commit a5edb0b
Show file tree

Hide file tree

Showing 11 changed files with 611 additions and 133 deletions.
diff --git a/README.md b/README.md
@@ -204,7 +204,7 @@ More examples are available under `examples` directory.
 * Mapping streaming APIs to JSON streams
 * Mapping HTTP headers with `Grpc-Metadata-` prefix to gRPC metadata
 * Optionally emitting API definition for [Swagger](http://swagger.io).
-* Import path parameters compatible to protoc-gen-go.
+* Setting [gRPC timeouts](http://www.grpc.io/docs/guides/wire.html) through inbound HTTP `Grpc-Timeout` header.
 
 ### Want to support
 But not yet.

diff --git a/examples/examplepb/a_bit_of_everything.pb.go b/examples/examplepb/a_bit_of_everything.pb.go
diff --git a/examples/examplepb/a_bit_of_everything.pb.gw.go b/examples/examplepb/a_bit_of_everything.pb.gw.go
diff --git a/examples/examplepb/a_bit_of_everything.proto b/examples/examplepb/a_bit_of_everything.proto
@@ -123,4 +123,9 @@ service ABitOfEverythingService {
 			body: "*"
 		};
 	}
+	rpc Timeout(EmptyMessage) returns (EmptyMessage) {
+		option (google.api.http) = {
+			get: "/v2/example/timeout",
+		};
+	}
 }
diff --git a/examples/examplepb/echo_service.pb.gw.go b/examples/examplepb/echo_service.pb.gw.go