remove old histograms KIKIMR-12059

ref:c18e95202765a99edf984c6cf07a69abe4602607

16 files changed, 47 insertions, 79 deletions

diff --git a/library/cpp/actors/interconnect/interconnect_channel.h b/library/cpp/actors/interconnect/interconnect_channel.h
index e4a0ae3cdab..cf68cd27fd3 100644
--- a/library/cpp/actors/interconnect/interconnect_channel.h
+++ b/library/cpp/actors/interconnect/interconnect_channel.h
@@ -9,7 +9,6 @@
 #include <util/generic/map.h>
 #include <util/stream/walk.h>
 #include <library/cpp/actors/wilson/wilson_event.h>
-#include <library/cpp/actors/helpers/mon_histogram_helper.h>
 
 #include "interconnect_common.h"
 #include "interconnect_counters.h"
diff --git a/library/cpp/actors/interconnect/interconnect_counters.cpp b/library/cpp/actors/interconnect/interconnect_counters.cpp
index 224160d4b4f..5d0b31737c3 100644
--- a/library/cpp/actors/interconnect/interconnect_counters.cpp
+++ b/library/cpp/actors/interconnect/interconnect_counters.cpp
@@ -205,8 +205,7 @@ namespace {
             *TotalBytesRead += value;
         }
 
