Update to mixer client with report batch (istio#357)

Author: qiwzhang

src/envoy/mixer/grpc_transport.h

@@ -84,7 +84,13 @@ class CheckGrpcTransport : public GrpcTransport {
   void Call(const ::istio::mixer::v1::CheckRequest& request,
             ::istio::mixer::v1::CheckResponse* response,
             ::istio::mixer_client::DoneFunc on_done) {
-    on_done_ = on_done;
+    on_done_ = [this, response,
+                on_done](const ::google::protobuf::util::Status& status) {
+      if (status.ok()) {
+        log().debug("Check response: {}", response->DebugString());
+      }
+      on_done(status);
+    };
     log().debug("Call grpc check: {}", request.DebugString());
     stub_.Check(nullptr, &request, response, nullptr);
   }
@@ -128,7 +134,13 @@ class QuotaGrpcTransport : public GrpcTransport {
   void Call(const ::istio::mixer::v1::QuotaRequest& request,
             ::istio::mixer::v1::QuotaResponse* response,
             ::istio::mixer_client::DoneFunc on_done) {
-    on_done_ = on_done;
+    on_done_ = [this, response,
+                on_done](const ::google::protobuf::util::Status& status) {
+      if (status.ok()) {
+        log().debug("Quota response: {}", response->DebugString());
+      }
+      on_done(status);
+    };
     log().debug("Call grpc quota: {}", request.DebugString());
     stub_.Quota(nullptr, &request, response, nullptr);
   }

src/envoy/mixer/http_control.cc

@@ -30,6 +30,7 @@ using ::istio::mixer_client::Attributes;
 using ::istio::mixer_client::CheckOptions;
 using ::istio::mixer_client::DoneFunc;
 using ::istio::mixer_client::MixerClientOptions;
+using ::istio::mixer_client::ReportOptions;
 using ::istio::mixer_client::QuotaOptions;
 
 namespace Envoy {
@@ -182,7 +183,7 @@ HttpControl::HttpControl(const MixerConfig& mixer_config,
                          Upstream::ClusterManager& cm)
     : mixer_config_(mixer_config) {
   if (GrpcTransport::IsMixerServerConfigured(cm)) {
-    MixerClientOptions options(GetCheckOptions(mixer_config),
+    MixerClientOptions options(GetCheckOptions(mixer_config), ReportOptions(),
                                GetQuotaOptions(mixer_config));
     auto cms = std::make_shared<ClusterManagerStore>(cm);
     options.check_transport = CheckGrpcTransport::GetFunc(cms);
@@ -262,10 +263,8 @@ void HttpControl::Quota(HttpRequestDataPtr request_data, DoneFunc on_done) {
 void HttpControl::Report(HttpRequestDataPtr request_data,
                          const HeaderMap* response_headers,
                          const AccessLog::RequestInfo& request_info,
-                         int check_status, DoneFunc on_done) {
+                         int check_status) {
   if (!mixer_client_) {
-    on_done(
-        Status(StatusCode::INVALID_ARGUMENT, "Missing mixer_server cluster"));
     return;
   }
 
@@ -276,7 +275,7 @@ void HttpControl::Report(HttpRequestDataPtr request_data,
   FillRequestInfoAttributes(request_info, check_status,
                             &request_data->attributes);
   log().debug("Send Report: {}", request_data->attributes.DebugString());
-  mixer_client_->Report(request_data->attributes, on_done);
+  mixer_client_->Report(request_data->attributes);
 }
 
 }  // namespace Mixer

src/envoy/mixer/http_control.h

@@ -52,8 +52,8 @@ class HttpControl final : public Logger::Loggable<Logger::Id::http> {
   // Make mixer report call.
   void Report(HttpRequestDataPtr request_data,
               const HeaderMap* response_headers,
-              const AccessLog::RequestInfo& request_info, int check_status_code,
-              ::istio::mixer_client::DoneFunc on_done);
+              const AccessLog::RequestInfo& request_info,
+              int check_status_code);
 
  private:
   void FillCheckAttributes(HeaderMap& header_map,

src/envoy/mixer/http_filter.cc

@@ -296,12 +296,8 @@ class Instance : public Http::StreamDecoderFilter,
     if (!request_data_) return;
     // Make sure not to use any class members at the callback.
     // The class may be gone when it is called.
-    // Log() is a static function so it is OK.
     http_control_->Report(request_data_, response_headers, request_info,
-                          check_status_code_, [](const Status& status) {
-                            Log().debug("Report returns status: {}",
-                                        status.ToString());
-                          });
+                          check_status_code_);
   }
 
   static spdlog::logger& Log() {

src/envoy/mixer/repositories.bzl

@@ -15,7 +15,7 @@
 ################################################################################
 #
 
-MIXER_CLIENT = "df656b9fc7964043be53d5afee4f32cf71e7fd28"
+MIXER_CLIENT = "6080a5318230c61f03c5e5d03288e5ee67ae4952"
 
 def mixer_client_repositories(bind=True):
     native.git_repository(