From 3e89827ee09b177d70ebf9e236801ce7ea0999ba Mon Sep 17 00:00:00 2001 From: Randy Smith Date: Wed, 24 Oct 2018 17:30:20 -0400 Subject: [PATCH] Use general string class and utilities to avoid problems for Google import Signed-off-by: Randy Smith --- source/common/access_log/access_log_formatter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/common/access_log/access_log_formatter.cc b/source/common/access_log/access_log_formatter.cc index c260bcc20b4a0..e61ba429d26d4 100644 --- a/source/common/access_log/access_log_formatter.cc +++ b/source/common/access_log/access_log_formatter.cc @@ -91,8 +91,8 @@ std::string JsonFormatterImpl::format(const Http::HeaderMap& request_headers, (*output_struct.mutable_fields())[pair.first] = string_value; } - std::string log_line; - const auto conversion_status = ProtobufUtil::MessageToJsonString(output_struct, &log_line); + ProtobufTypes::String log_line; + const auto conversion_status = Protobuf::util::MessageToJsonString(output_struct, &log_line); if (!conversion_status.ok()) { log_line = fmt::format("Error serializing access log to JSON: {}", conversion_status.ToString());