-        void UpdateLegacyPingTimeHist(ui64 value) override {
-            LegacyPingTimeHist.Add(value);
+        void UpdatePingTimeHistogram(ui64 value) override {
             PingTimeHistogram->Collect(value);
         }
 
@@ -278,9 +277,6 @@ namespace {
                 InflyLimitReach = AdaptiveCounters->GetCounter("InflyLimitReach", true);
                 InflightDataAmount = AdaptiveCounters->GetCounter("Inflight_Data");
 
-                LegacyPingTimeHist = {};
-                LegacyPingTimeHist.Init(AdaptiveCounters.Get(), "PingTimeHist", "mks", 125, 18);
-
                 PingTimeHistogram = AdaptiveCounters->GetHistogram(
                     "PingTimeUs", NMonitoring::ExponentialHistogram(18, 2, 125));
             }
@@ -329,7 +325,6 @@ namespace {
         NMonitoring::TDynamicCounters::TCounterPtr SpuriousReadWakeups;
         NMonitoring::TDynamicCounters::TCounterPtr UsefulWriteWakeups;
         NMonitoring::TDynamicCounters::TCounterPtr SpuriousWriteWakeups;
-        NMon::THistogramCounterHelper LegacyPingTimeHist;
         NMonitoring::THistogramPtr PingTimeHistogram;
 
         std::unordered_map<ui16, TOutputChannel> OutputChannels;
@@ -520,7 +515,7 @@ namespace {
             TotalBytesRead_->Add(value);
         }
 
-        void UpdateLegacyPingTimeHist(ui64 value) override {
+        void UpdatePingTimeHistogram(ui64 value) override {
             PingTimeHistogram_->Record(value);
         }
 
diff --git a/library/cpp/actors/interconnect/interconnect_counters.h b/library/cpp/actors/interconnect/interconnect_counters.h
index e30f03a0bcc..b5a63b45513 100644
--- a/library/cpp/actors/interconnect/interconnect_counters.h
+++ b/library/cpp/actors/interconnect/interconnect_counters.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <library/cpp/actors/helpers/mon_histogram_helper.h>
-
 #include <util/system/valgrind.h>
 
 #include "types.h"
@@ -42,7 +40,7 @@ public:
     virtual void IncInputChannelsIncomingEvents(ui16 channel) = 0;
     virtual void IncRecvSyscalls() = 0;
     virtual void AddTotalBytesRead(ui64 value) = 0;
-    virtual void UpdateLegacyPingTimeHist(ui64 value) = 0;
+    virtual void UpdatePingTimeHistogram(ui64 value) = 0;
     virtual void UpdateOutputChannelTraffic(ui16 channel, ui64 value) = 0;
     virtual void UpdateOutputChannelEvents(ui16 channel) = 0;
     TString GetHumanFriendlyPeerHostName() const {
diff --git a/library/cpp/actors/interconnect/interconnect_impl.h b/library/cpp/actors/interconnect/interconnect_impl.h
index ee29e4d3971..db598546cc9 100644
--- a/library/cpp/actors/interconnect/interconnect_impl.h
+++ b/library/cpp/actors/interconnect/interconnect_impl.h
@@ -3,7 +3,6 @@
 #include "interconnect.h"
 #include <library/cpp/actors/protos/interconnect.pb.h>
 #include <library/cpp/actors/core/event_pb.h>
-#include <library/cpp/actors/helpers/mon_histogram_helper.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
 namespace NActors {
diff --git a/library/cpp/actors/interconnect/interconnect_tcp_input_session.cpp b/library/cpp/actors/interconnect/interconnect_tcp_input_session.cpp
index c7fca64c600..65bb956e584 100644
--- a/library/cpp/actors/interconnect/interconnect_tcp_input_session.cpp
+++ b/library/cpp/actors/interconnect/interconnect_tcp_input_session.cpp
@@ -197,7 +197,7 @@ namespace NActors {
                 ui64 sendTime = AtomicGet(Context->ControlPacketSendTimer);
                 TDuration duration = CyclesToDuration(GetCycleCountFast() - sendTime);
                 const auto durationUs = duration.MicroSeconds();
-                Metrics->UpdateLegacyPingTimeHist(durationUs);
+                Metrics->UpdatePingTimeHistogram(durationUs);
                 PingQ.push_back(duration);
                 if (PingQ.size() > 16) {
                     PingQ.pop_front();
@@ -456,7 +456,7 @@ namespace NActors {
         const auto pingUs = ping.MicroSeconds();
         Context->PingRTT_us = pingUs;
         NewPingProtocol = true;
-        Metrics->UpdateLegacyPingTimeHist(pingUs);
+        Metrics->UpdatePingTimeHistogram(pingUs);
     }
 
     void TInputSessionTCP::HandleClock(TInstant clock) {
diff --git a/library/cpp/actors/interconnect/interconnect_tcp_session.h b/library/cpp/actors/interconnect/interconnect_tcp_session.h
index c7f3113b55a..5d4a381e1f5 100644
--- a/library/cpp/actors/interconnect/interconnect_tcp_session.h
+++ b/library/cpp/actors/interconnect/interconnect_tcp_session.h
@@ -4,7 +4,6 @@
 #include <library/cpp/actors/core/event_pb.h>
 #include <library/cpp/actors/core/events.h>
 #include <library/cpp/actors/core/log.h>
-#include <library/cpp/actors/helpers/mon_histogram_helper.h>
 #include <library/cpp/actors/protos/services_common.pb.h>
 #include <library/cpp/actors/util/datetime.h>
 #include <library/cpp/actors/util/rope.h>
diff --git a/ydb/core/client/server/msgbus_http_server.cpp b/ydb/core/client/server/msgbus_http_server.cpp
index 21505f4a088..10114aba57c 100644
--- a/ydb/core/client/server/msgbus_http_server.cpp
+++ b/ydb/core/client/server/msgbus_http_server.cpp
@@ -155,8 +155,10 @@ TMessageBusHttpServer::TMessageBusHttpServer(TActorSystem* actorSystem, NBus::IB
     Status500 = HttpGroup->GetCounter("500", true);
     Status503 = HttpGroup->GetCounter("503", true);
     Status504 = HttpGroup->GetCounter("504", true);
-    RequestTotalTimeHistogram.Init(HttpGroup.Get(), "RequestTotalTime", "ms", 1, 20);
-    RequestPrepareTimeHistogram.Init(HttpGroup.Get(), "RequestPrepareTime", "ms", 1, 20);
+    RequestTotalTimeHistogram = HttpGroup->GetHistogram("RequestTotalTimeMs",
+        NMonitoring::ExponentialHistogram(20, 2, 1));
+    RequestPrepareTimeHistogram = HttpGroup->GetHistogram("RequestPrepareTimeMs",
+        NMonitoring::ExponentialHistogram(20, 2, 1));
     Monitor->Register(this);
 }
 
@@ -213,7 +215,7 @@ void TMessageBusHttpServer::Output(NMonitoring::IMonHttpRequest& request) {
             TBusHttpServerSession session(this, request, Protocol, Config);
             TBusHttpIdentity identity;
             NBus::TOnMessageContext onMessageContext(message.Release(), identity, &session);
-            RequestPrepareTimeHistogram.Add(startTime.Passed() * 1000/*ms*/);
+            RequestPrepareTimeHistogram->Collect(startTime.Passed() * 1000/*ms*/);
             Handler->OnMessage(onMessageContext);
             session.Wait();
             RequestsActive->Dec();
@@ -221,7 +223,7 @@ void TMessageBusHttpServer::Output(NMonitoring::IMonHttpRequest& request) {
             IOutputStream& out(request.Output());
             out << NMonitoring::HTTPNOTFOUND;
         }
-        RequestTotalTimeHistogram.Add(startTime.Passed() * 1000/*ms*/);
+        RequestTotalTimeHistogram->Collect(startTime.Passed() * 1000/*ms*/);
     }
 }
 
diff --git a/ydb/core/client/server/msgbus_http_server.h b/ydb/core/client/server/msgbus_http_server.h
index 911978c422e..4070ca8bd5d 100644
--- a/ydb/core/client/server/msgbus_http_server.h
+++ b/ydb/core/client/server/msgbus_http_server.h
@@ -3,7 +3,6 @@
 #include <library/cpp/monlib/service/monservice.h>
 #include <library/cpp/monlib/service/pages/mon_page.h>
 #include <ydb/core/mon/mon.h>
-#include <library/cpp/actors/helpers/mon_histogram_helper.h>
 #include <ydb/public/lib/base/msgbus.h>
 #include <ydb/core/base/appdata.h>
 
@@ -31,8 +30,8 @@ public:
     NMonitoring::TDynamicCounters::TCounterPtr Status500;
     NMonitoring::TDynamicCounters::TCounterPtr Status503;
     NMonitoring::TDynamicCounters::TCounterPtr Status504;
-    NMon::THistogramCounterHelper RequestTotalTimeHistogram;
-    NMon::THistogramCounterHelper RequestPrepareTimeHistogram;
+    NMonitoring::THistogramPtr RequestTotalTimeHistogram;
+    NMonitoring::THistogramPtr RequestPrepareTimeHistogram;
 };
 
 IMessageBusHttpServer* CreateMessageBusHttpServer(TActorSystem* actorSystem, NBus::IBusServerHandler* handler, const TProtocol& protocol, const NBus::TBusServerSessionConfig& config);
diff --git a/ydb/core/client/server/msgbus_server_db.cpp b/ydb/core/client/server/msgbus_server_db.cpp
index 08f3d717864..b5a41e390b7 100644
--- a/ydb/core/client/server/msgbus_server_db.cpp
+++ b/ydb/core/client/server/msgbus_server_db.cpp
@@ -195,7 +195,7 @@ protected:
     TActorId SchemeCache;
     TIntrusivePtr<TMessageBusDbOpsCounters> DbOperationsCounters;
 
-    NMon::THistogramCounterHelper* OperationHistogram;
+    NMonitoring::THistogramPtr OperationHistogram;
     TAutoPtr<NSchemeCache::TSchemeCacheNavigate> CacheNavigate;
     NJson::TJsonValue JSON;
     THPTimer StartTime;
@@ -207,10 +207,10 @@ protected:
 
     void CompleteRequest(const TActorContext& ctx) {
         TDuration duration(TDuration::MicroSeconds(StartTime.Passed() * 1000000/*us*/));
-        if (OperationHistogram != nullptr) {
-            OperationHistogram->Add(duration.MilliSeconds());
+        if (OperationHistogram) {
+            OperationHistogram->Collect(duration.MilliSeconds());
         }
-        DbOperationsCounters->RequestTotalTimeHistogram.Add(duration.MilliSeconds());
+        DbOperationsCounters->RequestTotalTimeHistogram->Collect(duration.MilliSeconds());
         Die(ctx);
     }
 
@@ -453,7 +453,7 @@ public:
                 tableRangeOptions.FromColumns = keyFromColumns;
                 result.emplace_back(pgmBuilder.SelectRange(tableInfo.TableId, keyTypes, columnsToRead, tableRangeOptions, readTarget));
             }
-            OperationHistogram = &DbOperationsCounters->RequestSelectTimeHistogram;
+            OperationHistogram = DbOperationsCounters->RequestSelectTimeHistogram;
         }
 
         NJson::TJsonValue jsonUpdate;
@@ -469,13 +469,13 @@ public:
                     throw yexception() << "Column \"" << itVal->first << "\" not found";
                 }
             }
-            OperationHistogram = &DbOperationsCounters->RequestUpdateTimeHistogram;
+            OperationHistogram = DbOperationsCounters->RequestUpdateTimeHistogram;
         }
 
         NJson::TJsonValue jsonDelete;
         if (json.GetValue("Delete", &jsonDelete)) {
             pgmReturn = pgmBuilder.Append(pgmReturn, pgmBuilder.EraseRow(tableInfo.TableId, keyTypes, keyColumns));
-            OperationHistogram = &DbOperationsCounters->RequestUpdateTimeHistogram;
+            OperationHistogram = DbOperationsCounters->RequestUpdateTimeHistogram;
         }
 
         NJson::TJsonValue jsonBatch;
@@ -484,7 +484,7 @@ public:
             for (const NJson::TJsonValue& value : array) {
                 BuildProgram(value, pgmReturn, pgmBuilder, tableInfo, keys, columnByName, result);
             }
-            OperationHistogram = &DbOperationsCounters->RequestBatchTimeHistogram;
+            OperationHistogram = DbOperationsCounters->RequestBatchTimeHistogram;
         }
     }
 
