Refactor metrics

Author: Gazizonoki

include/ydb-cpp-sdk/client/extension_common/extension.h

@@ -65,8 +65,9 @@ void TDriver::AddExtension(typename TExtension::TParams params) {
     typename TExtension::IApi* api = TExtension::IApi::Create(*this);
     auto extension = new TExtension(params, api);
     extension->SelfRegister(*this);
-    if (api)
+    if (api) {
         api->SelfRegister(*this);
+    }
 }
 
 } // namespace NYdb

include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_client.h

@@ -18,23 +18,22 @@ class TSolomonStatPullExtension: public NYdb::IExtension {
         friend class TSolomonStatPullExtension;
 
     public:
-        TParams(const std::string& host
-                , ui16 port
-                , const std::string& project
-                , const std::string& service
-                , const std::string& cluster
-                , const std::vector<std::pair<std::string, std::string>>& labels = {});
+        TParams(const std::string& host,
+                std::uint16_t port,
+                const std::string& project,
+                const std::string& service,
+                const std::string& cluster,
+                const std::vector<std::pair<std::string, std::string>>& labels = {});
 
         NMonitoring::TLabels GetLabels() const;
 
     private:
         const std::string Host_;
-        ui16 Port_;
+        std::uint16_t Port_;
         NMonitoring::TLabels Labels_;
     };
 
     TSolomonStatPullExtension(const TParams& params, IApi* api);
