feat core: remove unused statistics in HTTP handler

Tests: протестировано CI
commit_hash:1973e5b43781cd26091faac201b88120ea768688

Author: apolukhin

core/include/userver/server/handlers/http_handler_base.hpp

@@ -33,7 +33,6 @@ class Auth;
 namespace server::handlers {
 
 class HttpHandlerStatistics;
-class HttpRequestStatistics;
 class HttpHandlerMethodStatistics;
 class HttpHandlerStatisticsScope;
 
@@ -75,9 +74,6 @@ class HttpHandlerBase : public HandlerBase {
     /// @cond
     // For internal use only.
     HttpHandlerStatistics& GetHandlerStatistics() const;
-
-    // For internal use only.
-    HttpRequestStatistics& GetRequestStatistics() const;
     /// @endcond
 
     /// Override it if you need a custom logging level for messages about finish
@@ -217,7 +213,6 @@ class HttpHandlerBase : public HandlerBase {
     std::unordered_map<int, logging::Level> log_level_for_status_codes_;
 
     std::unique_ptr<HttpHandlerStatistics> handler_statistics_;
-    std::unique_ptr<HttpRequestStatistics> request_statistics_;
 
     bool set_response_server_hostname_;
     bool is_body_streamed_;

core/include/userver/server/http/http_request.hpp

@@ -21,7 +21,6 @@
 USERVER_NAMESPACE_BEGIN
 
 namespace server::handlers {
-class HttpRequestStatistics;
 class HttpHandlerBase;
 }  // namespace server::handlers
 
@@ -268,8 +267,6 @@ class HttpRequest final {
     /// @endcond
 
 private:
-    void AccountResponseTime();
-
     void SetPathArgs(std::vector<std::pair<std::string, std::string>> args);
 
     void SetHttpHandler(const handlers::HttpHandlerBase& handler);
@@ -278,8 +275,6 @@ class HttpRequest final {
     void SetTaskProcessor(engine::TaskProcessor& task_processor);
     engine::TaskProcessor* GetTaskProcessor() const;
 
-    void SetHttpHandlerStatistics(handlers::HttpRequestStatistics&);
-
     // HTTP/2.0 only
     void SetResponseStreamId(std::int32_t);
     void SetStreamProducer(impl::Http2StreamEventProducer&& producer);

core/include/userver/server/http/http_request_builder.hpp

@@ -55,8 +55,6 @@ class HttpRequestBuilder final {
 
     HttpRequestBuilder& SetTaskProcessor(engine::TaskProcessor& task_processor);
 
-    HttpRequestBuilder& SetHttpHandlerStatistics(handlers::HttpRequestStatistics& stats);
-
     // TODO: remove?
     HttpRequestBuilder& SetStreamProducer(impl::Http2StreamEventProducer&& producer);
 

core/src/server/handlers/http_handler_base.cpp

@@ -50,10 +50,6 @@ namespace {
 
 const std::string kHostname = hostinfo::blocking::GetRealHostName();
 
-// "request" is redundant: https://st.yandex-team.ru/TAXICOMMON-1793
-// set to 1 if you need server metrics
-constexpr bool kIncludeServerHttpMetrics = false;
-
 std::vector<http::HttpMethod> InitAllowedMethods(const HandlerConfig& config) {
     std::vector<http::HttpMethod> allowed_methods;
     std::vector<std::string> methods;
@@ -138,7 +134,6 @@ HttpHandlerBase::HttpHandlerBase(
       log_level_for_status_codes_(ParseStatusCodesLogLevel(config["status-codes-log-level"]
                                                                .As<std::unordered_map<std::string, std::string>>({}))),
       handler_statistics_(std::make_unique<HttpHandlerStatistics>()),
-      request_statistics_(std::make_unique<HttpRequestStatistics>()),
       is_body_streamed_(config["response-body-stream"].As<bool>(false))
 {
     if (allowed_methods_.empty()) {
@@ -187,12 +182,7 @@ HttpHandlerBase::HttpHandlerBase(
         RegisterWriterScope(
             context,
             std::move(prefix),
-            [this](utils::statistics::Writer& result) {
-                FormatStatistics(result["handler"], *handler_statistics_);
-                if constexpr (kIncludeServerHttpMetrics) {
-                    FormatStatistics(result["request"], *request_statistics_);
-                }
-            },
+            [this](utils::statistics::Writer& result) { FormatStatistics(result["handler"], *handler_statistics_); },
             std::move(labels)
         );
     }
@@ -299,8 +289,6 @@ const std::vector<http::HttpMethod>& HttpHandlerBase::GetAllowedMethods() const
 
 HttpHandlerStatistics& HttpHandlerBase::GetHandlerStatistics() const { return *handler_statistics_; }
 
-HttpRequestStatistics& HttpHandlerBase::GetRequestStatistics() const { return *request_statistics_; }
-
 logging::Level HttpHandlerBase::GetLogLevelForResponseStatus(http::HttpStatus status) const {
     const auto status_code = static_cast<int>(status);
     const auto* const level = utils::FindOrNullptr(log_level_for_status_codes_, status_code);

core/src/server/handlers/http_handler_base_statistics.cpp

@@ -75,10 +75,6 @@ void DumpMetric(utils::statistics::Writer& writer, const HttpHandlerStatisticsSn
     writer.ValueWithLabels(HttpHandlerStatisticsHelper{stats}, {"version", "2"});
 }
 
-void HttpRequestMethodStatistics::Account(const HttpRequestStatisticsEntry& stats) noexcept {
-    timings_.GetCurrentCounter().Account(stats.timing.count());
-}
-
 bool IsOkMethod(http::HttpMethod method) noexcept {
     return static_cast<std::size_t>(method) <= http::kHandlerMethodsMax;
 }

core/src/server/handlers/http_handler_base_statistics.hpp

@@ -82,26 +82,6 @@ struct HttpHandlerStatisticsSnapshot final {
 
 void DumpMetric(utils::statistics::Writer& writer, const HttpHandlerStatisticsSnapshot& stats);
 
-// Statistics for a single request from the overall server or the external
-// client perspective. Includes the time spent in queue.
-struct HttpRequestStatisticsEntry final {
-    std::chrono::milliseconds timing;
-};
-
-class HttpRequestMethodStatistics final {
-public:
-    using Snapshot = void;
-
-    void Account(const HttpRequestStatisticsEntry& stats) noexcept;
-
-    using Percentile = utils::statistics::Percentile<2048, unsigned int, 120>;
-
-    Percentile GetTimings() const { return timings_.GetStatsForPeriod(); }
-
-private:
-    utils::statistics::RecentPeriod<Percentile, Percentile, utils::datetime::SteadyClock> timings_;
-};
-
 bool IsOkMethod(http::HttpMethod method) noexcept;
 
 std::size_t HttpMethodToIndex(http::HttpMethod method) noexcept;
@@ -123,8 +103,6 @@ class ByMethodStatistics {
 
 class HttpHandlerStatistics final : public ByMethodStatistics<HttpHandlerMethodStatistics> {};
 
-class HttpRequestStatistics final : public ByMethodStatistics<HttpRequestMethodStatistics> {};
-
 class HttpHandlerStatisticsScope final {
 public:
     HttpHandlerStatisticsScope(

core/src/server/http/http_request.cpp

@@ -311,14 +311,6 @@ void HttpRequest::SetPathArgs(std::vector<std::pair<std::string, std::string>> a
     }
 }
 
-void HttpRequest::AccountResponseTime() {
-    if (pimpl_->request_statistics) {
-        auto timing = std::chrono::duration_cast<
-            std::chrono::milliseconds>(pimpl_->finish_send_response_time - pimpl_->start_time);
-        pimpl_->request_statistics->ForMethod(GetMethod()).Account(handlers::HttpRequestStatisticsEntry{timing});
-    }
-}
-
 void HttpRequest::MarkAsInternalServerError() const {
     // TODO : refactor, this being here is a bit ridiculous
     pimpl_->response.SetStatus(http::HttpStatus::kInternalServerError);
@@ -334,10 +326,6 @@ void HttpRequest::SetTaskProcessor(engine::TaskProcessor& task_processor) { pimp
 
 engine::TaskProcessor* HttpRequest::GetTaskProcessor() const { return pimpl_->task_processor; }
 
-void HttpRequest::SetHttpHandlerStatistics(handlers::HttpRequestStatistics& stats) {
-    pimpl_->request_statistics = &stats;
-}
-
 void HttpRequest::SetResponseStreamId(std::int32_t stream_id) { pimpl_->response.SetStreamId(stream_id); }
 
 void HttpRequest::SetStreamProducer(impl::Http2StreamEventProducer&& producer) {
@@ -358,10 +346,7 @@ void HttpRequest::SetStartSendResponseTime() noexcept {
     pimpl_->start_send_response_time = std::chrono::steady_clock::now();
 }
 
-void HttpRequest::SetFinishSendResponseTime() {
-    pimpl_->finish_send_response_time = std::chrono::steady_clock::now();
-    AccountResponseTime();
-}
+void HttpRequest::SetFinishSendResponseTime() { pimpl_->finish_send_response_time = std::chrono::steady_clock::now(); }
 
 void HttpRequest::WriteAccessLogs(
     const logging::TextLoggerPtr& logger_access,

core/src/server/http/http_request_builder.cpp

@@ -103,11 +103,6 @@ HttpRequestBuilder& HttpRequestBuilder::SetTaskProcessor(engine::TaskProcessor&
     return *this;
 }
 
-HttpRequestBuilder& HttpRequestBuilder::SetHttpHandlerStatistics(handlers::HttpRequestStatistics& stats) {
-    request_->SetHttpHandlerStatistics(stats);
-    return *this;
-}
-
 HttpRequestBuilder& HttpRequestBuilder::SetStreamProducer(impl::Http2StreamEventProducer&& producer) {
     request_->SetStreamProducer(std::move(producer));
     return *this;

core/src/server/http/http_request_constructor.cpp

@@ -126,7 +126,6 @@ void HttpRequestConstructor::ParseUrl() {
 
         builder_.SetTaskProcessor(handler_info->task_processor);
         builder_.SetHttpHandler(handler_info->handler);
-        builder_.SetHttpHandlerStatistics(handler_info->handler.GetRequestStatistics());
     } else {
         if (match_result.status == MatchRequestResult::Status::kMethodNotAllowed) {
             SetStatus(Status::kMethodNotAllowed);

core/src/server/http/http_request_handler.cpp

@@ -54,9 +54,6 @@ HttpRequestHandler::HttpRequestHandler(
 engine::TaskWithResult<void> HttpRequestHandler::StartFailsafeTask(std::shared_ptr<http::HttpRequest> http_request
 ) const {
     const auto* handler = http_request->GetHttpHandler();
-    static handlers::HttpRequestStatistics dummy_statistics;
-
-    http_request->SetHttpHandlerStatistics(dummy_statistics);
 
     return engine::AsyncNoSpan([request = std::move(http_request), handler]() {
         request->SetTaskStartTime();