From 8f8b16f7a4a4deb667546c0610f9a0369f5f8744 Mon Sep 17 00:00:00 2001 From: Pengyuan Bian Date: Mon, 2 Jul 2018 23:05:52 -0700 Subject: [PATCH] update. --- src/envoy/http/mixer/check_data.cc | 1 + src/istio/control/http/attributes_builder.cc | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/envoy/http/mixer/check_data.cc b/src/envoy/http/mixer/check_data.cc index 5125495eaaf..d835287b102 100644 --- a/src/envoy/http/mixer/check_data.cc +++ b/src/envoy/http/mixer/check_data.cc @@ -207,6 +207,7 @@ std::string CheckData::GetUrlPath() const { if (query_start != nullptr) { return std::string(path.c_str(), query_start - path.c_str()); } + return std::string(path.c_str(), path.size()) } return ""; } diff --git a/src/istio/control/http/attributes_builder.cc b/src/istio/control/http/attributes_builder.cc index 7a4b2a159a1..c9e1f8f424b 100644 --- a/src/istio/control/http/attributes_builder.cc +++ b/src/istio/control/http/attributes_builder.cc @@ -64,6 +64,13 @@ void AttributesBuilder::ExtractRequestHeaderAttributes(CheckData *check_data) { builder.AddString(it.name, it.default_value); } } + + builder.AddString(utils::AttributeName::kRequestUrlPath, + check_data->GetUrlPath()); + const auto &query_map = check_data->GetRequestQueries(); + if (query_map.size() > 0) { + builder.AddStringMap(utils::AttributeName::kRequestQueries, query_map); + } } void AttributesBuilder::ExtractAuthAttributes(CheckData *check_data) { @@ -169,11 +176,6 @@ void AttributesBuilder::ExtractCheckAttributes(CheckData *check_data) { } } builder.AddString(utils::AttributeName::kContextProtocol, protocol); - - builder.AddStringMap(utils::AttributeName::kRequestQueries, - check_data->GetRequestQueries()); - builder.AddString(utils::AttributeName::kRequestUrlPath, - check_data->GetUrlPath()); } void AttributesBuilder::ForwardAttributes(const Attributes &forward_attributes,