-    ~TSolomonStatPullExtension();
 
 private:
     class TSolomonStatPage: public NMonitoring::IMonPage {

include/ydb-cpp-sdk/client/extensions/solomon_stats/pull_connector.h

@@ -45,24 +45,30 @@ class TMetricRegistryConnector: public NYdb::IExtension {
 };
 
 inline void AddMetricRegistry(NYdb::TDriver& driver, NMonitoring::IMetricRegistry* ptr) {
-    if (!ptr)
+    if (!ptr) {
         return;
+    }
+
     using TConnector = TMetricRegistryConnector<NMonitoring::IMetricRegistry*>;
 
     driver.AddExtension<TConnector>(TConnector::TParams(ptr));
 }
 
 inline void AddMetricRegistry(NYdb::TDriver& driver, std::shared_ptr<NMonitoring::IMetricRegistry> ptr) {
-    if (!ptr)
+    if (!ptr) {
         return;
+    }
+
     using TConnector = TMetricRegistryConnector<std::shared_ptr<NMonitoring::IMetricRegistry>>;
 
     driver.AddExtension<TConnector>(TConnector::TParams(ptr));
 }
 
 inline void AddMetricRegistry(NYdb::TDriver& driver, TAtomicSharedPtr<NMonitoring::IMetricRegistry> ptr) {
-    if (!ptr)
+    if (!ptr) {
         return;
+    }
+
     using TConnector = TMetricRegistryConnector<TAtomicSharedPtr<NMonitoring::IMetricRegistry>>;
 
     driver.AddExtension<TConnector>(TConnector::TParams(ptr));

src/client/CMakeLists.txt

@@ -12,6 +12,7 @@ add_subdirectory(iam)
 add_subdirectory(iam_private)
 add_subdirectory(impl)
 add_subdirectory(import)
+add_subdirectory(metrics_providers)
 add_subdirectory(monitoring)
 add_subdirectory(operation)
 add_subdirectory(params)

src/client/extension_common/CMakeLists.txt

@@ -3,6 +3,7 @@ _ydb_sdk_add_library(client-extension_common)
 target_link_libraries(client-extension_common PUBLIC
   yutil
   monlib-metrics
+  client-metrics_providers-monlib
   client-ydb_driver
 )
 

src/client/extension_common/extension.cpp

@@ -2,9 +2,11 @@
 
 #define INCLUDE_YDB_INTERNAL_H
 #include <src/client/impl/internal/grpc_connections/grpc_connections.h>
-#include <src/client/impl/internal/stats_extractor/extractor.h>
 #undef INCLUDE_YDB_INTERNAL_H
 
+#include <src/client/metrics_providers/monlib/provider.h>
+
+
 namespace NYdb::inline V3 {
 
 void IExtension::SelfRegister(TDriver driver) {
@@ -15,6 +17,34 @@ void IExtensionApi::SelfRegister(TDriver driver) {
     CreateInternalInterface(driver)->RegisterExtensionApi(this);
 }
 
+class TStatsExtractor: public NSdkStats::IStatApi {
+public:
+    TStatsExtractor(std::shared_ptr<IInternalClient> client)
+        : Client_(client)
+    {}
+
+    virtual void SetMetricRegistry(::NMonitoring::IMetricRegistry* sensorsRegistry) override {
+        auto strong = Client_.lock();
+        if (strong) {
+            strong->StartStatCollecting(NMetrics::CreateMonlibMetricsProvider(sensorsRegistry));
+        }
+    }
+
+    void Accept(NMonitoring::IMetricConsumer* consumer) const override {
+        auto strong = Client_.lock();
+        if (strong) {
+            auto sensorsRegistry = strong->GetMetricRegistry();
+            auto monlibRegistry = NMetrics::TryGetUnderlyingMetricsRegistry(sensorsRegistry);
+            Y_ABORT_UNLESS(monlibRegistry, "IMetricRegistry is not a TMonlibMetricsProvider in Stats Extractor");
+            monlibRegistry->Accept(TInstant::Zero(), consumer);
+        } else {
+            throw NSdkStats::DestroyedClientException();
+        }
+    }
+private:
+    std::weak_ptr<IInternalClient> Client_;
+};
+
 namespace NSdkStats {
 
 IStatApi* IStatApi::Create(TDriver driver) {

src/client/extensions/solomon_stats/pull_client.cpp

@@ -2,30 +2,32 @@
 
 namespace NSolomonStatExtension::inline V3 {
 
-TSolomonStatPullExtension::TParams::TParams(const std::string& host
-    , ui16 port
-    , const std::string& project
-    , const std::string& service
-    , const std::string& cluster
-    , const std::vector<std::pair<std::string, std::string>>& labels)
-    : Host_(host), Port_(port), Labels_()
+TSolomonStatPullExtension::TParams::TParams(const std::string& host,
+                                            std::uint16_t port,
+                                            const std::string& project,
+                                            const std::string& service,
+                                            const std::string& cluster,
+                                            const std::vector<std::pair<std::string, std::string>>& labels)
+    : Host_(host)
+    , Port_(port)
+    , Labels_()
 {
     Labels_.Add("project", project);
     Labels_.Add("service", service);
     Labels_.Add("cluster", cluster);
     for (const auto& label: labels) {
-         Labels_.Add(label.first, label.second);
+        Labels_.Add(label.first, label.second);
     }
 }
 
 NMonitoring::TLabels TSolomonStatPullExtension::TParams::GetLabels() const {
     return Labels_;
 }
 
-
 TSolomonStatPullExtension::TSolomonStatPage::TSolomonStatPage(const std::string& title, const std::string& path, IApi* api)
-    : NMonitoring::IMonPage(TString(title), TString(path)), Api_(api)
-    { }
+    : NMonitoring::IMonPage(TString(title), TString(path))
+    , Api_(api)
+{}
 
 void TSolomonStatPullExtension::TSolomonStatPage::Output(NMonitoring::IMonHttpRequest& request) {
     request.Output() << NMonitoring::HTTPOKJSON;
@@ -35,13 +37,12 @@ void TSolomonStatPullExtension::TSolomonStatPage::Output(NMonitoring::IMonHttpRe
 
 TSolomonStatPullExtension::TSolomonStatPullExtension(const TSolomonStatPullExtension::TParams& params, IApi* api)
     : MetricRegistry_(new NMonitoring::TMetricRegistry(params.GetLabels()))
-    , MonService_(params.Port_, TString(params.Host_), 0), Page_( new TSolomonStatPage("stats", "Statistics", api) ) {
-        api->SetMetricRegistry(MetricRegistry_.get());
-        MonService_.Register(Page_);
-        MonService_.StartOrThrow();
-    }
-
-TSolomonStatPullExtension::~TSolomonStatPullExtension()
-    { }
+    , MonService_(params.Port_, TString(params.Host_), 0)
+    , Page_(new TSolomonStatPage("stats", "Statistics", api))
+{
+    api->SetMetricRegistry(MetricRegistry_.get());
+    MonService_.Register(Page_);
+    MonService_.StartOrThrow();
+}
 
 } // NSolomonStatExtension

src/client/impl/endpoints/endpoints.cpp

@@ -1,6 +1,5 @@
 #include "endpoints.h"
 
-#include <library/cpp/monlib/metrics/metric_registry.h>
 #include <library/cpp/string_utils/quote/quote.h>
 
 #include <util/random/random.h>
@@ -80,7 +79,7 @@ std::vector<std::string> TEndpointElectorSafe::SetNewState(std::vector<TEndpoint
         }
     }
 
-    Sort(uniqRec.begin(), uniqRec.end());
+    std::sort(uniqRec.begin(), uniqRec.end());
 
     auto bestK = GetBestK(uniqRec);
 
@@ -176,7 +175,7 @@ void TEndpointElectorSafe::PessimizeEndpoint(const std::string& endpoint) {
             }
         }
     }
-    Sort(Records_.begin(), Records_.end());
+    std::sort(Records_.begin(), Records_.end());
     BestK_ = GetBestK(Records_);
 }
 

src/client/impl/endpoints/endpoints.h

@@ -1,11 +1,12 @@
 #pragma once
 
+#include <src/client/impl/stats/stats.h>
+
 #include <atomic>
 #include <shared_mutex>
 #include <unordered_map>
 #include <vector>
 #include <string>
-#include <src/client/impl/stats/stats.h>
 
 namespace NYdb::inline V3 {
 
@@ -124,9 +125,10 @@ class TEndpointElectorSafe {
     std::unordered_map<ui64, TKnownEndpoint> KnownEndpointsByNodeId_;
     std::int32_t BestK_ = -1;
     std::atomic_int PessimizationRatio_ = 0;
-    NSdkStats::TAtomicCounter<::NMonitoring::TIntGauge> EndpointCountGauge_;
-    NSdkStats::TAtomicCounter<::NMonitoring::TIntGauge> PessimizationRatioGauge_;
-    NSdkStats::TAtomicCounter<::NMonitoring::TIntGauge> EndpointActiveGauge_;
+
+    NSdkStats::TAtomicCounter<NMetrics::IIntGauge> EndpointCountGauge_;
+    NSdkStats::TAtomicCounter<NMetrics::IIntGauge> PessimizationRatioGauge_;
+    NSdkStats::TAtomicCounter<NMetrics::IIntGauge> EndpointActiveGauge_;
 };
 
 // Used to track object

src/client/impl/internal/db_driver_state/state.cpp

@@ -271,7 +271,7 @@ NThreading::TFuture<void> TDbDriverStateTracker::SendNotification(
     return NThreading::WaitExceptionOrAll(results);
 }
 
-void TDbDriverStateTracker::SetMetricRegistry(NMonitoring::TMetricRegistry *sensorsRegistry) {
+void TDbDriverStateTracker::SetMetricRegistry(std::shared_ptr<NMetrics::IMetricsProvider> sensorsRegistry) {
     std::vector<std::weak_ptr<TDbDriverState>> states;
     {
         std::shared_lock lock(Lock_);