Added possibility to report histograms as single-counter as well as multiple-counters in TRequestCounters::TStatCounters

cloud/blockstore/apps/client/lib/command.cpp

@@ -470,7 +470,10 @@ void TCommand::Init()
         false);
     *versionCounter = 1;
 
-    RequestStats = CreateClientRequestStats(clientGroup, Timer);
+    RequestStats = CreateClientRequestStats(
+        clientGroup,
+        Timer,
+        EHistogramCounterOption::ReportMultipleCounters);
 
     VolumeStats = CreateVolumeStats(
         Monitoring,

cloud/blockstore/config/diagnostics.proto

@@ -203,4 +203,10 @@ message TDiagnosticsConfig
 
     // Monitoring data necessary for link generation on monpages.
     optional TMonitoringUrlData MonitoringUrlData = 47;
+
+    // Report histogram as a set of manually created counters
+    optional bool ReportHistogramAsMultipleCounters = 48;
+
+    // Report histogram as a single counter (THistogramCounter)
+    optional bool ReportHistogramAsSingleCounter = 49;
 }

cloud/blockstore/libs/daemon/common/bootstrap.cpp

@@ -277,7 +277,10 @@ void TBootstrapBase::Init()
     }
     PostponedCriticalEvents.clear();
 
-    RequestStats = CreateServerRequestStats(serverGroup, Timer);
+    RequestStats = CreateServerRequestStats(
+        serverGroup,
+        Timer,
+        Configs->DiagnosticsConfig->GetHistogramCounterOptions());
 
     if (!VolumeStats) {
         VolumeStats = CreateVolumeStats(

cloud/blockstore/libs/diagnostics/config.cpp

@@ -51,6 +51,8 @@ namespace {
     xxx(Mirror2SSDDowntimeThreshold,         TDuration,       TDuration::Seconds(5)                     )\
     xxx(Mirror3SSDDowntimeThreshold,         TDuration,       TDuration::Seconds(5)                     )\
     xxx(LocalSSDDowntimeThreshold,           TDuration,       TDuration::Seconds(5)                     )\
+    xxx(ReportHistogramAsMultipleCounters,   bool,            true                                      )\
+    xxx(ReportHistogramAsSingleCounter,      bool,            false                                     )\
 // BLOCKSTORE_DIAGNOSTICS_CONFIG
 
 #define BLOCKSTORE_DIAGNOSTICS_DECLARE_CONFIG(name, type, value)               \
@@ -175,6 +177,19 @@ TRequestThresholds TDiagnosticsConfig::GetRequestThresholds() const
         DiagnosticsConfig.GetRequestThresholds());
 }
 
+EHistogramCounterOptions TDiagnosticsConfig::GetHistogramCounterOptions() const
+{
+    EHistogramCounterOptions histogramCounterOptions;
+    if (GetReportHistogramAsMultipleCounters()) {
+        histogramCounterOptions |=
+            EHistogramCounterOption::ReportMultipleCounters;
+    }
+    if (GetReportHistogramAsSingleCounter()) {
+        histogramCounterOptions |= EHistogramCounterOption::ReportSingleCounter;
+    }
+    return histogramCounterOptions;
+}
+
 void TDiagnosticsConfig::Dump(IOutputStream& out) const
 {
 #define BLOCKSTORE_CONFIG_DUMP(name, ...)                                      \

cloud/blockstore/libs/diagnostics/config.h

@@ -4,6 +4,7 @@
 
 #include <cloud/blockstore/config/diagnostics.pb.h>
 
+#include "cloud/storage/core/libs/diagnostics/histogram_counter_options.h"
 #include <cloud/storage/core/libs/diagnostics/trace_reader.h>
 
 #include <util/generic/string.h>
@@ -146,7 +147,11 @@ class TDiagnosticsConfig
     TDuration GetMirror3SSDDowntimeThreshold() const;
     TDuration GetMirror2SSDDowntimeThreshold() const;
     TDuration GetLocalSSDDowntimeThreshold() const;
+    bool GetReportHistogramAsMultipleCounters() const;
+    bool GetReportHistogramAsSingleCounter() const;
+
     TRequestThresholds GetRequestThresholds() const;
+    EHistogramCounterOptions GetHistogramCounterOptions() const;
 
     void Dump(IOutputStream& out) const;
     void DumpHtml(IOutputStream& out) const;

cloud/blockstore/libs/diagnostics/request_stats.cpp

@@ -192,38 +192,55 @@ class TRequestStats final
     TRequestStats(
             TDynamicCountersPtr counters,
             bool isServerSide,
-            ITimerPtr timer)
+            ITimerPtr timer,
+            EHistogramCounterOptions histogramCounterOptions)
         : Counters(std::move(counters))
         , IsServerSide(isServerSide)
-        , Total(MakeRequestCounters(timer,
+        , Total(MakeRequestCounters(
+            timer,
             TRequestCounters::EOption::ReportDataPlaneHistogram |
-            TRequestCounters::EOption::AddSpecialCounters))
-        , TotalSSD(MakeRequestCounters(timer,
+                TRequestCounters::EOption::AddSpecialCounters,
+            histogramCounterOptions))
+        , TotalSSD(MakeRequestCounters(
+            timer,
             TRequestCounters::EOption::ReportDataPlaneHistogram |
-            TRequestCounters::EOption::OnlyReadWriteRequests))
-        , TotalHDD(MakeRequestCounters(timer,
+                TRequestCounters::EOption::OnlyReadWriteRequests,
+            histogramCounterOptions))
+        , TotalHDD(MakeRequestCounters(
+            timer,
+                TRequestCounters::EOption::ReportDataPlaneHistogram |
+                TRequestCounters::EOption::OnlyReadWriteRequests,
+            histogramCounterOptions))
+        , TotalSSDNonrepl(MakeRequestCounters(
+            timer,
             TRequestCounters::EOption::ReportDataPlaneHistogram |
-            TRequestCounters::EOption::OnlyReadWriteRequests))
-        , TotalSSDNonrepl(MakeRequestCounters(timer,
+                TRequestCounters::EOption::AddSpecialCounters |
+                TRequestCounters::EOption::OnlyReadWriteRequests,
+            histogramCounterOptions))
+        , TotalSSDMirror2(MakeRequestCounters(
+            timer,
             TRequestCounters::EOption::ReportDataPlaneHistogram |
-            TRequestCounters::EOption::AddSpecialCounters |
-            TRequestCounters::EOption::OnlyReadWriteRequests))
-        , TotalSSDMirror2(MakeRequestCounters(timer,
+                TRequestCounters::EOption::AddSpecialCounters |
+                TRequestCounters::EOption::OnlyReadWriteRequests,
+            histogramCounterOptions))
+        , TotalSSDMirror3(MakeRequestCounters(
+            timer,
             TRequestCounters::EOption::ReportDataPlaneHistogram |
-            TRequestCounters::EOption::AddSpecialCounters |
-            TRequestCounters::EOption::OnlyReadWriteRequests))
-        , TotalSSDMirror3(MakeRequestCounters(timer,
+                TRequestCounters::EOption::AddSpecialCounters |
+                TRequestCounters::EOption::OnlyReadWriteRequests,
+            histogramCounterOptions))
+        , TotalSSDLocal(MakeRequestCounters(
+            timer,
             TRequestCounters::EOption::ReportDataPlaneHistogram |
-            TRequestCounters::EOption::AddSpecialCounters |
-            TRequestCounters::EOption::OnlyReadWriteRequests))
-        , TotalSSDLocal(MakeRequestCounters(timer,
+                TRequestCounters::EOption::AddSpecialCounters |
+                TRequestCounters::EOption::OnlyReadWriteRequests,
+            histogramCounterOptions))
+        , TotalHDDNonrepl(MakeRequestCounters(
+            timer,
             TRequestCounters::EOption::ReportDataPlaneHistogram |
-            TRequestCounters::EOption::AddSpecialCounters |
-            TRequestCounters::EOption::OnlyReadWriteRequests))
-        , TotalHDDNonrepl(MakeRequestCounters(timer,
-            TRequestCounters::EOption::ReportDataPlaneHistogram |
-            TRequestCounters::EOption::AddSpecialCounters |
-            TRequestCounters::EOption::OnlyReadWriteRequests))
+                TRequestCounters::EOption::AddSpecialCounters |
+                TRequestCounters::EOption::OnlyReadWriteRequests,
+            histogramCounterOptions))
     {
         Total.Register(*Counters);
 
@@ -650,22 +667,26 @@ struct TRequestStatsStub final
 
 IRequestStatsPtr CreateClientRequestStats(
     TDynamicCountersPtr counters,
-    ITimerPtr timer)
+    ITimerPtr timer,
+    EHistogramCounterOptions histogramCounterOptions)
 {
     return std::make_shared<TRequestStats>(
         std::move(counters),
         false,
-        std::move(timer));
+        std::move(timer),
+        histogramCounterOptions);
 }
 
 IRequestStatsPtr CreateServerRequestStats(
     TDynamicCountersPtr counters,
-    ITimerPtr timer)
+    ITimerPtr timer,
+    EHistogramCounterOptions histogramCounterOptions)
 {
     return std::make_shared<TRequestStats>(
         std::move(counters),
         true,
-        std::move(timer));
+        std::move(timer),
+        histogramCounterOptions);
 }
 
 IRequestStatsPtr CreateRequestStatsStub()

