Make envoy_esp talk to Mixer. #29
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
|
|
||
| This Proxy will use Envoy and talk to Mixer server. | ||
|
|
||
|
|
||
| ## Build Mixer server | ||
|
|
||
| * Follow https://github.com/istio/mixer/blob/master/doc/devel/development.md to set up environment, and build via: | ||
|
|
||
| ``` | ||
| cd $(ISTIO)/mixer | ||
| bazel build ...:all | ||
| ``` | ||
|
|
||
| ## Build Envoy proxy | ||
|
|
||
| * Build target envoy_esp: | ||
|
|
||
| ``` | ||
| bazel build //src/envoy/prototype:envoy_esp | ||
| ``` | ||
|
|
||
| ## How to run it | ||
|
|
||
| * Start mixer server. In mixer folder run: | ||
|
|
||
| ``` | ||
| bazel-bin/cmd/server/mixs server | ||
| ``` | ||
|
|
||
| The server will run at port 9091 | ||
|
|
||
| * Start backend Echo server. At ESP repo (https://github.com/cloudendpoints/esp) | ||
|
|
||
| ``` | ||
| cd test/echo | ||
| npm install | ||
| node echo.js | ||
| ``` | ||
|
|
||
| * Start Envoy proxy, run | ||
|
|
||
| ``` | ||
| bazel-bin/src/envoy/prototype/envoy_esp -c src/envoy/prototype/envoy-esp.conf | ||
| ``` | ||
|
|
||
| * Then issue HTTP request to proxy. | ||
|
|
||
| ``` | ||
| curl http://localhost:9090/echo?key=API-KEY -d "hello world" | ||
| ``` | ||
|
|
||
| ## How to add attributes or facts | ||
|
|
||
| Now only some of attributes are passed to mixer. If you want to add more attributes, you can | ||
| modify this [file](https://gcp-apis.git.corp.google.com/esp/+/test/envoy-mixer/src/api_manager/mixer/mixer.cc). |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,11 @@ | |
| #include "common/http/headers.h" | ||
| #include "common/http/message_impl.h" | ||
| #include "envoy/event/timer.h" | ||
| #include "google/protobuf/stubs/status.h" | ||
| #include "source/common/grpc/common.h" | ||
|
|
||
| using ::google::api_manager::utils::Status; | ||
| using ::google::protobuf::util::error::Code; | ||
|
|
||
| namespace Http { | ||
| namespace ApiManager { | ||
|
|
@@ -99,13 +104,14 @@ class HTTPRequest : public Http::Message { | |
| virtual std::string bodyAsString() override { return ""; } | ||
| }; | ||
|
|
||
| class HTTPRequestCallbacks : public AsyncClient::Callbacks { | ||
| private: | ||
| std::unique_ptr<google::api_manager::HTTPRequest> request_; | ||
| std::unique_ptr<AsyncClient::Request> sent_request_; | ||
|
|
||
| public: | ||
| HTTPRequestCallbacks( | ||
| std::unique_ptr<google::api_manager::HTTPRequest> &&request) | ||
| : request_(std::move(request)) {} | ||
| virtual void onSuccess(MessagePtr &&response) override { | ||
| google::api_manager::utils::Status status( | ||
|
|
@@ -129,20 +135,81 @@ class RequestCallbacks : public AsyncClient::Callbacks { | |
| } | ||
| }; | ||
|
|
||
| namespace { | ||
| // Copy the code here from envoy/grpc/common.cc | ||
| Buffer::InstancePtr SerializeGrpcBody(const std::string &body_str) { | ||
| // http://www.grpc.io/docs/guides/wire.html | ||
| Buffer::InstancePtr body(new Buffer::OwnedImpl()); | ||
| uint8_t compressed = 0; | ||
| body->add(&compressed, sizeof(compressed)); | ||
| uint32_t size = htonl(body_str.size()); | ||
| body->add(&size, sizeof(size)); | ||
| body->add(body_str); | ||
| return body; | ||
| } | ||
| Http::MessagePtr PrepareGrpcHeaders(const std::string &upstream_cluster, | ||
| const std::string &service_full_name, | ||
| const std::string &method_name) { | ||
| Http::MessagePtr message(new Http::RequestMessageImpl()); | ||
| message->headers().insertMethod().value( | ||
| Http::Headers::get().MethodValues.Post); | ||
| message->headers().insertPath().value( | ||
| fmt::format("/{}/{}", service_full_name, method_name)); | ||
| message->headers().insertHost().value(upstream_cluster); | ||
| message->headers().insertContentType().value(Grpc::Common::GRPC_CONTENT_TYPE); | ||
| return message; | ||
|
Contributor
There was a problem hiding this comment. You may have missed this line message->headers().addViaMoveValue(LowerCaseString("te"), "trailers"); according to @lizan , it will not work if you miss it.
Contributor
Author
There was a problem hiding this comment.
Contributor
There was a problem hiding this comment. OK, it is good as long as it works.
Contributor
There was a problem hiding this comment. probably Go gRPC server doesn't enforce it. C++ gRPC server doesn't accept without the header. You can define a static |
||
| } | ||
| } // annoymous namespace | ||
|
|
||
| class GrpcRequestCallbacks : public AsyncClient::Callbacks { | ||
| private: | ||
| Env *env_; | ||
| std::unique_ptr<google::api_manager::GRPCRequest> request_; | ||
|
|
||
| public: | ||
| GrpcRequestCallbacks( | ||
| Env *env, std::unique_ptr<google::api_manager::GRPCRequest> &&request) | ||
| : env_(env), request_(std::move(request)) {} | ||
| virtual void onSuccess(MessagePtr &&response) override { | ||
| google::api_manager::utils::Status status( | ||
| std::stoi(response->headers().Status()->value().c_str()), ""); | ||
| Grpc::Common::validateResponse(*response); | ||
| env_->LogInfo("pass validate"); | ||
| // remove 5 bytes of grpc header | ||
| response->body()->drain(5); | ||
| request_->OnComplete(status, response->bodyAsString()); | ||
| delete this; | ||
| } | ||
| virtual void onFailure(AsyncClient::FailureReason reason) override { | ||
| google::api_manager::utils::Status status(-1, "Cannot connect to Mixer"); | ||
|
Contributor
There was a problem hiding this comment. Cannot connect to gRPC server. |
||
| request_->OnComplete(status, ""); | ||
| delete this; | ||
| } | ||
| }; | ||
|
|
||
| void Env::RunHTTPRequest( | ||
| std::unique_ptr<google::api_manager::HTTPRequest> request) { | ||
| auto &client = cm_.httpAsyncClientForCluster("api_manager"); | ||
|
|
||
| MessagePtr message{new HTTPRequest(request.get())}; | ||
| HTTPRequestCallbacks *callbacks = | ||
| new HTTPRequestCallbacks(std::move(request)); | ||
|
Contributor
There was a problem hiding this comment. memory leak. callbacks object is NOT freed.
Contributor
There was a problem hiding this comment. Let me find out how to free it.
Contributor
There was a problem hiding this comment. Sorry, my mistake. the object is deleted. no memory leak. |
||
| client.send( | ||
| std::move(message), *callbacks, | ||
| Optional<std::chrono::milliseconds>(std::chrono::milliseconds(10000))); | ||
| } | ||
|
|
||
| void Env::RunGRPCRequest( | ||
| std::unique_ptr<google::api_manager::GRPCRequest> request) { | ||
| auto &client = cm_.httpAsyncClientForCluster(request->server()); | ||
|
|
||
| Http::MessagePtr message = | ||
| PrepareGrpcHeaders("localhost", request->service(), request->method()); | ||
| message->body(SerializeGrpcBody(request->body())); | ||
| auto callbacks = new GrpcRequestCallbacks(this, std::move(request)); | ||
| client.send( | ||
| std::move(message), *callbacks, | ||
| Optional<std::chrono::milliseconds>(std::chrono::milliseconds(10000))); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
define "istio.mixer.v1.Mixer" in a const char
same as "check" method.