From e1e0d2fd050151ab62e23b81e967540701f1945d Mon Sep 17 00:00:00 2001 From: Matt Rice Date: Wed, 11 Apr 2018 00:44:14 -0400 Subject: [PATCH] Fixed a few small string types and add return code checking. Signed-off-by: Matt Rice --- source/common/access_log/access_log_formatter.cc | 5 +++-- test/common/request_info/request_info_impl_test.cc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/common/access_log/access_log_formatter.cc b/source/common/access_log/access_log_formatter.cc index bb77d3059ecd1..f8114df1772b2 100644 --- a/source/common/access_log/access_log_formatter.cc +++ b/source/common/access_log/access_log_formatter.cc @@ -362,8 +362,9 @@ std::string MetadataFormatter::format(const envoy::api::v2::core::Metadata& meta } data = &val; } - std::string json; - Protobuf::util::MessageToJsonString(*data, &json); + ProtobufTypes::String json; + const auto status = Protobuf::util::MessageToJsonString(*data, &json); + RELEASE_ASSERT(status.ok()); if (max_length_ && json.length() > max_length_.value()) { return json.substr(0, max_length_.value()); } diff --git a/test/common/request_info/request_info_impl_test.cc b/test/common/request_info/request_info_impl_test.cc index 10c9799ac35d5..16d435bca44db 100644 --- a/test/common/request_info/request_info_impl_test.cc +++ b/test/common/request_info/request_info_impl_test.cc @@ -155,7 +155,7 @@ TEST(RequestInfoImplTest, DynamicMetadataTest) { EXPECT_EQ("test_value", Config::Metadata::metadataValue(request_info.dynamicMetadata(), "com.test", "test_key") .string_value()); - std::string json; + ProtobufTypes::String json; const auto test_struct = request_info.dynamicMetadata().filter_metadata().at("com.test"); const auto status = Protobuf::util::MessageToJsonString(test_struct, &json); EXPECT_TRUE(status.ok());