cloud/blockstore/libs/diagnostics/request_stats.h

@@ -75,10 +75,12 @@ struct IRequestStats
 
 IRequestStatsPtr CreateClientRequestStats(
     NMonitoring::TDynamicCountersPtr counters,
-    ITimerPtr timer);
+    ITimerPtr timer,
+    EHistogramCounterOptions histogramCounterOptions);
 IRequestStatsPtr CreateServerRequestStats(
     NMonitoring::TDynamicCountersPtr counters,
-    ITimerPtr timer);
+    ITimerPtr timer,
+    EHistogramCounterOptions histogramCounterOptions);
 IRequestStatsPtr CreateRequestStatsStub();
 
 }   // namespace NCloud::NBlockStore

cloud/blockstore/libs/diagnostics/request_stats_ut.cpp

@@ -63,7 +63,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
         auto monitoring = CreateMonitoringServiceStub();
         auto requestStats = CreateServerRequestStats(
             monitoring->GetCounters(),
-            CreateWallClockTimer());
+            CreateWallClockTimer(),
+            EHistogramCounterOption::ReportMultipleCounters);
 
         auto totalCounters = monitoring
             ->GetCounters()
@@ -228,7 +229,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
         auto monitoring = CreateMonitoringServiceStub();
         auto requestStats = CreateServerRequestStats(
             monitoring->GetCounters(),
-            CreateWallClockTimer());
+            CreateWallClockTimer(),
+            EHistogramCounterOption::ReportMultipleCounters);
 
         auto totalCounters =
             monitoring->GetCounters()->GetSubgroup("request", "WriteBlocks");