@@ -523,7 +523,7 @@ public:
             NMiniKQL::TRuntimeNode node = pgmBuilder.Build(pgmReturn);
             TString bin = NMiniKQL::SerializeRuntimeNode(node, env);
 
-            DbOperationsCounters->RequestPrepareTimeHistogram.Add(StartTime.Passed() * 1000/*ms*/);
+            DbOperationsCounters->RequestPrepareTimeHistogram->Collect(StartTime.Passed() * 1000/*ms*/);
 
             TAutoPtr<TEvTxUserProxy::TEvProposeTransaction> Proposal(new TEvTxUserProxy::TEvProposeTransaction());
             NKikimrTxUserProxy::TEvProposeTransaction &record = Proposal->Record;
@@ -565,7 +565,6 @@ TServerDbOperation<TMessageBusInterface<TBusDbOperation>>::TServerDbOperation(
     , TxProxyId(txProxyId)
     , SchemeCache(schemeCache)
     , DbOperationsCounters(dbOperationsCounters)
-    , OperationHistogram(nullptr)
 {}
 
 template <>
@@ -581,7 +580,6 @@ TServerDbOperation<TActorInterface>::TServerDbOperation(
     , TxProxyId(txProxyId)
     , SchemeCache(schemeCache)
     , DbOperationsCounters(dbOperationsCounters)
-    , OperationHistogram(nullptr)
     , JSON(jsonValue)
     , SecurityToken(securityToken)
 {}
@@ -604,8 +602,8 @@ protected:
 
     void CompleteRequest(const TActorContext& ctx) {
         TDuration duration(TDuration::MicroSeconds(StartTime.Passed() * 1000000/*us*/));
-        DbOperationsCounters->RequestSchemaTimeHistogram.Add(duration.MilliSeconds());
-        DbOperationsCounters->RequestTotalTimeHistogram.Add(duration.MilliSeconds());
+        DbOperationsCounters->RequestSchemaTimeHistogram->Collect(duration.MilliSeconds());
+        DbOperationsCounters->RequestTotalTimeHistogram->Collect(duration.MilliSeconds());
         Die(ctx);
     }
 
@@ -872,7 +870,7 @@ public:
             }
         }
 
