intermediate changes

ref:08d0f6ebc75701201720c15ba8b41bfbdf780a37

1 files changed, 16 insertions, 10 deletions

diff --git a/library/cpp/monlib/metrics/metric_registry.h b/library/cpp/monlib/metrics/metric_registry.h
index 4000ed6803..f61db6ce5f 100644
--- a/library/cpp/monlib/metrics/metric_registry.h
+++ b/library/cpp/monlib/metrics/metric_registry.h
@@ -30,6 +30,14 @@ namespace NMonitoring {
         virtual IHistogram* HistogramRate(
                 ILabelsPtr labels,
                 IHistogramCollectorPtr collector) = 0;
+
+        virtual IHistogram* HistogramCounter(
+                ILabelsPtr labels,
+                std::function<IHistogramCollectorPtr()> makeHistogramCollector) = 0;
+
+        virtual IHistogram* HistogramRate(
+                ILabelsPtr labels,
+                std::function<IHistogramCollectorPtr()> makeHistogramCollector) = 0;
     };
 
     class IMetricSupplier {
@@ -44,7 +52,6 @@ namespace NMonitoring {
     public:
         virtual const TLabels& CommonLabels() const noexcept = 0;
         virtual void RemoveMetric(const ILabels& labels) noexcept = 0;
-        virtual bool HasMetric(const ILabels& labels) noexcept = 0;
     };
 
 
@@ -94,14 +101,6 @@ namespace NMonitoring {
                 TLabels labels,
                 std::function<IHistogramCollectorPtr()> makeHistogramCollector);
 
-        THistogram* HistogramCounter(
-                TLabels labels,
-                nullptr_t);
-
-        THistogram* HistogramRate(
-                TLabels labels,
-                nullptr_t);
-
         /**
          * Set all registered metrics to zero
          */
@@ -119,7 +118,6 @@ namespace NMonitoring {
         }
 
         void RemoveMetric(const ILabels& labels) noexcept override;
-        bool HasMetric(const ILabels &labels) noexcept override;
 
     private:
         TGauge* Gauge(ILabelsPtr labels) override;
@@ -139,6 +137,14 @@ namespace NMonitoring {
                 ILabelsPtr labels,
                 IHistogramCollectorPtr collector) override;
 
+        THistogram* HistogramCounter(
+                ILabelsPtr labels,
+                std::function<IHistogramCollectorPtr()> makeHistogramCollector) override;
+
+        THistogram* HistogramRate(
+                ILabelsPtr labels,
+                std::function<IHistogramCollectorPtr()> makeHistogramCollector) override;
+
     private:
         THolder<TRWMutex> Lock_ = MakeHolder<TRWMutex>();
         THashMap<ILabelsPtr, IMetricPtr> Metrics_;