@@ -316,7 +318,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
         auto monitoring = CreateMonitoringServiceStub();
         auto requestStats = CreateServerRequestStats(
             monitoring->GetCounters(),
-            CreateWallClockTimer());
+            CreateWallClockTimer(),
+            EHistogramCounterOption::ReportMultipleCounters);
 
         auto totalCounters = monitoring
             ->GetCounters()
@@ -427,7 +430,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
         auto monitoring = CreateMonitoringServiceStub();
         auto requestStats = CreateServerRequestStats(
             monitoring->GetCounters(),
-            CreateWallClockTimer());
+            CreateWallClockTimer(),
+            EHistogramCounterOption::ReportMultipleCounters);
 
         auto totalCounters = monitoring
             ->GetCounters()
@@ -523,7 +527,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
         auto monitoring = CreateMonitoringServiceStub();
         auto requestStats = CreateServerRequestStats(
             monitoring->GetCounters(),
-            CreateWallClockTimer());
+            CreateWallClockTimer(),
+            EHistogramCounterOption::ReportMultipleCounters);
 
         auto totalCounters = monitoring
             ->GetCounters()
@@ -591,7 +596,8 @@ Y_UNIT_TEST_SUITE(TRequestStatsTest)
         auto monitoring = CreateMonitoringServiceStub();
         auto requestStats = CreateServerRequestStats(
             monitoring->GetCounters(),
-            CreateWallClockTimer());
+            CreateWallClockTimer(),
+            EHistogramCounterOption::ReportMultipleCounters);
 
         unsigned int totalShots = 0;
         auto shoot = [&] (auto mediaKind, unsigned int count) {

cloud/blockstore/libs/diagnostics/server_stats_ut.cpp

@@ -142,7 +142,10 @@ Y_UNIT_TEST_SUITE(TServerStatsTest)
             std::make_shared<TDiagnosticsConfig>(),
             monitoring,
             CreateProfileLogStub(),
-            CreateServerRequestStats(serverGroup,timer),
+            CreateServerRequestStats(
+                serverGroup,
+                timer,
+                EHistogramCounterOption::ReportMultipleCounters),
             std::move(volumeStats)
         );
 
