diff --git a/core/include/userver/server/handlers/http_handler_base.hpp b/core/include/userver/server/handlers/http_handler_base.hpp index 98e196a28a2a..2a0dcbe9c458 100644 --- a/core/include/userver/server/handlers/http_handler_base.hpp +++ b/core/include/userver/server/handlers/http_handler_base.hpp @@ -168,14 +168,18 @@ class HttpHandlerBase : public HandlerBase { /// condition virtual bool NeedCheckAuth() const { return true; } - /// Override it if you need a custom request body logging. + /// Override it if you need a custom request body logging. The returned + /// string is automatically truncated to the `request_body_size_log_limit` + /// before logging. virtual std::string GetRequestBodyForLogging( const http::HttpRequest& request, request::RequestContext& context, const std::string& request_body ) const; - /// Override it if you need a custom response data logging. + /// Override it if you need a custom response data logging. The returned + /// string is automatically truncated to the `response_data_size_log_limit` + /// before logging. virtual std::string GetResponseDataForLogging( const http::HttpRequest& request, request::RequestContext& context, diff --git a/core/include/userver/server/handlers/http_handler_flatbuf_base.hpp b/core/include/userver/server/handlers/http_handler_flatbuf_base.hpp index 2fd75db7d58c..07579a8ec69a 100644 --- a/core/include/userver/server/handlers/http_handler_flatbuf_base.hpp +++ b/core/include/userver/server/handlers/http_handler_flatbuf_base.hpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include USERVER_NAMESPACE_BEGIN @@ -128,8 +128,7 @@ std::string HttpHandlerFlatbufBase::GetRequestBodyForLogg request::RequestContext&, const std::string& request_body ) const { - const size_t limit = GetConfig().request_body_size_log_limit; - return utils::log::ToLimitedHex(request_body, limit); + return utils::encoding::ToHex(request_body); } template @@ -138,8 +137,7 @@ std::string HttpHandlerFlatbufBase::GetResponseDataForLog request::RequestContext&, const std::string& response_data ) const { - const size_t limit = GetConfig().response_data_size_log_limit; - return utils::log::ToLimitedHex(response_data, limit); + return utils::encoding::ToHex(response_data); } template diff --git a/core/src/server/handlers/http_handler_base.cpp b/core/src/server/handlers/http_handler_base.cpp index 3a00bb3d7973..cd0b7bf28350 100644 --- a/core/src/server/handlers/http_handler_base.cpp +++ b/core/src/server/handlers/http_handler_base.cpp @@ -318,8 +318,7 @@ std::string HttpHandlerBase::GetRequestBodyForLogging( request::RequestContext&, const std::string& request_body ) const { - const std::size_t limit = GetConfig().request_body_size_log_limit; - return utils::log::ToLimitedUtf8(request_body, limit); + return request_body; } std::string HttpHandlerBase::GetResponseDataForLogging( @@ -327,8 +326,7 @@ std::string HttpHandlerBase::GetResponseDataForLogging( request::RequestContext&, const std::string& response_data ) const { - const std::size_t limit = GetConfig().response_data_size_log_limit; - return utils::log::ToLimitedUtf8(response_data, limit); + return response_data; } std::string HttpHandlerBase::GetUrlForLogging(const http::HttpRequest& request, request::RequestContext&) const {