-        DbOperationsCounters->RequestPrepareTimeHistogram.Add(StartTime.Passed() * 1000/*ms*/);
+        DbOperationsCounters->RequestPrepareTimeHistogram->Collect(StartTime.Passed() * 1000/*ms*/);
         if (Requests.empty()) {
             return ReplyWithError(MSTATUS_ERROR, TEvTxUserProxy::TEvProposeTransactionStatus::EStatus::WrongRequest, "No valid operations were found", ctx);
         }
diff --git a/ydb/core/client/server/msgbus_server_proxy.h b/ydb/core/client/server/msgbus_server_proxy.h
index d042698becb..f9fdfdf5938 100644
--- a/ydb/core/client/server/msgbus_server_proxy.h
+++ b/ydb/core/client/server/msgbus_server_proxy.h
@@ -10,23 +10,31 @@ namespace NMsgBusProxy {
 
 struct TMessageBusDbOpsCounters : TAtomicRefCount<TMessageBusDbOpsCounters> {
     TIntrusivePtr<NMonitoring::TDynamicCounters> DbOperationsCounters;
-    NMon::THistogramCounterHelper RequestTotalTimeHistogram;
-    NMon::THistogramCounterHelper RequestPrepareTimeHistogram;
-    NMon::THistogramCounterHelper RequestUpdateTimeHistogram;
-    NMon::THistogramCounterHelper RequestSelectTimeHistogram;
-    NMon::THistogramCounterHelper RequestSchemaTimeHistogram;
-    NMon::THistogramCounterHelper RequestBatchTimeHistogram;
-    NMon::THistogramCounterHelper RequestQueryTimeHistogram;
+    NMonitoring::THistogramPtr RequestTotalTimeHistogram;
+    NMonitoring::THistogramPtr RequestPrepareTimeHistogram;
+    NMonitoring::THistogramPtr RequestUpdateTimeHistogram;
+    NMonitoring::THistogramPtr RequestSelectTimeHistogram;
+    NMonitoring::THistogramPtr RequestSchemaTimeHistogram;
+    NMonitoring::THistogramPtr RequestBatchTimeHistogram;
+    NMonitoring::THistogramPtr RequestQueryTimeHistogram;
 
     TMessageBusDbOpsCounters(const NMonitoring::TDynamicCounterPtr& counters) {
         DbOperationsCounters = GetServiceCounters(counters, "proxy")->GetSubgroup("subsystem", "db");
-        RequestTotalTimeHistogram.Init(DbOperationsCounters.Get(), "RequestTotalTime", "ms", 1, 20);
-        RequestPrepareTimeHistogram.Init(DbOperationsCounters.Get(), "RequestPrepareTime", "ms", 1, 20);
-        RequestUpdateTimeHistogram.Init(DbOperationsCounters.Get(), "RequestUpdateTime", "ms", 1, 20);
-        RequestSelectTimeHistogram.Init(DbOperationsCounters.Get(), "RequestSelectTime", "ms", 1, 20);
-        RequestSchemaTimeHistogram.Init(DbOperationsCounters.Get(), "RequestSchemaTime", "ms", 1, 20);
-        RequestBatchTimeHistogram.Init(DbOperationsCounters.Get(), "RequestBatchTime", "ms", 1, 20);
-        RequestQueryTimeHistogram.Init(DbOperationsCounters.Get(), "RequestQueryTime", "ms", 1, 20);
+
+        RequestTotalTimeHistogram = DbOperationsCounters->GetHistogram("RequestTotalTimeMs",
+            NMonitoring::ExponentialHistogram(20, 2, 1));
+        RequestPrepareTimeHistogram = DbOperationsCounters->GetHistogram("RequestPrepareTimeMs",
+            NMonitoring::ExponentialHistogram(20, 2, 1));
+        RequestUpdateTimeHistogram = DbOperationsCounters->GetHistogram("RequestUpdateTimeMs",
+            NMonitoring::ExponentialHistogram(20, 2, 1));
+        RequestSelectTimeHistogram = DbOperationsCounters->GetHistogram("RequestSelectTimeMs",
+            NMonitoring::ExponentialHistogram(20, 2, 1));
+        RequestSchemaTimeHistogram = DbOperationsCounters->GetHistogram("RequestSchemaTimeMs",
+            NMonitoring::ExponentialHistogram(20, 2, 1));
+        RequestBatchTimeHistogram = DbOperationsCounters->GetHistogram("RequestBatchTimeMs",
+            NMonitoring::ExponentialHistogram(20, 2, 1));
+        RequestQueryTimeHistogram = DbOperationsCounters->GetHistogram("RequestQueryTimeMs",
+            NMonitoring::ExponentialHistogram(20, 2, 1));
     }
 };
 
diff --git a/ydb/core/kqp/counters/kqp_counters.cpp b/ydb/core/kqp/counters/kqp_counters.cpp
index 00730e98f40..a752c543882 100644
--- a/ydb/core/kqp/counters/kqp_counters.cpp
+++ b/ydb/core/kqp/counters/kqp_counters.cpp
@@ -594,16 +594,6 @@ TKqpDbCounters::TKqpDbCounters(const NMonitoring::TDynamicCounterPtr& externalGr
 }
 
 template <typename T>
-void SaveHistogram(T& histogram, int index, const NMon::THistogramCounterHelper& helper) {
-    auto* buckets = histogram[index].MutableBuckets();
-    auto count = helper.GetBucketCount();
-    buckets->Resize(count, 0);
-    for (size_t i = 0; i < count; ++i) {
-        (*buckets)[i] = helper.GetBucketValue(i);
-    }
-}
-
-template <typename T>
 void SaveHistogram(T& histogram, int index, const NMonitoring::THistogramPtr& hgram) {
     auto* buckets = histogram[index].MutableBuckets();
     auto snapshot = hgram->Snapshot();
@@ -639,16 +629,6 @@ void TKqpDbCounters::ToProto(NKikimr::NSysView::TDbServiceCounters& counters) {
 }
 
 template <typename T>
-void LoadHistogram(T& histogram, int index, NMon::THistogramCounterHelper& helper) {
-    auto* buckets = histogram[index].MutableBuckets();
-    auto count = helper.GetBucketCount();
-    buckets->Resize(count, 0);
-    for (size_t i = 0; i < count; ++i) {
-        helper.SetBucketValue(i, (*buckets)[i]);
-    }
-}
-
-template <typename T>
 void LoadHistogram(T& histogram, int index, NMonitoring::THistogramPtr& hgram) {
     auto* buckets = histogram[index].MutableBuckets();
     auto snapshot = hgram->Snapshot();
diff --git a/ydb/core/kqp/counters/kqp_counters.h b/ydb/core/kqp/counters/kqp_counters.h
index f5815d97cff..d811bd97224 100644
--- a/ydb/core/kqp/counters/kqp_counters.h
+++ b/ydb/core/kqp/counters/kqp_counters.h
@@ -2,7 +2,6 @@
 
 #include "kqp_db_counters.h"
 
-#include <library/cpp/actors/helpers/mon_histogram_helper.h>
 #include <library/cpp/monlib/metrics/histogram_collector.h>
 
 #include <ydb/core/util/concurrent_rw_hash.h>
diff --git a/ydb/core/tx/coordinator/coordinator__plan_step.cpp b/ydb/core/tx/coordinator/coordinator__plan_step.cpp
index c1fac2ffa58..d8f93bf32fb 100644
--- a/ydb/core/tx/coordinator/coordinator__plan_step.cpp
+++ b/ydb/core/tx/coordinator/coordinator__plan_step.cpp
@@ -73,7 +73,6 @@ struct TTxCoordinator::TTxPlanStep : public TTransactionBase<TTxCoordinator> {
 
                 Self->MonCounters.StepConsideredTx->Inc();
                 auto durationMs = (ExecStartMoment - proposal->AcceptMoment).MilliSeconds();
-                Self->MonCounters.LegacyTxFromReceiveToPlan.Add(durationMs);
                 Self->MonCounters.TxFromReceiveToPlan->Collect(durationMs);
 
                 if (proposal->MaxStep < PlanOnStep) {
@@ -214,7 +213,6 @@ struct TTxCoordinator::TTxPlanStep : public TTransactionBase<TTxCoordinator> {
 
     void Complete(const TActorContext &ctx) override {
         auto durationMs = (ctx.Now() - ExecStartMoment).MilliSeconds();
-        Self->MonCounters.LegacyTxPlanLatency.Add(durationMs);
         Self->MonCounters.TxPlanLatency->Collect(durationMs);
 
         for (auto &cx : StepsToConfirm) {
diff --git a/ydb/core/tx/coordinator/coordinator_impl.cpp b/ydb/core/tx/coordinator/coordinator_impl.cpp
index 0f6e623a966..711b64d24ee 100644
--- a/ydb/core/tx/coordinator/coordinator_impl.cpp
+++ b/ydb/core/tx/coordinator/coordinator_impl.cpp
@@ -368,10 +368,8 @@ void TTxCoordinator::TryInitMonCounters(const TActorContext &ctx) {
     MonCounters.StepPlannedTx = MonCounters.Coordinator->GetCounter("Step/PlannedTx", true);
     MonCounters.StepDeclinedNoSpaceTx = MonCounters.Coordinator->GetCounter("Step/DeclinedNoSpaceTx", true);
 
-    MonCounters.LegacyTxFromReceiveToPlan.Init(MonCounters.Coordinator.Get(), "TxFromReceiveToPlan", "ms", 1, 20);
     MonCounters.TxFromReceiveToPlan = MonCounters.Coordinator->GetHistogram(
         "TxFromReceiveToPlanMs", NMonitoring::ExponentialHistogram(20, 2, 1));
-    MonCounters.LegacyTxPlanLatency.Init(MonCounters.Coordinator.Get(), "TxPlanLatency", "ms", 1, 20);
     MonCounters.TxPlanLatency = MonCounters.Coordinator->GetHistogram(
         "TxPlanLatencyMs", NMonitoring::ExponentialHistogram(20, 2, 1));
 }
diff --git a/ydb/core/tx/coordinator/coordinator_impl.h b/ydb/core/tx/coordinator/coordinator_impl.h
index 82f5f4b4d24..60c96ba2997 100644
--- a/ydb/core/tx/coordinator/coordinator_impl.h
+++ b/ydb/core/tx/coordinator/coordinator_impl.h
@@ -5,7 +5,6 @@
 
 #include <ydb/core/protos/counters_coordinator.pb.h>
 
-#include <library/cpp/actors/helpers/mon_histogram_helper.h>
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/base/tx_processing.h>
 #include <ydb/core/control/immediate_control_board_wrapper.h>
@@ -455,9 +454,7 @@ private:
         NMonitoring::TDynamicCounters::TCounterPtr StepPlannedTx;
         NMonitoring::TDynamicCounters::TCounterPtr StepDeclinedNoSpaceTx;
 
-        NMon::THistogramCounterHelper LegacyTxFromReceiveToPlan;
         NMonitoring::THistogramPtr TxFromReceiveToPlan;
-        NMon::THistogramCounterHelper LegacyTxPlanLatency;
         NMonitoring::THistogramPtr TxPlanLatency;
 
         i64 CurrentTxInFly;
diff --git a/ydb/core/tx/tx_proxy/mon.h b/ydb/core/tx/tx_proxy/mon.h
index d747ab4f998..c0558f946bb 100644
--- a/ydb/core/tx/tx_proxy/mon.h
+++ b/ydb/core/tx/tx_proxy/mon.h
@@ -3,7 +3,6 @@
 
 #include <ydb/core/mon/mon.h>
 #include <ydb/library/yql/minikql/aligned_page_pool.h>
-#include <library/cpp/actors/helpers/mon_histogram_helper.h>
 
 namespace NKikimr {
 namespace NTxProxy {