@@ -209,7 +212,10 @@ Y_UNIT_TEST_SUITE(TServerStatsTest)
             std::make_shared<TDiagnosticsConfig>(),
             monitoring,
             CreateProfileLogStub(),
-            CreateServerRequestStats(serverGroup,timer),
+            CreateServerRequestStats(
+                serverGroup,
+                timer,
+                EHistogramCounterOption::ReportMultipleCounters),
             std::move(volumeStats)
         );
 
@@ -242,7 +248,10 @@ Y_UNIT_TEST_SUITE(TServerStatsTest)
             std::make_shared<TDiagnosticsConfig>(),
             monitoring,
             CreateProfileLogStub(),
-            CreateServerRequestStats(serverGroup,timer),
+            CreateServerRequestStats(
+                serverGroup,
+                timer,
+                EHistogramCounterOption::ReportMultipleCounters),
             std::move(volumeStats)
         );
 
@@ -323,7 +332,10 @@ Y_UNIT_TEST_SUITE(TServerStatsTest)
             std::make_shared<TDiagnosticsConfig>(),
             monitoring,
             CreateProfileLogStub(),
-            CreateServerRequestStats(serverGroup, timer),
+            CreateServerRequestStats(
+                serverGroup,
+                timer,
+                EHistogramCounterOption::ReportMultipleCounters),
             std::move(volumeStats)
         );
 

cloud/blockstore/libs/diagnostics/stats_helpers.cpp

@@ -9,7 +9,8 @@ namespace NCloud::NBlockStore {
 
 TRequestCounters MakeRequestCounters(
     ITimerPtr timer,
-    TRequestCounters::EOptions options)
+    TRequestCounters::EOptions options,
+    EHistogramCounterOptions histogramCounterOptions)
 {
     return TRequestCounters(
         std::move(timer),
@@ -24,7 +25,8 @@ TRequestCounters MakeRequestCounters(
             const auto bt = static_cast<EBlockStoreRequest>(t);
             return IsNonLocalReadWriteRequest(bt);
         },
-        options
+        options,
+        histogramCounterOptions
     );
 }
 

cloud/blockstore/libs/diagnostics/stats_helpers.h

@@ -3,13 +3,15 @@
 #include "public.h"
 
 #include <cloud/storage/core/libs/diagnostics/request_counters.h>
+#include <cloud/storage/core/libs/diagnostics/histogram_counter_options.h>
 
 namespace NCloud::NBlockStore {
 
 ////////////////////////////////////////////////////////////////////////////////
 
 TRequestCounters MakeRequestCounters(
     ITimerPtr timer,
-    TRequestCounters::EOptions options);
+    TRequestCounters::EOptions options,
+    EHistogramCounterOptions histogramCounterOptions);
 
 }   // namespace NCloud::NBlockStore

cloud/blockstore/libs/diagnostics/volume_stats.cpp

@@ -270,12 +270,14 @@ class TVolumeInfo final
     TVolumeInfo(
             std::shared_ptr<TVolumeInfoBase> volumeBase,
             ITimerPtr timer,
-            TRealInstanceId realInstanceId)
+            TRealInstanceId realInstanceId,
+            EHistogramCounterOptions histogramCounterOptions)
         : VolumeBase(std::move(volumeBase))
         , RealInstanceId(std::move(realInstanceId))
         , RequestCounters(MakeRequestCounters(
             std::move(timer),
-            GetRequestCountersOptions(*VolumeBase)))
+            GetRequestCountersOptions(*VolumeBase),
+            histogramCounterOptions))
     {}
 
     const NProto::TVolume& GetInfo() const override
@@ -858,7 +860,8 @@ class TVolumeStats final
         auto info = std::make_shared<TVolumeInfo>(
             volumeBase,
             Timer,
-            realInstanceId);
+            realInstanceId,
+            DiagnosticsConfig->GetHistogramCounterOptions());
 
         if (!Counters) {
             InitCounters();

cloud/blockstore/libs/endpoints_vhost/external_endpoint_stats_ut.cpp

@@ -124,7 +124,10 @@ struct TFixture
             std::make_shared<TDiagnosticsConfig>(),
             Monitoring,
             CreateProfileLogStub(),
-            CreateServerRequestStats(serverGroup, Timer),
+            CreateServerRequestStats(
+                serverGroup,
+                Timer,
+                EHistogramCounterOption::ReportMultipleCounters),
             std::move(volumeStats)
         );