update.

istio · Aug 3, 2018 · c3a3a84 · c3a3a84
1 parent 396e5d9
commit c3a3a84
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/envoy/http/mixer/check_data.cc b/src/envoy/http/mixer/check_data.cc
@@ -211,6 +211,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
@@ -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) {
@@ -160,11 +167,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,