cc core: use scope API for metrics

segoon · segoon · commit 4102c3a0ce24 · 2025-12-27T06:18:02.000+03:00
commit_hash:23fa892e2601460358be4dc5470d51e72ac7b4f9
diff --git a/core/include/userver/cache/lru_cache_component_base.hpp b/core/include/userver/cache/lru_cache_component_base.hpp
@@ -24,7 +24,7 @@ namespace cache {
 
 namespace impl {
 
-utils::statistics::Entry RegisterOnStatisticsStorage(
+void RegisterOnStatisticsStorage(
     const components::ComponentContext& context,
     const std::string& name,
     std::function<void(utils::statistics::Writer&)> func
@@ -107,7 +107,6 @@ class LruCacheComponent : public components::ComponentBase, private dump::Dumpab
 
     // Subscriptions must be the last fields.
     concurrent::AsyncEventSubscriberScope config_subscription_;
-    utils::statistics::Entry statistics_holder_;
     testsuite::CacheResetRegistration reset_registration_;
     // See the comment above before adding a new field.
 };
@@ -145,17 +144,14 @@ LruCacheComponent<
         LOG_INFO() << "Dynamic LRU cache config is disabled, cache=" << name_;
     }
 
-    statistics_holder_ = impl::RegisterOnStatisticsStorage(context, name_, [this](utils::statistics::Writer& writer) {
-        writer = *cache_;
-    });
+    impl::RegisterOnStatisticsStorage(context, name_, [this](utils::statistics::Writer& writer) { writer = *cache_; });
 
     reset_registration_ = testsuite::RegisterCache(context, this, &LruCacheComponent::DropCache);
 }
 
 template <typename Key, typename Value, typename Hash, typename Equal>
 LruCacheComponent<Key, Value, Hash, Equal>::~LruCacheComponent() {
     reset_registration_.Unregister();
-    statistics_holder_.Unregister();
     config_subscription_.Unsubscribe();
 
     if (dumper_) {
diff --git a/core/include/userver/clients/dns/component.hpp b/core/include/userver/clients/dns/component.hpp
@@ -38,7 +38,6 @@ class Component final : public components::ComponentBase {
     void Write(utils::statistics::Writer& writer);
 
     Resolver resolver_;
-    utils::statistics::Entry statistics_holder_;
 };
 
 }  // namespace clients::dns
diff --git a/core/include/userver/clients/http/component_core.hpp b/core/include/userver/clients/http/component_core.hpp
@@ -71,7 +71,6 @@ class HttpClientCore final : public ComponentBase {
     const bool disable_pool_stats_;
     std::shared_ptr<clients::http::ClientCore> http_client_;
     concurrent::AsyncEventSubscriberScope subscriber_scope_;
-    utils::statistics::Entry statistics_holder_;
 };
 
 template <>
diff --git a/core/include/userver/components/manager_controller_component.hpp b/core/include/userver/components/manager_controller_component.hpp
@@ -92,7 +92,6 @@ class ManagerControllerComponent final : public RawComponentBase {
     void OnConfigUpdate(const dynamic_config::Snapshot& cfg);
 
     const components::impl::Manager& components_manager_;
-    utils::statistics::Entry statistics_holder_;
     concurrent::AsyncEventSubscriberScope config_subscription_;
 };
 
diff --git a/core/include/userver/logging/component.hpp b/core/include/userver/logging/component.hpp
@@ -14,7 +14,7 @@
 #include <userver/rcu/rcu_map.hpp>
 #include <userver/utils/fast_pimpl.hpp>
 #include <userver/utils/periodic_task.hpp>
-#include <userver/utils/statistics/entry.hpp>
+#include <userver/utils/statistics/metrics_storage.hpp>
 #include <userver/utils/statistics/writer.hpp>
 
 #include "logger.hpp"
@@ -139,7 +139,6 @@ class Logging final : public RawComponentBase {
 
     // Subscriptions must be the last fields.
     os_signals::Subscriber signal_subscriber_;
-    utils::statistics::Entry statistics_holder_;
 };
 
 template <>
diff --git a/core/include/userver/server/handlers/http_handler_base.hpp b/core/include/userver/server/handlers/http_handler_base.hpp
@@ -10,7 +10,6 @@
 
 #include <userver/dynamic_config/source.hpp>
 #include <userver/logging/level.hpp>
-#include <userver/utils/statistics/entry.hpp>
 #include <userver/utils/token_bucket.hpp>
 
 #include <userver/server/handlers/exceptions.hpp>
@@ -214,7 +213,6 @@ class HttpHandlerBase : public HandlerBase {
     const dynamic_config::Source config_source_;
     const std::vector<http::HttpMethod> allowed_methods_;
     const std::string handler_name_;
-    utils::statistics::Entry statistics_holder_;
     std::optional<logging::Level> log_level_;
     std::unordered_map<int, logging::Level> log_level_for_status_codes_;
 
diff --git a/core/include/userver/server/websocket/websocket_handler.hpp b/core/include/userver/server/websocket/websocket_handler.hpp
@@ -68,7 +68,6 @@ class WebsocketHandlerBase : public server::handlers::HttpHandlerBase {
 
     websocket::Config config_;
     mutable Statistics stats_;
-    utils::statistics::Entry statistics_holder_;
 };
 
 }  // namespace server::websocket
diff --git a/core/include/userver/utils/statistics/system_statistics_collector.hpp b/core/include/userver/utils/statistics/system_statistics_collector.hpp
@@ -8,7 +8,6 @@
 #include <userver/concurrent/variable.hpp>
 #include <userver/engine/task/task_processor_fwd.hpp>
 #include <userver/utils/periodic_task.hpp>
-#include <userver/utils/statistics/entry.hpp>
 #include <utils/statistics/system_statistics.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -37,7 +36,6 @@ class SystemStatisticsCollector final : public ComponentBase {
     static constexpr std::string_view kName = "system-statistics-collector";
 
     SystemStatisticsCollector(const ComponentConfig&, const ComponentContext&);
-    ~SystemStatisticsCollector() override;
 
     static yaml_config::Schema GetStaticConfigSchema();
 
@@ -53,7 +51,6 @@ class SystemStatisticsCollector final : public ComponentBase {
 
     const bool with_nginx_;
     engine::TaskProcessor& fs_task_processor_;
-    utils::statistics::Entry statistics_holder_;
     concurrent::Variable<Data> data_;
     utils::PeriodicTask periodic_;
 };
diff --git a/core/src/cache/lru_cache_component_base.cpp b/core/src/cache/lru_cache_component_base.cpp
@@ -17,14 +17,12 @@ USERVER_NAMESPACE_BEGIN
 
 namespace cache::impl {
 
-utils::statistics::Entry RegisterOnStatisticsStorage(
+void RegisterOnStatisticsStorage(
     const components::ComponentContext& context,
     const std::string& name,
     std::function<void(utils::statistics::Writer&)> func
 ) {
-    return context.FindComponent<components::StatisticsStorage>()
-        .GetStorage()
-        .RegisterWriter("cache", std::move(func), {{"cache_name", name}});
+    utils::statistics::RegisterWriterScope(context, "cache", std::move(func), {{"cache_name", name}});
 }
 
 dynamic_config::Source FindDynamicConfigSource(const components::ComponentContext& context) {
diff --git a/core/src/clients/dns/component.cpp b/core/src/clients/dns/component.cpp
@@ -18,8 +18,9 @@ Component::Component(const components::ComponentConfig& config, const components
     : ComponentBase{config, context},
       resolver_{GetFsTaskProcessor(config, context), config.As<::userver::static_config::DnsClient>()}
 {
-    auto& storage = context.FindComponent<components::StatisticsStorage>().GetStorage();
-    statistics_holder_ = storage.RegisterWriter(config.Name() + ".replies", [this](auto& writer) { Write(writer); });
+    utils::statistics::RegisterWriterScope(context, config.Name() + ".replies", [this](auto& writer) {
+        Write(writer);
+    });
 }
 
 Resolver& Component::GetResolver() { return resolver_; }
diff --git a/core/src/clients/http/component_core.cpp b/core/src/clients/http/component_core.cpp
@@ -107,16 +107,12 @@ HttpClientCore::HttpClientCore(const ComponentConfig& component_config, const Co
 
     const auto thread_name_prefix = component_config["thread-name-prefix"].As<std::string>("");
     auto stats_name = "httpclient" + (thread_name_prefix.empty() ? "" : ("-" + thread_name_prefix));
-    auto& storage = context.FindComponent<components::StatisticsStorage>().GetStorage();
-    statistics_holder_ = storage.RegisterWriter(std::move(stats_name), [this](utils::statistics::Writer& writer) {
+    utils::statistics::RegisterWriterScope(context, std::move(stats_name), [this](utils::statistics::Writer& writer) {
         return WriteStatistics(writer);
     });
 }
 
-HttpClientCore::~HttpClientCore() {
-    subscriber_scope_.Unsubscribe();
-    statistics_holder_.Unregister();
-}
+HttpClientCore::~HttpClientCore() { subscriber_scope_.Unsubscribe(); }
 
 std::shared_ptr<clients::http::ClientCore> HttpClientCore::GetHttpClientCore(utils::impl::InternalTag) {
     return http_client_;
diff --git a/core/src/components/manager_controller_component.cpp b/core/src/components/manager_controller_component.cpp
@@ -65,13 +65,11 @@ ManagerControllerComponent::ManagerControllerComponent(
 )
     : components_manager_(context.GetManager(utils::impl::InternalTag{}))
 {
-    auto& storage = context.FindComponent<components::StatisticsStorage>().GetStorage();
-
     auto config_source = context.FindComponent<DynamicConfig>().GetSource();
     config_subscription_ =
         config_source.UpdateAndListen(this, "engine_controller", &ManagerControllerComponent::OnConfigUpdate);
 
-    statistics_holder_ = storage.RegisterWriter("engine", [this](utils::statistics::Writer& writer) {
+    utils::statistics::RegisterWriterScope(context, "engine", [this](utils::statistics::Writer& writer) {
         return WriteStatistics(writer);
     });
 
@@ -85,10 +83,7 @@ ManagerControllerComponent::ManagerControllerComponent(
     }
 }
 
-ManagerControllerComponent::~ManagerControllerComponent() {
-    statistics_holder_.Unregister();
-    config_subscription_.Unsubscribe();
-}
+ManagerControllerComponent::~ManagerControllerComponent() { config_subscription_.Unsubscribe(); }
 
 void ManagerControllerComponent::WriteStatistics(utils::statistics::Writer& writer) {
     // task processors
diff --git a/core/src/congestion_control/component.cpp b/core/src/congestion_control/component.cpp
@@ -70,7 +70,6 @@ struct Component::Impl {
 
     // These subscriptions and tasks must be the last fields!
     Watchdog wd;
-    utils::statistics::Entry statistics_holder;
     concurrent::AsyncEventSubscriberScope config_subscription;
     // See the comment above before adding new fields.
 
@@ -128,16 +127,12 @@ Component::Component(const components::ComponentConfig& config, const components
 
     pimpl_->config_subscription = pimpl_->dynamic_config.UpdateAndListen(this, kName, &Component::OnConfigUpdate);
 
-    auto& storage = context.FindComponent<components::StatisticsStorage>().GetStorage();
-    pimpl_->statistics_holder = storage.RegisterWriter(std::string{kName}, [this](utils::statistics::Writer& writer) {
+    utils::statistics::RegisterWriterScope(context, std::string{kName}, [this](utils::statistics::Writer& writer) {
         ExtendWriter(writer);
     });
 }
 
-Component::~Component() {
-    pimpl_->config_subscription.Unsubscribe();
-    pimpl_->statistics_holder.Unregister();
-}
+Component::~Component() { pimpl_->config_subscription.Unsubscribe(); }
 
 void Component::OnConfigUpdate(const dynamic_config::Snapshot& cfg) {
     const bool is_enabled_dynamic = cfg[::dynamic_config::USERVER_RPS_CCONTROL_ENABLED];
diff --git a/core/src/dynamic_config/storage/component.cpp b/core/src/dynamic_config/storage/component.cpp
@@ -107,9 +107,6 @@ class DynamicConfig::Impl final {
     mutable engine::Mutex loaded_mutex_;
     mutable engine::ConditionVariable loaded_cv_;
     DynamicConfigStatistics stats_;
-
-    // Must be the last field
-    utils::statistics::Entry statistics_holder_;
 };
 
 DynamicConfig::Impl::Impl(const ComponentConfig& config, const ComponentContext& context)
@@ -122,10 +119,9 @@ DynamicConfig::Impl::Impl(const ComponentConfig& config, const ComponentContext&
     ReadFallback(config);
     ReadFsCache();
 
-    statistics_holder_ =
-        context.FindComponent<components::StatisticsStorage>()
-            .GetStorage()
-            .RegisterWriter("dynamic-config", [this](auto& writer) { WriteStatistics(writer); });
+    utils::statistics::RegisterWriterScope(context, "dynamic-config", [this](auto& writer) {
+        WriteStatistics(writer);
+    });
 }
 
 dynamic_config::Source DynamicConfig::Impl::GetSource() {
diff --git a/core/src/engine/task_processors_load_monitor.cpp b/core/src/engine/task_processors_load_monitor.cpp
@@ -81,17 +81,14 @@ class TaskProcessorsLoadMonitor::Impl final {
             collector_.Start("task-processors-load-collector", settings, [this] { CollectCurrentLoad(); });
         }
 
-        auto& storage = context.FindComponent<components::StatisticsStorage>().GetStorage();
-        statistics_holder_ =
-            storage.RegisterWriter("engine.task-processors-load-percent", [this](utils::statistics::Writer& writer) {
-                ExtendWriter(writer);
-            });
+        utils::statistics::RegisterWriterScope(
+            context,
+            "engine.task-processors-load-percent",
+            [this](utils::statistics::Writer& writer) { ExtendWriter(writer); }
+        );
     }
 
-    ~Impl() {
-        statistics_holder_.Unregister();
-        collector_.Stop();
-    }
+    ~Impl() { collector_.Stop(); }
 
 private:
     static constexpr std::chrono::seconds kCollectInterval{5};
@@ -128,7 +125,6 @@ class TaskProcessorsLoadMonitor::Impl final {
 
     std::vector<TaskProcessorMeta> task_processors_;
 
-    utils::statistics::Entry statistics_holder_;
     utils::PeriodicTask collector_;
 };
 
diff --git a/core/src/logging/component.cpp b/core/src/logging/component.cpp
@@ -148,10 +148,9 @@ void Logging::Init(const ComponentConfig& config, const ComponentContext& contex
 
     auto* const statistics_storage = context.FindComponentOptional<components::StatisticsStorage>();
     if (statistics_storage) {
-        statistics_holder_ =
-            statistics_storage->GetStorage().RegisterWriter("logger", [this](utils::statistics::Writer& writer) {
-                return WriteStatistics(writer);
-            });
+        utils::statistics::RegisterWriterScope(context, "logger", [this](utils::statistics::Writer& writer) {
+            return WriteStatistics(writer);
+        });
     }
 }
 
diff --git a/core/src/server/handlers/http_handler_base.cpp b/core/src/server/handlers/http_handler_base.cpp
@@ -184,8 +184,8 @@ HttpHandlerBase::HttpHandlerBase(
             GetConfig().path
         );
 
-        auto& statistics_storage = context.FindComponent<components::StatisticsStorage>().GetStorage();
-        statistics_holder_ = statistics_storage.RegisterWriter(
+        utils::statistics::RegisterWriterScope(
+            context,
             std::move(prefix),
             [this](utils::statistics::Writer& result) {
                 FormatStatistics(result["handler"], *handler_statistics_);
@@ -201,7 +201,7 @@ HttpHandlerBase::HttpHandlerBase(
         GetConfig().set_response_server_hostname.value_or(server.GetConfig().set_response_server_hostname);
 }
 
-HttpHandlerBase::~HttpHandlerBase() { statistics_holder_.Unregister(); }
+HttpHandlerBase::~HttpHandlerBase() = default;
 
 void HttpHandlerBase::HandleRequestStream(http::HttpRequest& http_request, request::RequestContext& context) const {
     auto& http_response = http_request.GetHttpResponse();
diff --git a/core/src/server/websocket/websocket_handler.cpp b/core/src/server/websocket/websocket_handler.cpp
@@ -28,11 +28,9 @@ WebsocketHandlerBase::WebsocketHandlerBase(
     : server::handlers::HttpHandlerBase(config, context),
       config_(config.As<Config>())
 {
-    auto& statistics_storage = context.FindComponent<components::StatisticsStorage>().GetStorage();
-    statistics_holder_ =
-        statistics_storage.RegisterWriter("ws." + config.Name(), [this](utils::statistics::Writer& writer) {
-            return WriteMetrics(writer);
-        });
+    utils::statistics::RegisterWriterScope(context, "ws." + config.Name(), [this](utils::statistics::Writer& writer) {
+        return WriteMetrics(writer);
+    });
 }
 
 std::string WebsocketHandlerBase::HandleRequestThrow(
diff --git a/core/src/utils/statistics/system_statistics_collector.cpp b/core/src/utils/statistics/system_statistics_collector.cpp
@@ -23,14 +23,11 @@ SystemStatisticsCollector::SystemStatisticsCollector(const ComponentConfig& conf
           [this] { ProcessTimer(); }
       )
 {
-    statistics_holder_ =
-        context.FindComponent<components::StatisticsStorage>()
-            .GetStorage()
-            .RegisterWriter("", [this](utils::statistics::Writer& writer) { ExtendStatistics(writer); });
+    utils::statistics::RegisterWriterScope(context, "", [this](utils::statistics::Writer& writer) {
+        ExtendStatistics(writer);
+    });
 }
 
-SystemStatisticsCollector::~SystemStatisticsCollector() { statistics_holder_.Unregister(); }
-
 void SystemStatisticsCollector::ProcessTimer() {
     engine::CriticalAsyncNoSpan(fs_task_processor_, [&] {
         auto self = utils::statistics::impl::GetSelfSystemStatistics();

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,9 @@ Component::Component(const components::ComponentConfig& config, const components`
`18`	`18`	`: ComponentBase{config, context},`
`19`	`19`	`resolver_{GetFsTaskProcessor(config, context), config.As<::userver::static_config::DnsClient>()}`
`20`	`20`	`{`
`21`		`- auto& storage = context.FindComponent<components::StatisticsStorage>().GetStorage();`
`22`		`- statistics_holder_ = storage.RegisterWriter(config.Name() + ".replies", [this](auto& writer) { Write(writer); });`
	`21`	`+ utils::statistics::RegisterWriterScope(context, config.Name() + ".replies", [this](auto& writer) {`
	`22`	`+ Write(writer);`
	`23`	`+ });`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`Resolver& Component::GetResolver() { return resolver_; }`