diff options
| author | dcherednik <dcherednik@ydb.tech> | 2022-07-11 18:31:28 +0300 |
|---|---|---|
| committer | dcherednik <dcherednik@ydb.tech> | 2022-07-11 18:31:28 +0300 |
| commit | 1b27061db9d5da991cfbed6a2edb75e6df98e5c5 (patch) | |
| tree | 519d702c7d9ab9fd247ac7830b60d81f568ec837 | |
| parent | 9815e621b8ee1a73fae63122d0461ed9c52e3bea (diff) | |
| download | ydb-1b27061db9d5da991cfbed6a2edb75e6df98e5c5.tar.gz | |
Avoid Ydb::NMonitoring and NMonitoring conflict.
372 files changed, 1660 insertions, 1660 deletions
diff --git a/library/cpp/monlib/service/pages/templates.h b/library/cpp/monlib/service/pages/templates.h index b4656f059f..0249807d5f 100644 --- a/library/cpp/monlib/service/pages/templates.h +++ b/library/cpp/monlib/service/pages/templates.h @@ -13,14 +13,14 @@ label \ : -#define TAG(name) WITH_SCOPED(tmp, NMonitoring::name(__stream)) -#define TAG_CLASS(name, cls) WITH_SCOPED(tmp, NMonitoring::name(__stream, cls)) -#define TAG_CLASS_STYLE(name, cls, style) WITH_SCOPED(tmp, NMonitoring::name(__stream, {{"class", cls}, {"style", style}})) -#define TAG_CLASS_ID(name, cls, id) WITH_SCOPED(tmp, NMonitoring::name(__stream, cls, "", id)) -#define TAG_CLASS_FOR(name, cls, for0) WITH_SCOPED(tmp, NMonitoring::name(__stream, cls, for0)) -#define TAG_ATTRS(name, ...) WITH_SCOPED(tmp, NMonitoring::name(__stream, ##__VA_ARGS__)) +#define TAG(name) WITH_SCOPED(tmp, ::NMonitoring::name(__stream)) +#define TAG_CLASS(name, cls) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls)) +#define TAG_CLASS_STYLE(name, cls, style) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, {{"class", cls}, {"style", style}})) +#define TAG_CLASS_ID(name, cls, id) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls, "", id)) +#define TAG_CLASS_FOR(name, cls, for0) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, cls, for0)) +#define TAG_ATTRS(name, ...) WITH_SCOPED(tmp, ::NMonitoring::name(__stream, ##__VA_ARGS__)) -#define HTML(str) WITH_SCOPED(__stream, NMonitoring::TOutputStreamRef(str)) +#define HTML(str) WITH_SCOPED(__stream, ::NMonitoring::TOutputStreamRef(str)) #define HEAD() TAG(THead) #define BODY() TAG(TBody) @@ -92,10 +92,10 @@ #define HTML_OUTPUT_TIME_PARAM(str, param) str << #param << ": " << ToStringLocalTimeUpToSeconds(param) << "<br/>" #define COLLAPSED_BUTTON_CONTENT(targetId, buttonText) \ - WITH_SCOPED(tmp, NMonitoring::TCollapsedButton(__stream, targetId, buttonText)) + WITH_SCOPED(tmp, ::NMonitoring::TCollapsedButton(__stream, targetId, buttonText)) #define HREF(path) \ - WITH_SCOPED(tmp, NMonitoring::THref(__stream, path)) + WITH_SCOPED(tmp, ::NMonitoring::THref(__stream, path)) namespace NMonitoring { struct THref { diff --git a/ydb/apps/ydbd/sqs.cpp b/ydb/apps/ydbd/sqs.cpp index 6a06ca7177..ce6980dde0 100644 --- a/ydb/apps/ydbd/sqs.cpp +++ b/ydb/apps/ydbd/sqs.cpp @@ -47,7 +47,7 @@ public: -IEventsWriterWrapper::TPtr TSqsEventsWriterFactory::CreateEventsWriter(const NKikimrConfig::TSqsConfig& config, const NMonitoring::TDynamicCounterPtr&) const { +IEventsWriterWrapper::TPtr TSqsEventsWriterFactory::CreateEventsWriter(const NKikimrConfig::TSqsConfig& config, const ::NMonitoring::TDynamicCounterPtr&) const { const auto& ycSearchCfg = config.GetYcSearchEventsConfig(); switch (ycSearchCfg.OutputMethod_case()) { case NKikimrConfig::TSqsConfig::TYcSearchEventsConfig::kOutputFileName: diff --git a/ydb/apps/ydbd/sqs.h b/ydb/apps/ydbd/sqs.h index acd3e973e5..d772f0cbf0 100644 --- a/ydb/apps/ydbd/sqs.h +++ b/ydb/apps/ydbd/sqs.h @@ -5,5 +5,5 @@ class TSqsEventsWriterFactory : public NKikimr::NSQS::IEventsWriterFactory { public: - NKikimr::NSQS::IEventsWriterWrapper::TPtr CreateEventsWriter(const NKikimrConfig::TSqsConfig& config, const NMonitoring::TDynamicCounterPtr& counters) const override; + NKikimr::NSQS::IEventsWriterWrapper::TPtr CreateEventsWriter(const NKikimrConfig::TSqsConfig& config, const ::NMonitoring::TDynamicCounterPtr& counters) const override; }; diff --git a/ydb/core/base/appdata.h b/ydb/core/base/appdata.h index 334eaea131..a8b0d22a26 100644 --- a/ydb/core/base/appdata.h +++ b/ydb/core/base/appdata.h @@ -113,7 +113,7 @@ struct TAppData { ui64 CompilerSchemeCacheTables; NActors::TMon* Mon; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; NMonitoring::TBusNgMonPage* BusMonPage; TIntrusivePtr<NKikimr::TControlBoard> Icb; TIntrusivePtr<NGRpcService::TInFlightLimiterRegistry> InFlightLimiterRegistry; diff --git a/ydb/core/base/counters.cpp b/ydb/core/base/counters.cpp index 298ec7e192..538266429c 100644 --- a/ydb/core/base/counters.cpp +++ b/ydb/core/base/counters.cpp @@ -52,7 +52,7 @@ static const THashSet<TString> DATABASE_ATTRIBUTE_LABELS TString("database_id") }}; -using NMonitoring::TDynamicCounters; +using ::NMonitoring::TDynamicCounters; const THashSet<TString> &GetDatabaseSensorServices() { diff --git a/ydb/core/base/counters.h b/ydb/core/base/counters.h index 01dc8c4c0f..6abfe3cae9 100644 --- a/ydb/core/base/counters.h +++ b/ydb/core/base/counters.h @@ -11,10 +11,10 @@ namespace NKikimr { constexpr char HOST_LABEL[] = "host"; // Get counters group for specified service. Skip tenant and slot labels. - TIntrusivePtr<NMonitoring::TDynamicCounters> GetServiceCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> root, + TIntrusivePtr<::NMonitoring::TDynamicCounters> GetServiceCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> root, const TString &service, bool skipAddedLabels = true); // Get parent node for subsvc/svc if any. root->svc->subvc => svc, root->svc => root. - TIntrusivePtr<NMonitoring::TDynamicCounters> GetServiceCountersRoot(TIntrusivePtr<NMonitoring::TDynamicCounters> root, + TIntrusivePtr<::NMonitoring::TDynamicCounters> GetServiceCountersRoot(TIntrusivePtr<::NMonitoring::TDynamicCounters> root, const TString &service); // Extract subservice name if any. aba|caba => aba, caba. std::pair<TString, TString> ExtractSubServiceName(const TString &service); @@ -24,5 +24,5 @@ namespace NKikimr { const THashSet<TString> &GetDatabaseAttributeSensorServices(); const THashSet<TString> &GetDatabaseAttributeLabels(); // Drop all extra labels. - void ReplaceSubgroup(TIntrusivePtr<NMonitoring::TDynamicCounters> root, const TString &service); + void ReplaceSubgroup(TIntrusivePtr<::NMonitoring::TDynamicCounters> root, const TString &service); } // namespace NKikimr diff --git a/ydb/core/base/grpc_service_factory.h b/ydb/core/base/grpc_service_factory.h index 0ae4fd9dd8..7eacc05f0d 100644 --- a/ydb/core/base/grpc_service_factory.h +++ b/ydb/core/base/grpc_service_factory.h @@ -11,7 +11,7 @@ private: using TFactoryMethod = std::function< TServicePtr( NActors::TActorSystem*, - TIntrusivePtr<NMonitoring::TDynamicCounters>, + TIntrusivePtr<::NMonitoring::TDynamicCounters>, NActors::TActorId ) >; @@ -40,7 +40,7 @@ public: ) { auto method = []( NActors::TActorSystem* actorSystem, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId grpcRequestProxyId ) { return TServicePtr(new TService(actorSystem, counters, grpcRequestProxyId)); @@ -56,7 +56,7 @@ public: const std::unordered_set<TString>& enabled, const std::unordered_set<TString>& disabled, NActors::TActorSystem* actorSystem, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId grpcRequestProxyId ) { std::vector<TServicePtr> services; diff --git a/ydb/core/base/pool_stats_collector.cpp b/ydb/core/base/pool_stats_collector.cpp index 7dcbf28954..15849778e3 100644 --- a/ydb/core/base/pool_stats_collector.cpp +++ b/ydb/core/base/pool_stats_collector.cpp @@ -17,7 +17,7 @@ public: TStatsCollectingActor( ui32 intervalSec, const TActorSystemSetup& setup, - NMonitoring::TDynamicCounterPtr counters) + ::NMonitoring::TDynamicCounterPtr counters) : NActors::TStatsCollectingActor(intervalSec, setup, GetServiceCounters(counters, "utils")) { MiniKQLPoolStats.Init(Counters.Get()); @@ -26,7 +26,7 @@ public: private: class TMiniKQLPoolStats { public: - void Init(NMonitoring::TDynamicCounters* group) { + void Init(::NMonitoring::TDynamicCounters* group) { CounterGroup = group->GetSubgroup("subsystem", "mkqlalloc"); TotalBytes = CounterGroup->GetCounter("GlobalPoolTotalBytes", false); } @@ -36,8 +36,8 @@ private: } private: - TIntrusivePtr<NMonitoring::TDynamicCounters> CounterGroup; - NMonitoring::TDynamicCounters::TCounterPtr TotalBytes; + TIntrusivePtr<::NMonitoring::TDynamicCounters> CounterGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr TotalBytes; }; void OnWakeup(const TActorContext &ctx) override { @@ -58,7 +58,7 @@ private: IActor *CreateStatsCollector(ui32 intervalSec, const TActorSystemSetup& setup, - NMonitoring::TDynamicCounterPtr counters) + ::NMonitoring::TDynamicCounterPtr counters) { return new TStatsCollectingActor(intervalSec, setup, counters); } diff --git a/ydb/core/base/pool_stats_collector.h b/ydb/core/base/pool_stats_collector.h index cbf06f9f51..12f1ae736a 100644 --- a/ydb/core/base/pool_stats_collector.h +++ b/ydb/core/base/pool_stats_collector.h @@ -12,6 +12,6 @@ namespace NKikimr { IActor* CreateStatsCollector(ui32 intervalSec, const TActorSystemSetup& setup, - NMonitoring::TDynamicCounterPtr counters); + ::NMonitoring::TDynamicCounterPtr counters); } diff --git a/ydb/core/base/shared_quota.h b/ydb/core/base/shared_quota.h index a565954bb5..75f62b1f70 100644 --- a/ydb/core/base/shared_quota.h +++ b/ydb/core/base/shared_quota.h @@ -9,8 +9,8 @@ namespace NKikimr { class TSharedQuota : public TThrRefBase { public: - TSharedQuota(NMonitoring::TDynamicCounters::TCounterPtr usedCounter, - NMonitoring::TDynamicCounters::TCounterPtr sizeCounter, + TSharedQuota(::NMonitoring::TDynamicCounters::TCounterPtr usedCounter, + ::NMonitoring::TDynamicCounters::TCounterPtr sizeCounter, ui64 quota = 0) : Quota(quota) , FreeQuota(Quota) @@ -68,8 +68,8 @@ public: private: volatile ui64 Quota; volatile i64 FreeQuota; - NMonitoring::TDynamicCounters::TCounterPtr UsedCounter; - NMonitoring::TDynamicCounters::TCounterPtr SizeCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr UsedCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr SizeCounter; }; using TSharedQuotaPtr = TIntrusivePtr<TSharedQuota>; diff --git a/ydb/core/base/tablet_pipecache.h b/ydb/core/base/tablet_pipecache.h index d3a519c9bd..b9e246a69a 100644 --- a/ydb/core/base/tablet_pipecache.h +++ b/ydb/core/base/tablet_pipecache.h @@ -83,7 +83,7 @@ struct TPipePeNodeCacheConfig : public TAtomicRefCount<TPipePeNodeCacheConfig>{ ui64 TabletCacheLimit; TDuration PipeRefreshTime; NTabletPipe::TClientConfig PipeConfig; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; TPipePeNodeCacheConfig() : TabletCacheLimit(500000) diff --git a/ydb/core/base/tracing.h b/ydb/core/base/tracing.h index 40420e4541..2ec8950a99 100644 --- a/ydb/core/base/tracing.h +++ b/ydb/core/base/tracing.h @@ -204,7 +204,7 @@ public: virtual ITrace* GetTrace(ui64 tabletID, TTraceID& traceID) = 0; }; -ITraceCollection* CreateTraceCollection(TIntrusivePtr<NMonitoring::TDynamicCounters> counters = nullptr); +ITraceCollection* CreateTraceCollection(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = nullptr); } } diff --git a/ydb/core/blobstorage/backpressure/event.cpp b/ydb/core/blobstorage/backpressure/event.cpp index cc04981615..d807d5fe95 100644 --- a/ydb/core/blobstorage/backpressure/event.cpp +++ b/ydb/core/blobstorage/backpressure/event.cpp @@ -3,8 +3,8 @@ namespace NKikimr::NBsQueue { IEventBase *TEventHolder::MakeErrorReply(NKikimrProto::EReplyStatus status, const TString& errorReason, - const NMonitoring::TDynamicCounters::TCounterPtr& deserItems, - const NMonitoring::TDynamicCounters::TCounterPtr& deserBytes) { + const ::NMonitoring::TDynamicCounters::TCounterPtr& deserItems, + const ::NMonitoring::TDynamicCounters::TCounterPtr& deserBytes) { auto callback = [&](auto *event) -> IEventBase* { using T = std::remove_pointer_t<decltype(event)>; std::unique_ptr<T> temp; diff --git a/ydb/core/blobstorage/backpressure/event.h b/ydb/core/blobstorage/backpressure/event.h index e5f5ff1531..1f5ca8c710 100644 --- a/ydb/core/blobstorage/backpressure/event.h +++ b/ydb/core/blobstorage/backpressure/event.h @@ -51,8 +51,8 @@ public: {} template<typename TPtr> - TEventHolder(TPtr& ev, const NMonitoring::TDynamicCounters::TCounterPtr& serItems, - const NMonitoring::TDynamicCounters::TCounterPtr& serBytes, const TBSProxyContextPtr& bspctx, + TEventHolder(TPtr& ev, const ::NMonitoring::TDynamicCounters::TCounterPtr& serItems, + const ::NMonitoring::TDynamicCounters::TCounterPtr& serBytes, const TBSProxyContextPtr& bspctx, ui32 interconnectChannel, bool local) : Type(ev->GetTypeRewrite()) , Sender(ev->Sender) @@ -121,8 +121,8 @@ public: } IEventBase *MakeErrorReply(NKikimrProto::EReplyStatus status, const TString& errorReason, - const NMonitoring::TDynamicCounters::TCounterPtr& deserItems, - const NMonitoring::TDynamicCounters::TCounterPtr& deserBytes); + const ::NMonitoring::TDynamicCounters::TCounterPtr& deserItems, + const ::NMonitoring::TDynamicCounters::TCounterPtr& deserBytes); ui32 GetType() const { return Type; diff --git a/ydb/core/blobstorage/backpressure/queue.cpp b/ydb/core/blobstorage/backpressure/queue.cpp index 6e29552d81..cead08e1b8 100644 --- a/ydb/core/blobstorage/backpressure/queue.cpp +++ b/ydb/core/blobstorage/backpressure/queue.cpp @@ -2,7 +2,7 @@ namespace NKikimr::NBsQueue { -TBlobStorageQueue::TBlobStorageQueue(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, TString& logPrefix, +TBlobStorageQueue::TBlobStorageQueue(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, TString& logPrefix, const TBSProxyContextPtr& bspctx, const NBackpressure::TQueueClientId& clientId, ui32 interconnectChannel, const TBlobStorageGroupType& gType, NMonitoring::TCountableBase::EVisibility visibility) : Queues(bspctx) diff --git a/ydb/core/blobstorage/backpressure/queue.h b/ydb/core/blobstorage/backpressure/queue.h index d59c035a58..ef0903d497 100644 --- a/ydb/core/blobstorage/backpressure/queue.h +++ b/ydb/core/blobstorage/backpressure/queue.h @@ -56,8 +56,8 @@ class TBlobStorageQueue { template<typename TEvent> TItem(TAutoPtr<TEventHandle<TEvent>>& event, TInstant deadline, - const NMonitoring::TDynamicCounters::TCounterPtr& serItems, - const NMonitoring::TDynamicCounters::TCounterPtr& serBytes, + const ::NMonitoring::TDynamicCounters::TCounterPtr& serItems, + const ::NMonitoring::TDynamicCounters::TCounterPtr& serBytes, const TBSProxyContextPtr& bspctx, ui32 interconnectChannel, bool local, TInstant now) : Queue(EItemQueue::NotSet) @@ -125,30 +125,30 @@ class TBlobStorageQueue { const ui32 InterconnectChannel; public: - NMonitoring::TDynamicCounters::TCounterPtr QueueWaitingItems; - NMonitoring::TDynamicCounters::TCounterPtr QueueWaitingBytes; - NMonitoring::TDynamicCounters::TCounterPtr QueueInFlightItems; - NMonitoring::TDynamicCounters::TCounterPtr QueueInFlightBytes; - NMonitoring::TDynamicCounters::TCounterPtr QueueInFlightCost; - NMonitoring::TDynamicCounters::TCounterPtr QueueWindowSize; - NMonitoring::TDynamicCounters::TCounterPtr QueueItemsPut; - NMonitoring::TDynamicCounters::TCounterPtr QueueItemsPutBytes; - NMonitoring::TDynamicCounters::TCounterPtr QueueItemsProcessed; - NMonitoring::TDynamicCounters::TCounterPtr QueueItemsRejected; - NMonitoring::TDynamicCounters::TCounterPtr QueueItemsPruned; - NMonitoring::TDynamicCounters::TCounterPtr QueueItemsSent; - NMonitoring::TDynamicCounters::TCounterPtr QueueItemsUndelivered; - NMonitoring::TDynamicCounters::TCounterPtr QueueItemsIncorrectMsgId; - NMonitoring::TDynamicCounters::TCounterPtr QueueItemsWatermarkOverflow; - NMonitoring::TDynamicCounters::TCounterPtr QueueOverflow; - NMonitoring::TDynamicCounters::TCounterPtr QueueSerializedItems; - NMonitoring::TDynamicCounters::TCounterPtr QueueSerializedBytes; - NMonitoring::TDynamicCounters::TCounterPtr QueueDeserializedItems; - NMonitoring::TDynamicCounters::TCounterPtr QueueDeserializedBytes; - NMonitoring::TDynamicCounters::TCounterPtr QueueSize; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueWaitingItems; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueWaitingBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueInFlightItems; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueInFlightBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueInFlightCost; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueWindowSize; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueItemsPut; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueItemsPutBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueItemsProcessed; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueItemsRejected; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueItemsPruned; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueItemsSent; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueItemsUndelivered; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueItemsIncorrectMsgId; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueItemsWatermarkOverflow; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueOverflow; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueSerializedItems; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueSerializedBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueDeserializedItems; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueDeserializedBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueSize; public: - TBlobStorageQueue(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, TString& logPrefix, + TBlobStorageQueue(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, TString& logPrefix, const TBSProxyContextPtr& bspctx, const NBackpressure::TQueueClientId& clientId, ui32 interconnectChannel, const TBlobStorageGroupType &gType, NMonitoring::TCountableBase::EVisibility visibility = NMonitoring::TCountableBase::EVisibility::Public); diff --git a/ydb/core/blobstorage/backpressure/queue_backpressure_client.cpp b/ydb/core/blobstorage/backpressure/queue_backpressure_client.cpp index f4ae30da96..84337e1eb4 100644 --- a/ydb/core/blobstorage/backpressure/queue_backpressure_client.cpp +++ b/ydb/core/blobstorage/backpressure/queue_backpressure_client.cpp @@ -30,7 +30,7 @@ class TVDiskBackpressureClientActor : public TActorBootstrapped<TVDiskBackpressu TBSProxyContextPtr BSProxyCtx; TString LogPrefix; const TString QueueName; - const NMonitoring::TDynamicCounterPtr Counters; + const ::NMonitoring::TDynamicCounterPtr Counters; TBlobStorageQueue Queue; TActorId BlobStorageProxy; const TVDiskIdShort VDiskIdShort; @@ -74,7 +74,7 @@ public: } TVDiskBackpressureClientActor(const TIntrusivePtr<TBlobStorageGroupInfo>& info, TVDiskIdShort vdiskId, - NKikimrBlobStorage::EVDiskQueueId queueId,const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + NKikimrBlobStorage::EVDiskQueueId queueId,const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TBSProxyContextPtr& bspctx, const NBackpressure::TQueueClientId& clientId, const TString& queueName, ui32 interconnectChannel, bool /*local*/, TDuration watchdogTimeout, TIntrusivePtr<NBackpressure::TFlowRecord> &flowRecord, NMonitoring::TCountableBase::EVisibility visibility) @@ -836,7 +836,7 @@ private: XX(TEvents::TSystem::Poison, Poison) \ // END -#define XX(EVENT, NAME) NMonitoring::TDynamicCounters::TCounterPtr EventCounter##NAME; +#define XX(EVENT, NAME) ::NMonitoring::TDynamicCounters::TCounterPtr EventCounter##NAME; DEFINE_EVENTS(XX) #undef XX @@ -926,7 +926,7 @@ namespace NKikimr { // QUEUE CREATOR //////////////////////////////////////////////////////////////////////////// IActor* CreateVDiskBackpressureClient(const TIntrusivePtr<TBlobStorageGroupInfo>& info, TVDiskIdShort vdiskId, - NKikimrBlobStorage::EVDiskQueueId queueId,const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + NKikimrBlobStorage::EVDiskQueueId queueId,const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TBSProxyContextPtr& bspctx, const NBackpressure::TQueueClientId& clientId, const TString& queueName, ui32 interconnectChannel, bool local, TDuration watchdogTimeout, TIntrusivePtr<NBackpressure::TFlowRecord> &flowRecord, NMonitoring::TCountableBase::EVisibility visibility) { diff --git a/ydb/core/blobstorage/backpressure/queue_backpressure_client.h b/ydb/core/blobstorage/backpressure/queue_backpressure_client.h index 74c0f13edc..3f51db5f85 100644 --- a/ydb/core/blobstorage/backpressure/queue_backpressure_client.h +++ b/ydb/core/blobstorage/backpressure/queue_backpressure_client.h @@ -42,7 +42,7 @@ namespace NKikimr { {}; IActor* CreateVDiskBackpressureClient(const TIntrusivePtr<TBlobStorageGroupInfo>& info, TVDiskIdShort vdiskId, - NKikimrBlobStorage::EVDiskQueueId queueId,const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + NKikimrBlobStorage::EVDiskQueueId queueId,const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TBSProxyContextPtr& bspctx, const NBackpressure::TQueueClientId& clientId, const TString& queueName, ui32 interconnectChannel, bool local, TDuration watchdogTimeout, TIntrusivePtr<NBackpressure::TFlowRecord> &flowRecord, NMonitoring::TCountableBase::EVisibility visibility); diff --git a/ydb/core/blobstorage/backpressure/queue_backpressure_client_ut.cpp b/ydb/core/blobstorage/backpressure/queue_backpressure_client_ut.cpp index c42a483e39..69a436bdea 100644 --- a/ydb/core/blobstorage/backpressure/queue_backpressure_client_ut.cpp +++ b/ydb/core/blobstorage/backpressure/queue_backpressure_client_ut.cpp @@ -70,12 +70,12 @@ public: class TProxyActor : public TActorBootstrapped<TProxyActor> { const TIntrusivePtr<TBlobStorageGroupInfo> Info; const TVDiskID VDiskId; - const TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; const TActorId QueueActorId; public: TProxyActor(TIntrusivePtr<TBlobStorageGroupInfo> info, const TVDiskID& vdiskId, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const TActorId& queueActorId) : Info(std::move(info)) , VDiskId(vdiskId) @@ -121,7 +121,7 @@ public: class TQueueTestRuntime { TTempDir TempDir; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TIntrusivePtr<TBlobStorageGroupInfo> Info; std::unique_ptr<TActorSystem> ActorSystem; TString Path; @@ -141,7 +141,7 @@ class TQueueTestRuntime { public: TQueueTestRuntime(TFilterActor::TFilterFunc&& func) { - Counters.Reset(new NMonitoring::TDynamicCounters); + Counters.Reset(new ::NMonitoring::TDynamicCounters); auto setup = MakeHolder<TActorSystemSetup>(); setup->NodeId = 1; diff --git a/ydb/core/blobstorage/backpressure/ut_client/loader.h b/ydb/core/blobstorage/backpressure/ut_client/loader.h index 2372d31d6c..1ee901fc61 100644 --- a/ydb/core/blobstorage/backpressure/ut_client/loader.h +++ b/ydb/core/blobstorage/backpressure/ut_client/loader.h @@ -13,7 +13,7 @@ class TLoaderActor : public TActorBootstrapped<TLoaderActor> { const NBackpressure::TQueueClientId ClientId; const TVDiskID VDiskId; const TActorId VDiskActorId; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TBSProxyContextPtr BSProxyCtx; TIntrusivePtr<NBackpressure::TFlowRecord> FlowRecord; TActorId QueueId; @@ -28,7 +28,7 @@ public: : ClientId(std::move(clientId)) , VDiskId(std::move(vdiskId)) , VDiskActorId(std::move(vdiskActorId)) - , Counters(MakeIntrusive<NMonitoring::TDynamicCounters>()) + , Counters(MakeIntrusive<::NMonitoring::TDynamicCounters>()) , BSProxyCtx(MakeIntrusive<TBSProxyContext>(Counters)) , FlowRecord(MakeIntrusive<NBackpressure::TFlowRecord>()) { diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_mon.cpp b/ydb/core/blobstorage/dsproxy/dsproxy_mon.cpp index 73afac8121..30440593be 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy_mon.cpp +++ b/ydb/core/blobstorage/dsproxy/dsproxy_mon.cpp @@ -5,9 +5,9 @@ static const TVector<float> Percentiles4 = {0.5f, 0.9f, 0.95f, 1.0f}; namespace NKikimr { -TBlobStorageGroupProxyMon::TBlobStorageGroupProxyMon(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& percentileCounters, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& overviewCounters, +TBlobStorageGroupProxyMon::TBlobStorageGroupProxyMon(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& percentileCounters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& overviewCounters, const TIntrusivePtr<TBlobStorageGroupInfo>& info, const TIntrusivePtr<TDsProxyNodeMon> &nodeMon, bool constructLimited) @@ -113,7 +113,7 @@ void TBlobStorageGroupProxyMon::BecomeFull() { PutResponseTime.Initialize(ResponseGroup, "event", "put", "Response in millisec", Percentiles4); - TIntrusivePtr<NMonitoring::TDynamicCounters> putTabletLogGroup = + TIntrusivePtr<::NMonitoring::TDynamicCounters> putTabletLogGroup = ResponseGroup->GetSubgroup("event", "putTabletLog"); PutTabletLogResponseTime.Initialize(ResponseGroup, "event", "putTabletLogAll", "ms", Percentiles1); diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_mon.h b/ydb/core/blobstorage/dsproxy/dsproxy_mon.h index def0fc399b..59e3007572 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy_mon.h +++ b/ydb/core/blobstorage/dsproxy/dsproxy_mon.h @@ -29,15 +29,15 @@ enum class ERequestType { }; struct TRequestMonGroup { - NMonitoring::TDynamicCounters::TCounterPtr VGetBlobsIssued; - NMonitoring::TDynamicCounters::TCounterPtr VGetRangesIssued; - NMonitoring::TDynamicCounters::TCounterPtr VGetBlobsReturnedWithData; - NMonitoring::TDynamicCounters::TCounterPtr VGetBlobsReturnedWithNoData; - NMonitoring::TDynamicCounters::TCounterPtr VGetBlobsReturnedWithErrors; - NMonitoring::TDynamicCounters::TCounterPtr VPutBlobsIssued; - NMonitoring::TDynamicCounters::TCounterPtr VMovedPatchBlobsIssued; - - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters> &group) { + ::NMonitoring::TDynamicCounters::TCounterPtr VGetBlobsIssued; + ::NMonitoring::TDynamicCounters::TCounterPtr VGetRangesIssued; + ::NMonitoring::TDynamicCounters::TCounterPtr VGetBlobsReturnedWithData; + ::NMonitoring::TDynamicCounters::TCounterPtr VGetBlobsReturnedWithNoData; + ::NMonitoring::TDynamicCounters::TCounterPtr VGetBlobsReturnedWithErrors; + ::NMonitoring::TDynamicCounters::TCounterPtr VPutBlobsIssued; + ::NMonitoring::TDynamicCounters::TCounterPtr VMovedPatchBlobsIssued; + + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters> &group) { VGetBlobsIssued = group->GetCounter("VGetBlobsIssued", true); VGetRangesIssued = group->GetCounter("VGetRangesIssued", true); VGetBlobsReturnedWithData = group->GetCounter("VGetBlobsReturnedWithData", true); @@ -107,11 +107,11 @@ struct TResponseStatusGroup : TThrRefBase { XX(NODATA) \ // END -#define XX(NAME) NMonitoring::TDynamicCounters::TCounterPtr Num##NAME; +#define XX(NAME) ::NMonitoring::TDynamicCounters::TCounterPtr Num##NAME; ENUM_STATUS(XX) #undef XX - TResponseStatusGroup(const NMonitoring::TDynamicCounterPtr& group) + TResponseStatusGroup(const ::NMonitoring::TDynamicCounterPtr& group) : TThrRefBase() #define XX(NAME) , Num##NAME(group->GetCounter(#NAME, true)) ENUM_STATUS(XX) @@ -138,19 +138,19 @@ public: TIntrusivePtr<TDsProxyNodeMon> NodeMon; protected: - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; - TIntrusivePtr<NMonitoring::TDynamicCounters> PercentileCounters; - TIntrusivePtr<NMonitoring::TDynamicCounters> ResponseGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> PercentileCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> ResponseGroup; ui64 GroupIdGen = Max<ui64>(); // group id:group gen std::atomic<bool> IsLimitedMon = ATOMIC_VAR_INIT(true); - TIntrusivePtr<NMonitoring::TDynamicCounters> ThroughputGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> ThroughputGroup; std::unique_ptr<TThroughputMeter> PutTabletLogThroughput; std::unique_ptr<TThroughputMeter> PutAsyncBlobThroughput; std::unique_ptr<TThroughputMeter> PutUserDataThroughput; std::unique_ptr<TThroughputMeter> PutThroughput; - TIntrusivePtr<NMonitoring::TDynamicCounters> LatencyOverviewGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> LatencyOverviewGroup; // log response time @@ -172,15 +172,15 @@ protected: NMonitoring::TPercentileTrackerLg<3, 4, 3> PatchResponseTime; // event counters - TIntrusivePtr<NMonitoring::TDynamicCounters> EventGroup; - NMonitoring::TDynamicCounters::TCounterPtr EventPut; - NMonitoring::TDynamicCounters::TCounterPtr EventPutBytes; - NMonitoring::TDynamicCounters::TCounterPtr EventGetResBytes; - TMap<ui32, NMonitoring::TDynamicCounters::TCounterPtr> EventPutBytesBuckets; + TIntrusivePtr<::NMonitoring::TDynamicCounters> EventGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr EventPut; + ::NMonitoring::TDynamicCounters::TCounterPtr EventPutBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr EventGetResBytes; + TMap<ui32, ::NMonitoring::TDynamicCounters::TCounterPtr> EventPutBytesBuckets; // handoff use reason - TIntrusivePtr<NMonitoring::TDynamicCounters> HandoffGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> HandoffGroup; // subevent counters TRequestMonGroup GetGroup; @@ -193,44 +193,44 @@ public: TBlobStorageGroupProxyTimeStats TimeStats; // handoff use reason - std::array<NMonitoring::TDynamicCounters::TCounterPtr, 8> HandoffPartsSent; + std::array<::NMonitoring::TDynamicCounters::TCounterPtr, 8> HandoffPartsSent; TAtomic PutSamplePPM = 0; TAtomic GetSamplePPM = 0; TAtomic DiscoverSamplePPM = 0; // event counters - NMonitoring::TDynamicCounters::TCounterPtr EventGet; - NMonitoring::TDynamicCounters::TCounterPtr EventBlock; - NMonitoring::TDynamicCounters::TCounterPtr EventDiscover; - NMonitoring::TDynamicCounters::TCounterPtr EventRange; - NMonitoring::TDynamicCounters::TCounterPtr EventCollectGarbage; - NMonitoring::TDynamicCounters::TCounterPtr EventMultiGet; - NMonitoring::TDynamicCounters::TCounterPtr EventIndexRestoreGet; - NMonitoring::TDynamicCounters::TCounterPtr EventMultiCollect; - NMonitoring::TDynamicCounters::TCounterPtr EventStatus; - NMonitoring::TDynamicCounters::TCounterPtr EventStopPutBatching; - NMonitoring::TDynamicCounters::TCounterPtr EventStopGetBatching; - NMonitoring::TDynamicCounters::TCounterPtr EventPatch; - - NMonitoring::TDynamicCounters::TCounterPtr PutsSentViaPutBatching; - NMonitoring::TDynamicCounters::TCounterPtr PutBatchesSent; + ::NMonitoring::TDynamicCounters::TCounterPtr EventGet; + ::NMonitoring::TDynamicCounters::TCounterPtr EventBlock; + ::NMonitoring::TDynamicCounters::TCounterPtr EventDiscover; + ::NMonitoring::TDynamicCounters::TCounterPtr EventRange; + ::NMonitoring::TDynamicCounters::TCounterPtr EventCollectGarbage; + ::NMonitoring::TDynamicCounters::TCounterPtr EventMultiGet; + ::NMonitoring::TDynamicCounters::TCounterPtr EventIndexRestoreGet; + ::NMonitoring::TDynamicCounters::TCounterPtr EventMultiCollect; + ::NMonitoring::TDynamicCounters::TCounterPtr EventStatus; + ::NMonitoring::TDynamicCounters::TCounterPtr EventStopPutBatching; + ::NMonitoring::TDynamicCounters::TCounterPtr EventStopGetBatching; + ::NMonitoring::TDynamicCounters::TCounterPtr EventPatch; + + ::NMonitoring::TDynamicCounters::TCounterPtr PutsSentViaPutBatching; + ::NMonitoring::TDynamicCounters::TCounterPtr PutBatchesSent; // active event counters - TIntrusivePtr<NMonitoring::TDynamicCounters> ActiveRequestsGroup; - NMonitoring::TDynamicCounters::TCounterPtr ActivePut; - NMonitoring::TDynamicCounters::TCounterPtr ActivePutCapacity; - NMonitoring::TDynamicCounters::TCounterPtr ActiveGet; - NMonitoring::TDynamicCounters::TCounterPtr ActiveGetCapacity; - NMonitoring::TDynamicCounters::TCounterPtr ActiveBlock; - NMonitoring::TDynamicCounters::TCounterPtr ActiveDiscover; - NMonitoring::TDynamicCounters::TCounterPtr ActiveRange; - NMonitoring::TDynamicCounters::TCounterPtr ActiveCollectGarbage; - NMonitoring::TDynamicCounters::TCounterPtr ActiveMultiGet; - NMonitoring::TDynamicCounters::TCounterPtr ActiveIndexRestoreGet; - NMonitoring::TDynamicCounters::TCounterPtr ActiveMultiCollect; - NMonitoring::TDynamicCounters::TCounterPtr ActiveStatus; - NMonitoring::TDynamicCounters::TCounterPtr ActivePatch; + TIntrusivePtr<::NMonitoring::TDynamicCounters> ActiveRequestsGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr ActivePut; + ::NMonitoring::TDynamicCounters::TCounterPtr ActivePutCapacity; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveGet; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveGetCapacity; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveBlock; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveDiscover; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveRange; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveCollectGarbage; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveMultiGet; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveIndexRestoreGet; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveMultiCollect; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveStatus; + ::NMonitoring::TDynamicCounters::TCounterPtr ActivePatch; std::optional<TResponseStatusGroup> RespStatPut; std::optional<TResponseStatusGroup> RespStatGet; @@ -242,9 +242,9 @@ public: std::optional<TResponseStatusGroup> RespStatPatch; // special patch counters - NMonitoring::TDynamicCounters::TCounterPtr VPatchContinueFailed; - NMonitoring::TDynamicCounters::TCounterPtr VPatchPartPlacementVerifyFailed; - NMonitoring::TDynamicCounters::TCounterPtr PatchesWithFallback; + ::NMonitoring::TDynamicCounters::TCounterPtr VPatchContinueFailed; + ::NMonitoring::TDynamicCounters::TCounterPtr VPatchPartPlacementVerifyFailed; + ::NMonitoring::TDynamicCounters::TCounterPtr PatchesWithFallback; TRequestMonGroup& GetRequestMonGroup(ERequestType request) { switch (request) { @@ -263,9 +263,9 @@ public: } - TBlobStorageGroupProxyMon(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& percentileCounters, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& overviewCounters, + TBlobStorageGroupProxyMon(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& percentileCounters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& overviewCounters, const TIntrusivePtr<TBlobStorageGroupInfo>& info, const TIntrusivePtr<TDsProxyNodeMon> &nodeMon, bool isLimitedMon); diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_nodemon.cpp b/ydb/core/blobstorage/dsproxy/dsproxy_nodemon.cpp index 06e30bed2c..527a10ae86 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy_nodemon.cpp +++ b/ydb/core/blobstorage/dsproxy/dsproxy_nodemon.cpp @@ -5,7 +5,7 @@ #include <ydb/core/blobstorage/base/common_latency_hist_bounds.h> namespace NKikimr { -TDsProxyNodeMon::TDsProxyNodeMon(TIntrusivePtr<NMonitoring::TDynamicCounters> &counters, bool initForAllDeviceTypes) +TDsProxyNodeMon::TDsProxyNodeMon(TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters, bool initForAllDeviceTypes) : Group(GetServiceCounters(counters, "dsproxynode")) { TVector<float> percentiles4; @@ -188,7 +188,7 @@ void TDsProxyNodeMon::CheckNodeMonCountersForDeviceType(NPDisk::EDeviceType type if (!IsCountersPresentedForIdx[idx]) { IsCountersPresentedForIdx[idx] = true; - TIntrusivePtr<NMonitoring::TDynamicCounters> subGroup = + TIntrusivePtr<::NMonitoring::TDynamicCounters> subGroup = Group->GetSubgroup("media", to_lower(NPDisk::DeviceTypeStr(type, true))); auto getNamedHisto = [&subGroup, &type] (const TString& name) { diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_nodemon.h b/ydb/core/blobstorage/dsproxy/dsproxy_nodemon.h index 7eb0338bad..c5fab00d3d 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy_nodemon.h +++ b/ydb/core/blobstorage/dsproxy/dsproxy_nodemon.h @@ -24,8 +24,8 @@ namespace NKikimr { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// struct TDsProxyNodeMon : public TThrRefBase { - TIntrusivePtr<NMonitoring::TDynamicCounters> Group; - TIntrusivePtr<NMonitoring::TDynamicCounters> LatencyOverview; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Group; + TIntrusivePtr<::NMonitoring::TDynamicCounters> LatencyOverview; NMonitoring::TPercentileTracker<4, 512, 15> PutResponseTime; @@ -66,35 +66,35 @@ struct TDsProxyNodeMon : public TThrRefBase { std::array<bool, KnownDeviceTypesCount> IsCountersPresentedForIdx; // restart counters - NMonitoring::TDynamicCounters::TCounterPtr RestartPut; - NMonitoring::TDynamicCounters::TCounterPtr RestartGet; - NMonitoring::TDynamicCounters::TCounterPtr RestartBlock; - NMonitoring::TDynamicCounters::TCounterPtr RestartDiscover; - NMonitoring::TDynamicCounters::TCounterPtr RestartRange; - NMonitoring::TDynamicCounters::TCounterPtr RestartCollectGarbage; - NMonitoring::TDynamicCounters::TCounterPtr RestartIndexRestoreGet; - NMonitoring::TDynamicCounters::TCounterPtr RestartStatus; - NMonitoring::TDynamicCounters::TCounterPtr RestartPatch; + ::NMonitoring::TDynamicCounters::TCounterPtr RestartPut; + ::NMonitoring::TDynamicCounters::TCounterPtr RestartGet; + ::NMonitoring::TDynamicCounters::TCounterPtr RestartBlock; + ::NMonitoring::TDynamicCounters::TCounterPtr RestartDiscover; + ::NMonitoring::TDynamicCounters::TCounterPtr RestartRange; + ::NMonitoring::TDynamicCounters::TCounterPtr RestartCollectGarbage; + ::NMonitoring::TDynamicCounters::TCounterPtr RestartIndexRestoreGet; + ::NMonitoring::TDynamicCounters::TCounterPtr RestartStatus; + ::NMonitoring::TDynamicCounters::TCounterPtr RestartPatch; - std::array<NMonitoring::TDynamicCounters::TCounterPtr, 4> RestartHisto; + std::array<::NMonitoring::TDynamicCounters::TCounterPtr, 4> RestartHisto; // accelerate counters - NMonitoring::TDynamicCounters::TCounterPtr AccelerateEvVPutCount; - NMonitoring::TDynamicCounters::TCounterPtr AccelerateEvVMultiPutCount; - NMonitoring::TDynamicCounters::TCounterPtr AccelerateEvVGetCount; + ::NMonitoring::TDynamicCounters::TCounterPtr AccelerateEvVPutCount; + ::NMonitoring::TDynamicCounters::TCounterPtr AccelerateEvVMultiPutCount; + ::NMonitoring::TDynamicCounters::TCounterPtr AccelerateEvVGetCount; // malfunction counters - NMonitoring::TDynamicCounters::TCounterPtr EstablishingSessionsTimeout; - NMonitoring::TDynamicCounters::TCounterPtr EstablishingSessionsTimeout5min; - NMonitoring::TDynamicCounters::TCounterPtr UnconfiguredTimeout; - NMonitoring::TDynamicCounters::TCounterPtr UnconfiguredTimeout5min; - NMonitoring::TDynamicCounters::TCounterPtr ConnectedAll; - NMonitoring::TDynamicCounters::TCounterPtr ConnectedMinus1; - NMonitoring::TDynamicCounters::TCounterPtr ConnectedMinus2; - NMonitoring::TDynamicCounters::TCounterPtr ConnectedMinus3more; - - TDsProxyNodeMon(TIntrusivePtr<NMonitoring::TDynamicCounters> &counters, bool initForAllDeviceTypes); + ::NMonitoring::TDynamicCounters::TCounterPtr EstablishingSessionsTimeout; + ::NMonitoring::TDynamicCounters::TCounterPtr EstablishingSessionsTimeout5min; + ::NMonitoring::TDynamicCounters::TCounterPtr UnconfiguredTimeout; + ::NMonitoring::TDynamicCounters::TCounterPtr UnconfiguredTimeout5min; + ::NMonitoring::TDynamicCounters::TCounterPtr ConnectedAll; + ::NMonitoring::TDynamicCounters::TCounterPtr ConnectedMinus1; + ::NMonitoring::TDynamicCounters::TCounterPtr ConnectedMinus2; + ::NMonitoring::TDynamicCounters::TCounterPtr ConnectedMinus3more; + + TDsProxyNodeMon(TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters, bool initForAllDeviceTypes); void CountPutPesponseTime(NPDisk::EDeviceType type, NKikimrBlobStorage::EPutHandleClass cls, ui32 size, TDuration duration); void CountGetResponseTime(NPDisk::EDeviceType type, NKikimrBlobStorage::EGetHandleClass cls, ui32 size, diff --git a/ydb/core/blobstorage/dsproxy/dsproxy_state.cpp b/ydb/core/blobstorage/dsproxy/dsproxy_state.cpp index f2dcdce588..01f7b966f0 100644 --- a/ydb/core/blobstorage/dsproxy/dsproxy_state.cpp +++ b/ydb/core/blobstorage/dsproxy/dsproxy_state.cpp @@ -294,11 +294,11 @@ namespace NKikimr { IsFullMonitoring = IsLimitedKeyless || fullIfPossible; TString name = Sprintf("%09" PRIu32, GroupId); - TIntrusivePtr<NMonitoring::TDynamicCounters> group = GetServiceCounters( + TIntrusivePtr<::NMonitoring::TDynamicCounters> group = GetServiceCounters( AppData()->Counters, "dsproxy")->GetSubgroup("blobstorageproxy", name); - TIntrusivePtr<NMonitoring::TDynamicCounters> percentileGroup = GetServiceCounters( + TIntrusivePtr<::NMonitoring::TDynamicCounters> percentileGroup = GetServiceCounters( AppData()->Counters, "dsproxy_percentile")->GetSubgroup("blobstorageproxy", name); - TIntrusivePtr<NMonitoring::TDynamicCounters> overviewGroup = GetServiceCounters( + TIntrusivePtr<::NMonitoring::TDynamicCounters> overviewGroup = GetServiceCounters( AppData()->Counters, "dsproxy_overview"); Mon.Reset(new TBlobStorageGroupProxyMon(group, percentileGroup, overviewGroup, Info, NodeMon, limited)); diff --git a/ydb/core/blobstorage/dsproxy/group_sessions.cpp b/ydb/core/blobstorage/dsproxy/group_sessions.cpp index 9971c4a4e7..36858c9cc1 100644 --- a/ydb/core/blobstorage/dsproxy/group_sessions.cpp +++ b/ydb/core/blobstorage/dsproxy/group_sessions.cpp @@ -41,7 +41,7 @@ TGroupSessions::TGroupSessions(const TIntrusivePtr<TBlobStorageGroupInfo>& info, auto& stateVDisk = GroupQueues->FailDomains[vdisk.FailDomainOrderNumber].VDisks[vd.VDisk]; const ui32 targetNodeId = info->GetActorId(vdisk.OrderNumber).NodeId(); - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = GetServiceCounters(AppData()->Counters, "dsproxy_queue"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = GetServiceCounters(AppData()->Counters, "dsproxy_queue"); for (NKikimrBlobStorage::EVDiskQueueId queueId : VDiskQueues) { ui32 interconnectChannel = 0; diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_env_mock_ut.h b/ydb/core/blobstorage/dsproxy/ut/dsproxy_env_mock_ut.h index 0f2350daf8..2167005b96 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_env_mock_ut.h +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_env_mock_ut.h @@ -33,7 +33,7 @@ struct TDSProxyEnv { TIntrusivePtr<TBlobStorageGroupInfo> Info; TIntrusivePtr<TBlobStorageGroupProxyMon> Mon; TBSProxyContextPtr BSProxyCtxPtr; - TIntrusivePtr<NMonitoring::TDynamicCounters> DynCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> DynCounters; TIntrusivePtr<NKikimr::TStoragePoolCounters> StoragePoolCounters; TDiskResponsivenessTracker::TPerDiskStatsPtr PerDiskStatsPtr; TNodeLayoutInfoPtr NodeLayoutInfo; @@ -67,11 +67,11 @@ struct TDSProxyEnv { RealProxyActorId = MakeBlobStorageProxyID(groupId); TIntrusivePtr<TDsProxyNodeMon> nodeMon = new TDsProxyNodeMon(runtime.GetAppData(nodeIndex).Counters, true); TString name = Sprintf("%09" PRIu64, groupId); - TIntrusivePtr<NMonitoring::TDynamicCounters> group = GetServiceCounters( + TIntrusivePtr<::NMonitoring::TDynamicCounters> group = GetServiceCounters( runtime.GetAppData(0).Counters, "dsproxy")->GetSubgroup("blobstorageproxy", name); - TIntrusivePtr<NMonitoring::TDynamicCounters> percentileGroup = GetServiceCounters( + TIntrusivePtr<::NMonitoring::TDynamicCounters> percentileGroup = GetServiceCounters( runtime.GetAppData(0).Counters, "dsproxy_percentile")->GetSubgroup("blobstorageproxy", name); - TIntrusivePtr<NMonitoring::TDynamicCounters> overviewGroup = GetServiceCounters( + TIntrusivePtr<::NMonitoring::TDynamicCounters> overviewGroup = GetServiceCounters( runtime.GetAppData(0).Counters, "dsproxy_overview"); BSProxyCtxPtr.Reset(new TBSProxyContext(group->GetSubgroup("subsystem", "memproxy"))); Mon = new TBlobStorageGroupProxyMon(group, percentileGroup, overviewGroup, Info, nodeMon, false); @@ -90,7 +90,7 @@ struct TDSProxyEnv { auto queues = runtime.GrabEdgeEventRethrow<TEvProxySessionsState>(handle); GroupQueues = queues->GroupQueues; NodeLayoutInfo = nullptr; - DynCounters = new NMonitoring::TDynamicCounters(); + DynCounters = new ::NMonitoring::TDynamicCounters(); StoragePoolCounters = new NKikimr::TStoragePoolCounters(DynCounters, "", {}); PerDiskStatsPtr = new TDiskResponsivenessTracker::TPerDiskStats; } diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_runtime.h b/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_runtime.h index bc33af4b86..51011107bb 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_runtime.h +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_fault_tolerance_ut_runtime.h @@ -22,7 +22,7 @@ namespace NKikimr { class TFaultToleranceTestRuntime { public: - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TIntrusivePtr<TBlobStorageGroupInfo> GroupInfo; TVector<std::pair<TVDiskID, TActorId>> VDisks; std::unique_ptr<TAppData> AppData; @@ -30,7 +30,7 @@ public: TProgramShouldContinue KikimrShouldContinue; void Setup(TBlobStorageGroupType groupType, ui32 numFailDomains, ui32 numVDisksPerFailDomain, ui32 numRealms) { - Counters = new NMonitoring::TDynamicCounters; + Counters = new ::NMonitoring::TDynamicCounters; TIntrusivePtr<NScheme::TTypeRegistry> typeRegistry(new NScheme::TKikimrTypeRegistry()); auto functionRegistry = NKikimr::NMiniKQL::CreateFunctionRegistry(NKikimr::NMiniKQL::CreateBuiltinRegistry()); diff --git a/ydb/core/blobstorage/dsproxy/ut/dsproxy_put_ut.cpp b/ydb/core/blobstorage/dsproxy/ut/dsproxy_put_ut.cpp index d2d39a3550..48c88d5350 100644 --- a/ydb/core/blobstorage/dsproxy/ut/dsproxy_put_ut.cpp +++ b/ydb/core/blobstorage/dsproxy/ut/dsproxy_put_ut.cpp @@ -38,7 +38,7 @@ void TestPutMaxPartCountOnHandoff(TErasureType::EErasureSpecies erasureSpecies) TGroupMock group(groupId, erasureSpecies, domainCount, 1); TIntrusivePtr<TGroupQueues> groupQueues = group.MakeGroupQueues(); - TIntrusivePtr<NMonitoring::TDynamicCounters> counters(new NMonitoring::TDynamicCounters()); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters(new ::NMonitoring::TDynamicCounters()); TIntrusivePtr<TDsProxyNodeMon> nodeMon(new TDsProxyNodeMon(counters, true)); TIntrusivePtr<TBlobStorageGroupProxyMon> mon(new TBlobStorageGroupProxyMon(counters, counters, counters, group.GetInfo(), nodeMon, false)); @@ -159,7 +159,7 @@ struct TTestPutAllOk { TBatchedVec<TLogoBlobID> BlobIds; TString Data; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TIntrusivePtr<TDsProxyNodeMon> NodeMon; TIntrusivePtr<TBlobStorageGroupProxyMon> Mon; @@ -175,7 +175,7 @@ struct TTestPutAllOk { , GroupQueues(Group.MakeGroupQueues()) , BlobIds({TLogoBlobID(743284823, 10, 12345, 0, DataSize, 0), TLogoBlobID(743284823, 9, 12346, 0, DataSize, 0)}) , Data(AlphaData(DataSize)) - , Counters(new NMonitoring::TDynamicCounters()) + , Counters(new ::NMonitoring::TDynamicCounters()) , NodeMon(new TDsProxyNodeMon(Counters, true)) , Mon(new TBlobStorageGroupProxyMon(Counters, Counters, Counters, Group.GetInfo(), NodeMon, false)) , LogCtx(NKikimrServices::BS_PROXY_PUT, false) diff --git a/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp b/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp index 11fcaeacfd..43183478c3 100644 --- a/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp +++ b/ydb/core/blobstorage/dsproxy/ut_fat/dsproxy_ut.cpp @@ -3362,15 +3362,15 @@ protected: if (!TestStep) { TIntrusivePtr<TDsProxyNodeMon> nodeMon = new TDsProxyNodeMon(NKikimr::AppData(ctx)->Counters, true); TString name = Sprintf("%09" PRIu32, 0); - TIntrusivePtr<NMonitoring::TDynamicCounters> group = GetServiceCounters( + TIntrusivePtr<::NMonitoring::TDynamicCounters> group = GetServiceCounters( NKikimr::AppData(ctx)->Counters, "dsproxy")->GetSubgroup("blobstorageproxy", name); - TIntrusivePtr<NMonitoring::TDynamicCounters> percentileGroup = GetServiceCounters( + TIntrusivePtr<::NMonitoring::TDynamicCounters> percentileGroup = GetServiceCounters( NKikimr::AppData(ctx)->Counters, "dsproxy_percentile")->GetSubgroup("blobstorageproxy", name); - TIntrusivePtr<NMonitoring::TDynamicCounters> overviewGroup = GetServiceCounters( + TIntrusivePtr<::NMonitoring::TDynamicCounters> overviewGroup = GetServiceCounters( NKikimr::AppData(ctx)->Counters, "dsproxy_overview"); Mon = new TBlobStorageGroupProxyMon(group, percentileGroup, overviewGroup, BsInfo, nodeMon, false); - TIntrusivePtr<NMonitoring::TDynamicCounters> DynCounters = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> DynCounters = new ::NMonitoring::TDynamicCounters(); StoragePoolCounters = new NKikimr::TStoragePoolCounters(DynCounters, "", {}); PerDiskStatsPtr = new TDiskResponsivenessTracker::TPerDiskStats; } @@ -4051,7 +4051,7 @@ public: SectorMapByPath.clear(); } - THolder<TActorSystemSetup> BuildActorSystemSetup(ui32 nodeId, NMonitoring::TDynamicCounters &counters, + THolder<TActorSystemSetup> BuildActorSystemSetup(ui32 nodeId, ::NMonitoring::TDynamicCounters &counters, TIntrusivePtr<TTableNameserverSetup> &nameserverTable, TInterconnectMock &interconnectMock) { auto setup = MakeHolder<TActorSystemSetup>(); setup->NodeId = nodeId; @@ -4102,7 +4102,7 @@ public: } TIntrusivePtr<NActors::NLog::TSettings> AddLoggerActor(THolder<TActorSystemSetup> &setup, - NMonitoring::TDynamicCounters &counters) { + ::NMonitoring::TDynamicCounters &counters) { NActors::TActorId loggerActorId = NActors::TActorId(setup->NodeId, "logger"); TIntrusivePtr<NActors::NLog::TSettings> logSettings( @@ -4173,7 +4173,7 @@ public: env->DrivesPerFailDomain, env->FailDomainCount, 1, &env->VDisks)); // first node - TIntrusivePtr<NMonitoring::TDynamicCounters> counters(new NMonitoring::TDynamicCounters()); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters(new ::NMonitoring::TDynamicCounters()); TInterconnectMock interconnect; diff --git a/ydb/core/blobstorage/incrhuge/ut/incrhuge_basic_ut.cpp b/ydb/core/blobstorage/incrhuge/ut/incrhuge_basic_ut.cpp index 59d3cb999c..ae065199ff 100644 --- a/ydb/core/blobstorage/incrhuge/ut/incrhuge_basic_ut.cpp +++ b/ydb/core/blobstorage/incrhuge/ut/incrhuge_basic_ut.cpp @@ -23,7 +23,7 @@ using namespace NKikimr::NIncrHuge; class TTestEnv { public: - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters = new ::NMonitoring::TDynamicCounters; TString Path; ui32 ChunkSize; ui64 DiskSize; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk.h index 8e722ce42a..32ced7d704 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk.h @@ -17,7 +17,7 @@ namespace NKikimr { IActor* CreatePDisk(const TIntrusivePtr<TPDiskConfig> &cfg, const NPDisk::TKey &mainKey, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters); + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters); namespace NPDisk { diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp index 5ff29d8685..f8a6e679a7 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actor.cpp @@ -69,7 +69,7 @@ class TPDiskActor : public TActorBootstrapped<TPDiskActor> { TIntrusivePtr<TPDiskConfig> Cfg; TKey MainKey; TList<TInitQueueItem> InitQueue; - const TIntrusivePtr<NMonitoring::TDynamicCounters> PDiskCounters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters> PDiskCounters; TIntrusivePtr<TPDisk> PDisk; bool IsMagicAlreadyChecked = false; @@ -196,7 +196,7 @@ public: } TPDiskActor(const TIntrusivePtr<TPDiskConfig>& cfg, const NPDisk::TKey &mainKey, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) : Cfg(cfg) , MainKey(mainKey) , PDiskCounters(GetServiceCounters(counters, "pdisks") @@ -1077,7 +1077,7 @@ public: // PDisk Creation //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// IActor* CreatePDisk(const TIntrusivePtr<TPDiskConfig> &cfg, const NPDisk::TKey &mainKey, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) { + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) { return new NPDisk::TPDiskActor(cfg, mainKey, counters); } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h index c74201d451..349e00d0b8 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h @@ -16,7 +16,7 @@ namespace NKikimr { class TActorSystemCreator { std::unique_ptr<TAppData> AppData; std::shared_ptr<NPDisk::IIoContextFactory> IoContext; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; std::unique_ptr<NActors::TActorSystem> ActorSystem; @@ -50,7 +50,7 @@ public: NKikimrServices::EServiceKikimr_MAX, NKikimrServices::EServiceKikimr_Name ); - Counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + Counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); NActors::TLoggerActor *loggerActor = new NActors::TLoggerActor(logSettings, NActors::CreateNullBackend(), GetServiceCounters(Counters, "utils")); NActors::TActorSetupCmd loggerActorCmd(loggerActor, NActors::TMailboxType::Simple, 2); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp index 9f408f6e4c..2358f3f014 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp @@ -169,7 +169,7 @@ void WaitForValue(TAtomic *counter, TDuration maxDuration, TAtomicBase expectedV } void RunTestMultipleRequestsFromCompletionAction() { - const TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); const ui32 dataSize = 4 << 10; const ui64 generations = 8; @@ -207,7 +207,7 @@ void RunTestMultipleRequestsFromCompletionAction() { } void RunTestDestructionWithMultipleFlushesFromCompletionAction() { - const TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); const ui32 dataSize = 4 << 10; const i32 generations = 8; @@ -232,7 +232,7 @@ void RunTestDestructionWithMultipleFlushesFromCompletionAction() { } void RunWriteTestWithSectorMap(NPDisk::NSectorMap::EDiskMode diskMode, ui32 diskSize, ui32 bufferSize, bool sequential = true) { - const TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); TActorSystemCreator creator; @@ -268,7 +268,7 @@ Y_UNIT_TEST_SUITE(TBlockDeviceTest) { } Y_UNIT_TEST(TestDeviceWithSubmitGetThread) { - const TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); const ui32 fileSize = 4 << 20; const ui32 dataSize = 4 << 10; @@ -342,7 +342,7 @@ Y_UNIT_TEST_SUITE(TBlockDeviceTest) { /* Y_UNIT_TEST(TestRabbitCompletionAction) { - const TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); const ui32 dataSize = 4 << 10; const i32 generations = 8; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.h index 2baba160c5..5e861add10 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_completion_impl.h @@ -26,13 +26,13 @@ class TCompletionEventSender : public TCompletionAction { TPDisk *PDisk; const TActorId Recipient; THolder<IEventBase> Event; - NMonitoring::TDynamicCounters::TCounterPtr Counter; + ::NMonitoring::TDynamicCounters::TCounterPtr Counter; public: THolder<TRequestBase> Req; TCompletionEventSender(TPDisk *pDisk, const TActorId &recipient, IEventBase *event, - NMonitoring::TDynamicCounters::TCounterPtr &counter) + ::NMonitoring::TDynamicCounters::TCounterPtr &counter) : PDisk(pDisk) , Recipient(recipient) , Event(event) diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_driveestimator.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_driveestimator.cpp index fd431f2fd9..d4e7f0e223 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_driveestimator.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_driveestimator.cpp @@ -231,7 +231,7 @@ void TDriveEstimator::EstimateGlueingDeadline(ui32 outGlueingDeadline[TDriveMode TDriveEstimator::TDriveEstimator(const TString filename) : Filename(filename) - , Counters(new NMonitoring::TDynamicCounters()) + , Counters(new ::NMonitoring::TDynamicCounters()) , PDiskMon(Counters, 0, nullptr) , ActorSystemCreator(new TActorSystemCreator) , ActorSystem(ActorSystemCreator->GetActorSystem()) diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_driveestimator.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_driveestimator.h index 3be444f233..35621fb27c 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_driveestimator.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_driveestimator.h @@ -18,7 +18,7 @@ namespace NPDisk { class TDriveEstimator { TString Filename; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TPDiskMon PDiskMon; std::unique_ptr<TActorSystemCreator> ActorSystemCreator; TActorSystem *ActorSystem; diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_free_chunks.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_free_chunks.h index f5dbe53bc1..17a49fd0c0 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_free_chunks.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_free_chunks.h @@ -18,11 +18,11 @@ class TFreeChunks { protected: TDeque<TChunkIdx> FreeChunks; // TODO(cthulhu): preallocate and use a vector here to reduce allocation count. TAtomic FreeChunkCount; - NMonitoring::TDynamicCounters::TCounterPtr MonFreeChunks; + ::NMonitoring::TDynamicCounters::TCounterPtr MonFreeChunks; ui64 OutOfOrderCount; const ui64 SortFreeChunksPerItems; public: - TFreeChunks(NMonitoring::TDynamicCounters::TCounterPtr &monFreeChunks, ui64 sortFreeChunksPerItems) + TFreeChunks(::NMonitoring::TDynamicCounters::TCounterPtr &monFreeChunks, ui64 sortFreeChunksPerItems) : FreeChunkCount(0) , MonFreeChunks(monFreeChunks) , OutOfOrderCount(0) diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp index 0707ce828f..881e798975 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp @@ -21,7 +21,7 @@ LWTRACE_USING(BLOBSTORAGE_PROVIDER); // Initialization //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -TPDisk::TPDisk(const TIntrusivePtr<TPDiskConfig> cfg, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) +TPDisk::TPDisk(const TIntrusivePtr<TPDiskConfig> cfg, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) : PDiskId(cfg->PDiskId) , Mon(counters, PDiskId, cfg.Get()) , DriveModel(cfg->DriveModelSeekTimeNs, diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h index c8487df8a6..37a86da126 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h @@ -175,7 +175,7 @@ public: const bool UseHugePages; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Initialization - TPDisk(const TIntrusivePtr<TPDiskConfig> cfg, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters); + TPDisk(const TIntrusivePtr<TPDiskConfig> cfg, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters); TString DynamicStateToString(bool isMultiline); bool ReadChunk0Format(ui8* formatSectors, const TKey& mainKey); // Called by actor bool IsFormatMagicValid(ui8 *magicData, ui32 magicDataSize); // Called by actor diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.cpp index b67aca8332..7417cd837f 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.cpp @@ -4,7 +4,7 @@ namespace NKikimr { -TPDiskMon::TPDiskMon(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui32 pDiskId, +TPDiskMon::TPDiskMon(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui32 pDiskId, TPDiskConfig *cfg) : Counters(counters) , PDiskId(pDiskId) @@ -218,7 +218,7 @@ TPDiskMon::TPDiskMon(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counter CompletionThreadCPU = PDiskGroup->GetCounter("CompletionThreadCPU", true); } -NMonitoring::TDynamicCounters::TCounterPtr TPDiskMon::GetBusyPeriod(const TString& owner, const TString& queue) { +::NMonitoring::TDynamicCounters::TCounterPtr TPDiskMon::GetBusyPeriod(const TString& owner, const TString& queue) { return SchedulerGroup->GetCounter("SchedulerBusyPeriod_" + owner + "_" + queue, true); } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.h b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.h index 7a1fc6fcd3..b4ffd62c21 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.h +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_mon.h @@ -75,10 +75,10 @@ inline ui64 HPCyclesMs(ui64 ms) { class TLightBase { protected: TString Name; - NMonitoring::TDynamicCounters::TCounterPtr State; // Current state (0=OFF=green, 1=ON=red) - NMonitoring::TDynamicCounters::TCounterPtr Count; // Number of switches to ON state - NMonitoring::TDynamicCounters::TCounterPtr RedMs; // Time elapsed in ON state - NMonitoring::TDynamicCounters::TCounterPtr GreenMs; // Time elapsed in OFF state + ::NMonitoring::TDynamicCounters::TCounterPtr State; // Current state (0=OFF=green, 1=ON=red) + ::NMonitoring::TDynamicCounters::TCounterPtr Count; // Number of switches to ON state + ::NMonitoring::TDynamicCounters::TCounterPtr RedMs; // Time elapsed in ON state + ::NMonitoring::TDynamicCounters::TCounterPtr GreenMs; // Time elapsed in OFF state private: ui64 RedCycles = 0; ui64 GreenCycles = 0; @@ -86,7 +86,7 @@ private: NHPTimer::STime LastNow = 0; ui64 UpdateThreshold = 0; public: - void Initialize(TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, const TString& name) { + void Initialize(TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TString& name) { Name = name; State = counters->GetCounter(name + "_state"); Count = counters->GetCounter(name + "_count", true); @@ -96,7 +96,7 @@ public: AdvancedTill = Now(); } - void Initialize(TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, const TString& countName, + void Initialize(TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TString& countName, const TString& redMsName,const TString& greenMsName) { Count = counters->GetCounter(countName, true); RedMs = counters->GetCounter(redMsName, true); @@ -287,7 +287,7 @@ public: : Bucket(1000ull * 1000ull * 1000ull, 0) {} - void Initialize(const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters, + void Initialize(const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters, const TString& group, const TString& subgroup, const TString& name, const TVector<float> &thresholds) { Tracker.Initialize(counters, group, subgroup, name, thresholds); @@ -309,7 +309,7 @@ private: NMonitoring::THistogramPtr Histo; public: - void Initialize(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + void Initialize(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TString &name, NPDisk::EDeviceType deviceType) { TString histName = name + "Ms"; // Histogram backets in milliseconds @@ -414,7 +414,7 @@ struct TPDiskMon { NHPTimer::STime ProcessingStartAt = 0; NHPTimer::STime WaitingStartAt = 0; - NMonitoring::TDynamicCounters::TCounterPtr PDiskThreadBusyTimeNs; + ::NMonitoring::TDynamicCounters::TCounterPtr PDiskThreadBusyTimeNs; public: NMonitoring::TPercentileTrackerLg<5, 4, 15> UpdateCycleTime; @@ -424,7 +424,7 @@ struct TPDiskMon { : BeginUpdateAt(HPNow()) {} - void SetCounter(const NMonitoring::TDynamicCounters::TCounterPtr& pDiskThreadBusyTimeNs) { + void SetCounter(const ::NMonitoring::TDynamicCounters::TCounterPtr& pDiskThreadBusyTimeNs) { PDiskThreadBusyTimeNs = pDiskThreadBusyTimeNs; } @@ -474,84 +474,84 @@ struct TPDiskMon { } }; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; ui32 PDiskId; // chunk states subgroup - TIntrusivePtr<NMonitoring::TDynamicCounters> ChunksGroup; - NMonitoring::TDynamicCounters::TCounterPtr UntrimmedFreeChunks; - NMonitoring::TDynamicCounters::TCounterPtr FreeChunks; - NMonitoring::TDynamicCounters::TCounterPtr LogChunks; - NMonitoring::TDynamicCounters::TCounterPtr UncommitedDataChunks; - NMonitoring::TDynamicCounters::TCounterPtr CommitedDataChunks; - NMonitoring::TDynamicCounters::TCounterPtr LockedChunks; - NMonitoring::TDynamicCounters::TCounterPtr QuarantineChunks; - NMonitoring::TDynamicCounters::TCounterPtr QuarantineOwners; + TIntrusivePtr<::NMonitoring::TDynamicCounters> ChunksGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr UntrimmedFreeChunks; + ::NMonitoring::TDynamicCounters::TCounterPtr FreeChunks; + ::NMonitoring::TDynamicCounters::TCounterPtr LogChunks; + ::NMonitoring::TDynamicCounters::TCounterPtr UncommitedDataChunks; + ::NMonitoring::TDynamicCounters::TCounterPtr CommitedDataChunks; + ::NMonitoring::TDynamicCounters::TCounterPtr LockedChunks; + ::NMonitoring::TDynamicCounters::TCounterPtr QuarantineChunks; + ::NMonitoring::TDynamicCounters::TCounterPtr QuarantineOwners; // statistics subgroup - TIntrusivePtr<NMonitoring::TDynamicCounters> StatsGroup; - NMonitoring::TDynamicCounters::TCounterPtr FreeSpacePerMile; - NMonitoring::TDynamicCounters::TCounterPtr UsedSpacePerMile; - NMonitoring::TDynamicCounters::TCounterPtr SplicedLogChunks; + TIntrusivePtr<::NMonitoring::TDynamicCounters> StatsGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr FreeSpacePerMile; + ::NMonitoring::TDynamicCounters::TCounterPtr UsedSpacePerMile; + ::NMonitoring::TDynamicCounters::TCounterPtr SplicedLogChunks; - NMonitoring::TDynamicCounters::TCounterPtr TotalSpaceBytes; - NMonitoring::TDynamicCounters::TCounterPtr FreeSpaceBytes; - NMonitoring::TDynamicCounters::TCounterPtr UsedSpaceBytes; - NMonitoring::TDynamicCounters::TCounterPtr SectorMapAllocatedBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr TotalSpaceBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr FreeSpaceBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr UsedSpaceBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr SectorMapAllocatedBytes; // states subgroup - TIntrusivePtr<NMonitoring::TDynamicCounters> StateGroup; - NMonitoring::TDynamicCounters::TCounterPtr PDiskState; - NMonitoring::TDynamicCounters::TCounterPtr PDiskBriefState; - NMonitoring::TDynamicCounters::TCounterPtr PDiskDetailedState; - NMonitoring::TDynamicCounters::TCounterPtr AtLeastOneVDiskNotLogged; - NMonitoring::TDynamicCounters::TCounterPtr TooMuchLogChunks; - NMonitoring::TDynamicCounters::TCounterPtr SerialNumberMismatched; + TIntrusivePtr<::NMonitoring::TDynamicCounters> StateGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr PDiskState; + ::NMonitoring::TDynamicCounters::TCounterPtr PDiskBriefState; + ::NMonitoring::TDynamicCounters::TCounterPtr PDiskDetailedState; + ::NMonitoring::TDynamicCounters::TCounterPtr AtLeastOneVDiskNotLogged; + ::NMonitoring::TDynamicCounters::TCounterPtr TooMuchLogChunks; + ::NMonitoring::TDynamicCounters::TCounterPtr SerialNumberMismatched; TLight L6; TLight L7; TLight IdleLight; - NMonitoring::TDynamicCounters::TCounterPtr OwnerIdsIssued; - NMonitoring::TDynamicCounters::TCounterPtr LastOwnerId; - NMonitoring::TDynamicCounters::TCounterPtr PendingYardInits; + ::NMonitoring::TDynamicCounters::TCounterPtr OwnerIdsIssued; + ::NMonitoring::TDynamicCounters::TCounterPtr LastOwnerId; + ::NMonitoring::TDynamicCounters::TCounterPtr PendingYardInits; TAtomic SeqnoL6; TAtomic LastDoneOperationTimestamp; // device subgroup - TIntrusivePtr<NMonitoring::TDynamicCounters> DeviceGroup; - NMonitoring::TDynamicCounters::TCounterPtr DeviceBytesRead; - NMonitoring::TDynamicCounters::TCounterPtr DeviceBytesWritten; - NMonitoring::TDynamicCounters::TCounterPtr DeviceReads; - NMonitoring::TDynamicCounters::TCounterPtr DeviceWrites; - NMonitoring::TDynamicCounters::TCounterPtr DeviceInFlightBytesRead; - NMonitoring::TDynamicCounters::TCounterPtr DeviceInFlightBytesWrite; - NMonitoring::TDynamicCounters::TCounterPtr DeviceInFlightReads; - NMonitoring::TDynamicCounters::TCounterPtr DeviceInFlightWrites; - NMonitoring::TDynamicCounters::TCounterPtr DeviceTakeoffs; - NMonitoring::TDynamicCounters::TCounterPtr DeviceLandings; - NMonitoring::TDynamicCounters::TCounterPtr DeviceHaltDetected; - NMonitoring::TDynamicCounters::TCounterPtr DeviceExpectedSeeks; - NMonitoring::TDynamicCounters::TCounterPtr DeviceReadCacheHits; - NMonitoring::TDynamicCounters::TCounterPtr DeviceReadCacheMisses; - NMonitoring::TDynamicCounters::TCounterPtr DeviceWriteCacheIsValid; - NMonitoring::TDynamicCounters::TCounterPtr DeviceWriteCacheIsEnabled; - NMonitoring::TDynamicCounters::TCounterPtr DeviceOperationPoolTotalAllocations; - NMonitoring::TDynamicCounters::TCounterPtr DeviceOperationPoolFreeObjectsMin; - NMonitoring::TDynamicCounters::TCounterPtr DeviceBufferPoolFailedAllocations; - NMonitoring::TDynamicCounters::TCounterPtr DeviceErasureSectorRestorations; - NMonitoring::TDynamicCounters::TCounterPtr DeviceEstimatedCostNs; - NMonitoring::TDynamicCounters::TCounterPtr DeviceActualCostNs; - NMonitoring::TDynamicCounters::TCounterPtr DeviceOverestimationRatio; - NMonitoring::TDynamicCounters::TCounterPtr DeviceNonperformanceMs; - NMonitoring::TDynamicCounters::TCounterPtr DeviceInterruptedSystemCalls; - NMonitoring::TDynamicCounters::TCounterPtr DeviceSubmitThreadBusyTimeNs; - NMonitoring::TDynamicCounters::TCounterPtr DeviceCompletionThreadBusyTimeNs; - NMonitoring::TDynamicCounters::TCounterPtr DeviceIoErrors; + TIntrusivePtr<::NMonitoring::TDynamicCounters> DeviceGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceBytesRead; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceBytesWritten; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceReads; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceWrites; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceInFlightBytesRead; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceInFlightBytesWrite; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceInFlightReads; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceInFlightWrites; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceTakeoffs; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceLandings; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceHaltDetected; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceExpectedSeeks; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceReadCacheHits; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceReadCacheMisses; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceWriteCacheIsValid; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceWriteCacheIsEnabled; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceOperationPoolTotalAllocations; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceOperationPoolFreeObjectsMin; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceBufferPoolFailedAllocations; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceErasureSectorRestorations; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceEstimatedCostNs; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceActualCostNs; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceOverestimationRatio; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceNonperformanceMs; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceInterruptedSystemCalls; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceSubmitThreadBusyTimeNs; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceCompletionThreadBusyTimeNs; + ::NMonitoring::TDynamicCounters::TCounterPtr DeviceIoErrors; // queue subgroup - TIntrusivePtr<NMonitoring::TDynamicCounters> QueueGroup; - NMonitoring::TDynamicCounters::TCounterPtr QueueRequests; - NMonitoring::TDynamicCounters::TCounterPtr QueueBytes; + TIntrusivePtr<::NMonitoring::TDynamicCounters> QueueGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueRequests; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueBytes; // Update cycle time TUpdateDurationTracker UpdateDurationTracker; @@ -623,40 +623,40 @@ struct TPDiskMon { THistogram WriteResponseHullComp; // scheduler subgroup - TIntrusivePtr<NMonitoring::TDynamicCounters> SchedulerGroup; - NMonitoring::TDynamicCounters::TCounterPtr ForsetiCbsNotFound; + TIntrusivePtr<::NMonitoring::TDynamicCounters> SchedulerGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr ForsetiCbsNotFound; // bandwidth subgroup - TIntrusivePtr<NMonitoring::TDynamicCounters> BandwidthGroup; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogPayload; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogCommit; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogSectorFooter; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogRecordHeader; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogPadding; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogErasure; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogChunkPadding; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogChunkFooter; - - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogPayload; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogSectorFooter; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogRecordHeader; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogPadding; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogErasure; - - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkPayload; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkSectorFooter; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkPadding; - - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkReadPayload; - NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkReadSectorFooter; + TIntrusivePtr<::NMonitoring::TDynamicCounters> BandwidthGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogPayload; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogCommit; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogSectorFooter; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogRecordHeader; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogPadding; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogErasure; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogChunkPadding; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPLogChunkFooter; + + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogPayload; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogSectorFooter; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogRecordHeader; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogPadding; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPSysLogErasure; + + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkPayload; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkSectorFooter; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkPadding; + + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkReadPayload; + ::NMonitoring::TDynamicCounters::TCounterPtr BandwidthPChunkReadSectorFooter; struct TIoCounters { - NMonitoring::TDynamicCounters::TCounterPtr Requests; - NMonitoring::TDynamicCounters::TCounterPtr Bytes; - NMonitoring::TDynamicCounters::TCounterPtr Results; + ::NMonitoring::TDynamicCounters::TCounterPtr Requests; + ::NMonitoring::TDynamicCounters::TCounterPtr Bytes; + ::NMonitoring::TDynamicCounters::TCounterPtr Results; - void Setup(const TIntrusivePtr<NMonitoring::TDynamicCounters>& group, TString name) { - TIntrusivePtr<NMonitoring::TDynamicCounters> subgroup = group->GetSubgroup("req", name); + void Setup(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& group, TString name) { + TIntrusivePtr<::NMonitoring::TDynamicCounters> subgroup = group->GetSubgroup("req", name); Requests = subgroup->GetCounter("Requests", true); Bytes = subgroup->GetCounter("Bytes", true); Results = subgroup->GetCounter("Results", true); @@ -682,11 +682,11 @@ struct TPDiskMon { }; struct TReqCounters { - NMonitoring::TDynamicCounters::TCounterPtr Requests; - NMonitoring::TDynamicCounters::TCounterPtr Results; + ::NMonitoring::TDynamicCounters::TCounterPtr Requests; + ::NMonitoring::TDynamicCounters::TCounterPtr Results; - void Setup(const TIntrusivePtr<NMonitoring::TDynamicCounters>& group, TString name) { - TIntrusivePtr<NMonitoring::TDynamicCounters> subgroup = group->GetSubgroup("req", name); + void Setup(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& group, TString name) { + TIntrusivePtr<::NMonitoring::TDynamicCounters> subgroup = group->GetSubgroup("req", name); Requests = subgroup->GetCounter("Requests", true); Results = subgroup->GetCounter("Results", true); } @@ -701,7 +701,7 @@ struct TPDiskMon { }; // yard subgroup - TIntrusivePtr<NMonitoring::TDynamicCounters> PDiskGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> PDiskGroup; TReqCounters YardInit; TReqCounters CheckSpace; TReqCounters YardConfigureScheduler; @@ -736,16 +736,16 @@ struct TPDiskMon { NHPTimer::STime LastHaltTimestamp = 0; // System counters - for tracking usage of CPU, memory etc. - TIntrusivePtr<NMonitoring::TDynamicCounters> SystemGroup; - NMonitoring::TDynamicCounters::TCounterPtr PDiskThreadCPU; - NMonitoring::TDynamicCounters::TCounterPtr SubmitThreadCPU; - NMonitoring::TDynamicCounters::TCounterPtr GetThreadCPU; - NMonitoring::TDynamicCounters::TCounterPtr TrimThreadCPU; - NMonitoring::TDynamicCounters::TCounterPtr CompletionThreadCPU; + TIntrusivePtr<::NMonitoring::TDynamicCounters> SystemGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr PDiskThreadCPU; + ::NMonitoring::TDynamicCounters::TCounterPtr SubmitThreadCPU; + ::NMonitoring::TDynamicCounters::TCounterPtr GetThreadCPU; + ::NMonitoring::TDynamicCounters::TCounterPtr TrimThreadCPU; + ::NMonitoring::TDynamicCounters::TCounterPtr CompletionThreadCPU; - TPDiskMon(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui32 pdiskId, TPDiskConfig *cfg); + TPDiskMon(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui32 pdiskId, TPDiskConfig *cfg); - NMonitoring::TDynamicCounters::TCounterPtr GetBusyPeriod(const TString& owner, const TString& queue); + ::NMonitoring::TDynamicCounters::TCounterPtr GetBusyPeriod(const TString& owner, const TString& queue); void IncrementQueueTime(ui8 priorityClass, size_t timeMs); void IncrementResponseTime(ui8 priorityClass, double timeMs, size_t sizeBytes); void UpdatePercentileTrackers(); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.cpp index d7731c4e8b..84f51fce94 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_tools.cpp @@ -99,7 +99,7 @@ void FormatPDisk(TString path, ui64 diskSizeBytes, ui32 sectorSizeBytes, ui32 us file.Close(); } - const TIntrusivePtr<NMonitoring::TDynamicCounters> counters(new NMonitoring::TDynamicCounters); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> counters(new ::NMonitoring::TDynamicCounters); THolder<NPDisk::TPDisk> pDisk(new NPDisk::TPDisk(cfg, counters)); @@ -114,7 +114,7 @@ void FormatPDisk(TString path, ui64 diskSizeBytes, ui32 sectorSizeBytes, ui32 us bool ReadPDiskFormatInfo(const TString &path, const NPDisk::TKey &mainKey, TPDiskInfo &outInfo, const bool doLock, TIntrusivePtr<NPDisk::TSectorMap> sectorMap) { - const TIntrusivePtr<NMonitoring::TDynamicCounters> counters(new NMonitoring::TDynamicCounters); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> counters(new ::NMonitoring::TDynamicCounters); auto mon = std::make_unique<TPDiskMon>(counters, 0, nullptr); bool useSdpkNvmeDriver = path.StartsWith("PCIe:"); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp index 05e059ffcf..4513bb2b2f 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut.cpp @@ -13,7 +13,7 @@ Y_UNIT_TEST_SUITE(TPDiskTest) { TString path = "/tmp/asdqwe"; TIntrusivePtr<TPDiskConfig> cfg = new TPDiskConfig(path, 12345, 0xffffffffull, TPDiskCategory(NPDisk::DEVICE_TYPE_ROT, 0).GetRaw()); - const TIntrusivePtr<NMonitoring::TDynamicCounters> counters(new NMonitoring::TDynamicCounters); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> counters(new ::NMonitoring::TDynamicCounters); THolder<NPDisk::IPDisk> pDisk = MakeHolder<NPDisk::TPDisk>(cfg, counters); pDisk->Wakeup(); @@ -99,7 +99,7 @@ public: Runtime->Send(new IEventHandle(*PDiskActor, Sender, new TKikimrEvents::TEvPoisonPill)); } - auto mainCounters = TIntrusivePtr<NMonitoring::TDynamicCounters>(new NMonitoring::TDynamicCounters()); + auto mainCounters = TIntrusivePtr<::NMonitoring::TDynamicCounters>(new ::NMonitoring::TDynamicCounters()); IActor* pDiskActor = CreatePDisk(cfg.Get(), MainKey, mainCounters); PDiskActor = Runtime->Register(pDiskActor); } diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_helpers.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_helpers.cpp index 9fe03f5808..8897b26d38 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_helpers.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_helpers.cpp @@ -60,7 +60,7 @@ void ReadPdiskFile(TTestContext *tc, ui32 dataSize, NPDisk::TAlignedData &outDat VERBOSE_COUT("ReadPdiskFile"); TString path = EnsurePDiskExists(tc); { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); TActorSystemCreator creator; THolder<NPDisk::IBlockDevice> device(NPDisk::CreateRealBlockDeviceWithDefaults(path, *mon, @@ -95,7 +95,7 @@ ui64 DestroyLastSectors(TTestContext *tc, NPDisk::TAlignedData &dataBefore, NPDi ASSERT_YTHROW(lastDifference > i64(sectorSize * count) + 8, "No remotely sutable data changes detected."); ui64 offset = ((lastDifference - 8) / sectorSize + 1 - count) * sectorSize; { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); NPDisk::TAlignedData buffer(sectorSize * count); memset(buffer.Get(), 0xf, sectorSize * count); @@ -134,7 +134,7 @@ ui64 RestoreLastSectors(TTestContext *tc, NPDisk::TAlignedData &dataBefore, NPDi ASSERT_YTHROW(lastDifference > i64(sectorSize * count) + 8, "No remotely sutable data changes detected."); ui64 offset = ((lastDifference - 8) / sectorSize + 1 - count) * sectorSize; { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); TActorSystemCreator creator; THolder<NPDisk::IBlockDevice> device(NPDisk::CreateRealBlockDeviceWithDefaults(path, *mon, @@ -172,7 +172,7 @@ void FillDeviceWithPattern(TTestContext *tc, ui64 chunkSize, ui64 pattern) { Fill((ui64*)data.Get(), (ui64*)(data.Get() + data.Size()), pattern); { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); TActorSystemCreator creator; THolder<NPDisk::IBlockDevice> device(NPDisk::CreateRealBlockDeviceWithDefaults(path, *mon, @@ -195,7 +195,7 @@ void WriteSectors(TTestContext *tc, NPDisk::TAlignedData &dataAfter, ui64 firstS ui32 sectorSize = 4096; ui64 offset = firstSector * sectorSize; { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); TActorSystemCreator creator; THolder<NPDisk::IBlockDevice> device(NPDisk::CreateRealBlockDeviceWithDefaults(path, *mon, @@ -214,7 +214,7 @@ void DestroySectors(TTestContext *tc, const NPDisk::TAlignedData &dataAfter, ui32 sectorSize = 4096; { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); NPDisk::TAlignedData buffer((dataSize + sectorSize - 1)/ sectorSize * sectorSize); memcpy(buffer.Get(), dataAfter.Get(), dataSize); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_run.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_run.cpp index 81f223a73c..a63d37d5c5 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_run.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_run.cpp @@ -25,7 +25,7 @@ void Run(TVector<IActor*> tests, TTestRunConfig runCfg) { appData.IoContextFactory = ioContext.get(); THolder<TActorSystem> actorSystem1; - TIntrusivePtr<NMonitoring::TDynamicCounters> mainCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> mainCounters; THolder<NActors::TMon> monitoring; TAtomic doneCounter = 0; @@ -38,7 +38,7 @@ void Run(TVector<IActor*> tests, TTestRunConfig runCfg) { } try { - mainCounters = TIntrusivePtr<NMonitoring::TDynamicCounters>(new NMonitoring::TDynamicCounters()); + mainCounters = TIntrusivePtr<::NMonitoring::TDynamicCounters>(new ::NMonitoring::TDynamicCounters()); testIds.resize(runCfg.Instances); @@ -100,7 +100,7 @@ void Run(TVector<IActor*> tests, TTestRunConfig runCfg) { AtomicSet(doneCounter, 0); - TIntrusivePtr<NMonitoring::TDynamicCounters> counters(new NMonitoring::TDynamicCounters()); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters(new ::NMonitoring::TDynamicCounters()); /////////////////////// LOGGER /////////////////////////////////////////////// GetServiceCounters(counters, "utils"); @@ -167,10 +167,10 @@ void Run(TVector<IActor*> tests, TTestRunConfig runCfg) { doneCount = AtomicGet(doneCounter); } - TIntrusivePtr<NMonitoring::TDynamicCounters> pDiskCounters = + TIntrusivePtr<::NMonitoring::TDynamicCounters> pDiskCounters = GetServiceCounters(mainCounters, "pdisks")->GetSubgroup( "pdisk", Sprintf("%09" PRIu32, (ui32)pDiskConfig->PDiskId)); - TIntrusivePtr<NMonitoring::TDynamicCounters> deviceGroup = pDiskCounters->GetSubgroup("subsystem", "device"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> deviceGroup = pDiskCounters->GetSubgroup("subsystem", "device"); TStringStream errorStr; errorStr << "test timeout" diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_yard.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_yard.cpp index 1bc21e3f4e..b8ea34e9d9 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_yard.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_ut_yard.cpp @@ -978,7 +978,7 @@ YARD_UNIT_TEST(TestInitOnOldDisk) { TString path = "/place/home/cthulhu/tmp_hdd2"; ASSERT_YTHROW(NFs::Exists(path), "File " << path << " does not exist."); { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; TPDiskMon mon(counters); THolder<NPDisk::IBlockDevice> device(NPDisk::CreateSyncBlockDevice(path, 999, mon)); VERBOSE_COUT(" Performing Pread of " << dataSize); diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_ut.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_ut.cpp index ab26072e16..dd039338d7 100644 --- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_ut.cpp +++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_util_ut.cpp @@ -91,7 +91,7 @@ Y_UNIT_TEST_SUITE(TPDiskUtil) { Y_UNIT_TEST(Light) { TLight l; - TIntrusivePtr<NMonitoring::TDynamicCounters> c(new NMonitoring::TDynamicCounters()); + TIntrusivePtr<::NMonitoring::TDynamicCounters> c(new ::NMonitoring::TDynamicCounters()); l.Initialize(c, "l"); auto state = c->GetCounter("l_state"); auto count = c->GetCounter("l_count"); @@ -220,7 +220,7 @@ Y_UNIT_TEST_SUITE(TPDiskUtil) { Y_UNIT_TEST(LightOverflow) { TLight l; - TIntrusivePtr<NMonitoring::TDynamicCounters> c(new NMonitoring::TDynamicCounters()); + TIntrusivePtr<::NMonitoring::TDynamicCounters> c(new ::NMonitoring::TDynamicCounters()); l.Initialize(c, "l"); auto state = c->GetCounter("l_state"); auto count = c->GetCounter("l_count"); @@ -473,7 +473,7 @@ void TestPayloadOffset(ui64 firstSector, ui64 lastSector, ui64 currentSector, ui Y_UNIT_TEST(SectorMap) { TIntrusivePtr<TSectorMap> sectorMap(new TSectorMap(1024*1024)); - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; THolder<TPDiskMon> mon(new TPDiskMon(counters, 0, nullptr)); TActorSystemCreator creator; THolder<NPDisk::IBlockDevice> device(NPDisk::CreateRealBlockDeviceWithDefaults("SectorMap:123", *mon, @@ -489,7 +489,7 @@ void TestPayloadOffset(ui64 firstSector, ui64 lastSector, ui64 currentSector, ui Y_UNIT_TEST(FormatSectorMap) { TIntrusivePtr<TSectorMap> sectorMap(new TSectorMap(1024*1024*1024)); - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; NPDisk::TKey chunkKey{}; NPDisk::TKey logKey{}; diff --git a/ydb/core/blobstorage/storagepoolmon/storagepool_counters.h b/ydb/core/blobstorage/storagepoolmon/storagepool_counters.h index 9cf9dcc69a..0eb004ec16 100644 --- a/ydb/core/blobstorage/storagepoolmon/storagepool_counters.h +++ b/ydb/core/blobstorage/storagepoolmon/storagepool_counters.h @@ -17,12 +17,12 @@ namespace NKikimr { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// struct TRequestMonItem { - NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; - NMonitoring::TDynamicCounters::TCounterPtr GeneratedSubrequests; - NMonitoring::TDynamicCounters::TCounterPtr GeneratedSubrequestBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr GeneratedSubrequests; + ::NMonitoring::TDynamicCounters::TCounterPtr GeneratedSubrequestBytes; NMonitoring::THistogramPtr ResponseTime; - void Init(TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NPDisk::EDeviceType type) { + void Init(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NPDisk::EDeviceType type) { RequestBytes = counters->GetCounter("requestBytes", true); GeneratedSubrequests = counters->GetCounter("generatedSubrequests", true); GeneratedSubrequestBytes = counters->GetCounter("generatedSubrequestBytes", true); @@ -163,13 +163,13 @@ public: return RequestMon[(ui32)handleClass][sizeClassIdx]; } - TStoragePoolCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> &counters, const TString &storagePoolName, + TStoragePoolCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters, const TString &storagePoolName, NPDisk::EDeviceType type) { StoragePoolName = storagePoolName; - TIntrusivePtr<NMonitoring::TDynamicCounters> poolGroup = counters->GetSubgroup("storagePool", storagePoolName); + TIntrusivePtr<::NMonitoring::TDynamicCounters> poolGroup = counters->GetSubgroup("storagePool", storagePoolName); for (ui32 handleClass = 0; handleClass < (ui32)HcCount; ++handleClass) { TString handleClassName = GetHandleClassName((EHandleClass)handleClass); - TIntrusivePtr<NMonitoring::TDynamicCounters> hcGroup = poolGroup->GetSubgroup("handleClass", handleClassName); + TIntrusivePtr<::NMonitoring::TDynamicCounters> hcGroup = poolGroup->GetSubgroup("handleClass", handleClassName); if (IsReducedHandleClass((EHandleClass)handleClass)) { for (ui32 sizeClassIdx = 0; sizeClassIdx <= MaxReducedSizeClassBucketIdx; ++sizeClassIdx) { TString sizeClassName = ReducedSizeClassName(sizeClassIdx); @@ -188,12 +188,12 @@ public: class TDsProxyPerPoolCounters : public TThrRefBase { protected: - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TMap<TString, TIntrusivePtr<TStoragePoolCounters>> StoragePoolCounters; public: - TDsProxyPerPoolCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { - TIntrusivePtr<NMonitoring::TDynamicCounters> group = GetServiceCounters(counters, "dsproxynode"); + TDsProxyPerPoolCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { + TIntrusivePtr<::NMonitoring::TDynamicCounters> group = GetServiceCounters(counters, "dsproxynode"); Counters = group->GetSubgroup("subsystem", "request"); }; diff --git a/ydb/core/blobstorage/testload/test_load_actor.cpp b/ydb/core/blobstorage/testload/test_load_actor.cpp index c8788b1310..819a31b113 100644 --- a/ydb/core/blobstorage/testload/test_load_actor.cpp +++ b/ydb/core/blobstorage/testload/test_load_actor.cpp @@ -46,14 +46,14 @@ class TLoadActor : public TActorBootstrapped<TLoadActor> { // HTTP info requests being currently executed THashMap<ui32, THttpInfoRequest> InfoRequests; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; public: static constexpr NKikimrServices::TActivity::EType ActorActivityType() { return NKikimrServices::TActivity::BS_LOAD_ACTOR; } - TLoadActor(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) + TLoadActor(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) : NextRequestId(1) , Counters(counters) {} @@ -388,7 +388,7 @@ public: ) }; -IActor *CreateTestLoadActor(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) { +IActor *CreateTestLoadActor(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) { return new TLoadActor(counters); } diff --git a/ydb/core/blobstorage/testload/test_load_actor.h b/ydb/core/blobstorage/testload/test_load_actor.h index 38b7fb3d30..75f8d22758 100644 --- a/ydb/core/blobstorage/testload/test_load_actor.h +++ b/ydb/core/blobstorage/testload/test_load_actor.h @@ -28,36 +28,36 @@ namespace NKikimr { class TLoadActorException : public yexception { }; - NActors::IActor *CreateTestLoadActor(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters); + NActors::IActor *CreateTestLoadActor(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters); NActors::IActor *CreateWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TLoadStart& cmd, - const NActors::TActorId& parent, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, ui64 tag); + const NActors::TActorId& parent, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, ui64 tag); NActors::IActor *CreatePDiskWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TPDiskLoadStart& cmd, - const NActors::TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag); NActors::IActor *CreatePDiskLogWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TPDiskLogLoadStart& cmd, - const NActors::TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag); NActors::IActor *CreatePDiskReaderTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TPDiskReadLoadStart& cmd, - const NActors::TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag); NActors::IActor *CreateVDiskWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TVDiskLoadStart& cmd, const NActors::TActorId& parent, ui64 tag); NActors::IActor *CreateKeyValueWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TKeyValueLoadStart& cmd, - const NActors::TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag); NActors::IActor *CreateKqpWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TKqpLoadStart& cmd, - const NActors::TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag); NActors::IActor *CreateMemoryTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TMemoryLoadStart& cmd, - const NActors::TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const NActors::TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag); struct TLoadReport : public TThrRefBase { diff --git a/ydb/core/blobstorage/testload/test_load_keyvalue_write.cpp b/ydb/core/blobstorage/testload/test_load_keyvalue_write.cpp index 00e31ff18d..21a6dc0778 100644 --- a/ydb/core/blobstorage/testload/test_load_keyvalue_write.cpp +++ b/ydb/core/blobstorage/testload/test_load_keyvalue_write.cpp @@ -122,13 +122,13 @@ class TKeyValueWriterTestLoadActor : public TActorBootstrapped<TKeyValueWriterTe TReallyFastRng32 Rng; // Monitoring - TIntrusivePtr<NMonitoring::TDynamicCounters> LoadCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> LoadCounters; TInstant TestStartTime; ui64 TabletId; TActorId Pipe; - NMonitoring::TDynamicCounters::TCounterPtr KeyValueBytesWritten; + ::NMonitoring::TDynamicCounters::TCounterPtr KeyValueBytesWritten; TMap<ui64, TLogWriteCookie> InFlightWrites; NMonitoring::TPercentileTrackerLg<6, 5, 15> ResponseTimes; @@ -138,7 +138,7 @@ public: } TKeyValueWriterTestLoadActor(const NKikimrBlobStorage::TEvTestLoadRequest::TKeyValueLoadStart& cmd, - const TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) + const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) : Parent(parent) , Tag(tag) , Rng(Now().GetValue()) @@ -360,7 +360,7 @@ public: }; IActor * CreateKeyValueWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TKeyValueLoadStart& cmd, - const TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { + const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { return new TKeyValueWriterTestLoadActor(cmd, parent, counters, index, tag); } diff --git a/ydb/core/blobstorage/testload/test_load_kqp.cpp b/ydb/core/blobstorage/testload/test_load_kqp.cpp index e999908b98..f460159607 100644 --- a/ydb/core/blobstorage/testload/test_load_kqp.cpp +++ b/ydb/core/blobstorage/testload/test_load_kqp.cpp @@ -76,9 +76,9 @@ class TKqpWriterTestLoadActor : public TActorBootstrapped<TKqpWriterTestLoadActo std::unordered_map<TString, std::queue<TInstant>> SentTime; // Monitoring - TIntrusivePtr<NMonitoring::TDynamicCounters> LoadCounters; - NMonitoring::TDynamicCounters::TCounterPtr Transactions; - NMonitoring::TDynamicCounters::TCounterPtr TransactionsBytesWritten; + TIntrusivePtr<::NMonitoring::TDynamicCounters> LoadCounters; + ::NMonitoring::TDynamicCounters::TCounterPtr Transactions; + ::NMonitoring::TDynamicCounters::TCounterPtr TransactionsBytesWritten; TInstant TestStartTime; TMap<ui64, TLogWriteCookie> InFlightWrites; @@ -92,7 +92,7 @@ public: } TKqpWriterTestLoadActor(const NKikimrBlobStorage::TEvTestLoadRequest::TKqpLoadStart& cmd, - const TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) + const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) : Parent(parent) , Tag(tag) , Rng(Now().GetValue()) @@ -259,7 +259,7 @@ private: }; IActor * CreateKqpWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TKqpLoadStart& cmd, - const TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { + const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { return new TKqpWriterTestLoadActor(cmd, parent, counters, index, tag); } diff --git a/ydb/core/blobstorage/testload/test_load_memory.cpp b/ydb/core/blobstorage/testload/test_load_memory.cpp index 9da565186a..8cddbf85b5 100644 --- a/ydb/core/blobstorage/testload/test_load_memory.cpp +++ b/ydb/core/blobstorage/testload/test_load_memory.cpp @@ -31,7 +31,7 @@ public: } TMemoryTestLoadActor(const NKikimrBlobStorage::TEvTestLoadRequest::TMemoryLoadStart& cmd, - const TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) + const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) : Parent(parent) , Tag(tag) { @@ -131,7 +131,7 @@ public: IActor* CreateMemoryTestLoad( const NKikimrBlobStorage::TEvTestLoadRequest::TMemoryLoadStart& cmd, const TActorId& parent, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { diff --git a/ydb/core/blobstorage/testload/test_load_pdisk_log.cpp b/ydb/core/blobstorage/testload/test_load_pdisk_log.cpp index 33fc363c93..d1e38e01c5 100644 --- a/ydb/core/blobstorage/testload/test_load_pdisk_log.cpp +++ b/ydb/core/blobstorage/testload/test_load_pdisk_log.cpp @@ -62,7 +62,7 @@ class TWorker { TIntrusivePtr<TPDiskParams> PDiskParams; - NMonitoring::TDynamicCounters::TCounterPtr LogEntriesWritten; + ::NMonitoring::TDynamicCounters::TCounterPtr LogEntriesWritten; NPDisk::TLogPosition LogReadPosition{0, 0}; @@ -286,7 +286,7 @@ class TPDiskLogWriterTestLoadActor : public TActorBootstrapped<TPDiskLogWriterTe TReallyFastRng32 Rng; // Monitoring - TIntrusivePtr<NMonitoring::TDynamicCounters> LoadCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> LoadCounters; TInstant TestStartTime; ui32 PDiskId; @@ -295,7 +295,7 @@ class TPDiskLogWriterTestLoadActor : public TActorBootstrapped<TPDiskLogWriterTe bool IsWardenlessTest = false; bool IsDying = false; - NMonitoring::TDynamicCounters::TCounterPtr LogBytesWritten; + ::NMonitoring::TDynamicCounters::TCounterPtr LogBytesWritten; ui64 ReqIdx = 0; TMap<ui64, TLogWriteCookie> InFlightLogWrites; NMonitoring::TPercentileTrackerLg<6, 5, 15> LogResponseTimes; @@ -306,7 +306,7 @@ public: } TPDiskLogWriterTestLoadActor(const NKikimrBlobStorage::TEvTestLoadRequest::TPDiskLogLoadStart& cmd, - const TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) + const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) : Parent(parent) , Tag(tag) , Rng(Now().GetValue()) @@ -694,7 +694,7 @@ public: }; IActor *CreatePDiskLogWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TPDiskLogLoadStart& cmd, - const TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { + const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { return new TPDiskLogWriterTestLoadActor(cmd, parent, counters, index, tag); } diff --git a/ydb/core/blobstorage/testload/test_load_pdisk_read.cpp b/ydb/core/blobstorage/testload/test_load_pdisk_read.cpp index 3b446a74c2..b3197686c6 100644 --- a/ydb/core/blobstorage/testload/test_load_pdisk_read.cpp +++ b/ydb/core/blobstorage/testload/test_load_pdisk_read.cpp @@ -107,10 +107,10 @@ class TPDiskReaderTestLoadActor : public TActorBootstrapped<TPDiskReaderTestLoad ui64 DeletedChunksCount = 0; // Monitoring - NMonitoring::TDynamicCounters::TCounterPtr BytesRead; + ::NMonitoring::TDynamicCounters::TCounterPtr BytesRead; NMonitoring::TPercentileTrackerLg<6, 5, 15> ResponseTimes; - TIntrusivePtr<NMonitoring::TDynamicCounters> LoadCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> LoadCounters; TIntrusivePtr<TLoadReport> Report; TIntrusivePtr<NMonitoring::TCounterForPtr> PDiskBytesRead; TMap<double, TIntrusivePtr<NMonitoring::TCounterForPtr>> DevicePercentiles; @@ -122,7 +122,7 @@ public: } TPDiskReaderTestLoadActor(const NKikimrBlobStorage::TEvTestLoadRequest::TPDiskReadLoadStart& cmd, const TActorId& parent, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) : Parent(parent) , Tag(tag) , MaxInFlight(4, 0, 65536) @@ -176,10 +176,10 @@ public: TVector<float> percentiles {0.1f, 0.5f, 0.9f, 0.99f, 0.999f, 1.0f}; ResponseTimes.Initialize(LoadCounters, "subsystem", "LoadActorReadDuration", "Time in microseconds", percentiles); - TIntrusivePtr<NMonitoring::TDynamicCounters> pDiskCounters = GetServiceCounters(counters, "pdisks")-> + TIntrusivePtr<::NMonitoring::TDynamicCounters> pDiskCounters = GetServiceCounters(counters, "pdisks")-> GetSubgroup("pdisk", Sprintf("%09" PRIu32, PDiskId)); PDiskBytesRead = pDiskCounters->GetSubgroup("subsystem", "device")->GetCounter("DeviceBytesRead", true); - TIntrusivePtr<NMonitoring::TDynamicCounters> percentilesGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> percentilesGroup; percentilesGroup = pDiskCounters->GetSubgroup("subsystem", "deviceReadDuration")->GetSubgroup("sensor", "Time in microsec"); for (double percentile : {0.1, 0.5, 0.9, 0.99, 0.999, 1.0}) { DevicePercentiles.emplace(percentile, percentilesGroup->GetNamedCounter("percentile", @@ -585,7 +585,7 @@ public: }; IActor *CreatePDiskReaderTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TPDiskReadLoadStart& cmd, - const TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { return new TPDiskReaderTestLoadActor(cmd, parent, counters, index, tag); } diff --git a/ydb/core/blobstorage/testload/test_load_pdisk_write.cpp b/ydb/core/blobstorage/testload/test_load_pdisk_write.cpp index 8ea16e014c..60b1280f19 100644 --- a/ydb/core/blobstorage/testload/test_load_pdisk_write.cpp +++ b/ydb/core/blobstorage/testload/test_load_pdisk_write.cpp @@ -116,9 +116,9 @@ class TPDiskWriterTestLoadActor : public TActorBootstrapped<TPDiskWriterTestLoad ui64 DeletedChunksCount = 0; // Monitoring - TIntrusivePtr<NMonitoring::TDynamicCounters> LoadCounters; - NMonitoring::TDynamicCounters::TCounterPtr BytesWritten; - NMonitoring::TDynamicCounters::TCounterPtr LogEntriesWritten; + TIntrusivePtr<::NMonitoring::TDynamicCounters> LoadCounters; + ::NMonitoring::TDynamicCounters::TCounterPtr BytesWritten; + ::NMonitoring::TDynamicCounters::TCounterPtr LogEntriesWritten; NMonitoring::TPercentileTrackerLg<6, 5, 15> ResponseTimes; NMonitoring::TPercentileTrackerLg<6, 5, 15> LogResponseTimes; @@ -132,7 +132,7 @@ public: } TPDiskWriterTestLoadActor(const NKikimrBlobStorage::TEvTestLoadRequest::TPDiskLoadStart& cmd, const TActorId& parent, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) : Parent(parent) , Tag(tag) , MaxInFlight(4, 0, 65536) @@ -191,10 +191,10 @@ public: ResponseTimes.Initialize(LoadCounters, "subsystem", "LoadActorWriteDuration", "Time in microseconds", percentiles); LogResponseTimes.Initialize(LoadCounters, "subsystem", "LoadActorLogWriteDuration", "Time in microseconds", percentiles); - TIntrusivePtr<NMonitoring::TDynamicCounters> pDiskCounters = GetServiceCounters(counters, "pdisks")-> + TIntrusivePtr<::NMonitoring::TDynamicCounters> pDiskCounters = GetServiceCounters(counters, "pdisks")-> GetSubgroup("pdisk", Sprintf("%09" PRIu32, PDiskId)); PDiskBytesWritten = pDiskCounters->GetSubgroup("subsystem", "device")->GetCounter("DeviceBytesWritten", true); - TIntrusivePtr<NMonitoring::TDynamicCounters> percentilesGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> percentilesGroup; percentilesGroup = pDiskCounters-> GetSubgroup("subsystem", "deviceWriteDuration")->GetSubgroup("sensor", "Time in microsec"); for (double percentile : {0.1, 0.5, 0.9, 0.99, 0.999, 1.0}) { DevicePercentiles.emplace(percentile, percentilesGroup->GetNamedCounter("percentile", @@ -639,7 +639,7 @@ public: }; IActor *CreatePDiskWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TPDiskLoadStart& cmd, - const TActorId& parent, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { + const TActorId& parent, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, ui64 index, ui64 tag) { return new TPDiskWriterTestLoadActor(cmd, parent, counters, index, tag); } diff --git a/ydb/core/blobstorage/testload/test_load_quantile.h b/ydb/core/blobstorage/testload/test_load_quantile.h index 0d0f0207c6..11b14aed5d 100644 --- a/ydb/core/blobstorage/testload/test_load_quantile.h +++ b/ydb/core/blobstorage/testload/test_load_quantile.h @@ -13,12 +13,12 @@ namespace NKikimr { using TItem = typename TTimeSeries<T>::TItem; using TTimeSeries<T>::Items; - using TPercentile = std::pair<float, NMonitoring::TDynamicCounters::TCounterPtr>; + using TPercentile = std::pair<float, ::NMonitoring::TDynamicCounters::TCounterPtr>; using TPercentiles = TVector<TPercentile>; TPercentiles Percentiles; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; - NMonitoring::TDynamicCounters::TCounterPtr Samples; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; + ::NMonitoring::TDynamicCounters::TCounterPtr Samples; struct TCompareTimestamp { bool operator ()(const TItem& x, TInstant y) { @@ -29,7 +29,7 @@ namespace NKikimr { public: using TTimeSeries<T>::TTimeSeries; - TQuantileTracker(TDuration lifetime, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TQuantileTracker(TDuration lifetime, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const TString& metric, const TVector<float>& percentiles) : TTimeSeries<T>(lifetime) , Counters(counters) diff --git a/ydb/core/blobstorage/testload/test_load_vdisk_write.cpp b/ydb/core/blobstorage/testload/test_load_vdisk_write.cpp index 39ecca9dbd..6cf73e7276 100644 --- a/ydb/core/blobstorage/testload/test_load_vdisk_write.cpp +++ b/ydb/core/blobstorage/testload/test_load_vdisk_write.cpp @@ -108,7 +108,7 @@ namespace NKikimr { void CreateQueueBackpressure(const TActorContext& ctx) { using namespace NBackpressure; - auto counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + auto counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); NKikimrBlobStorage::EVDiskQueueId queueId = NKikimrBlobStorage::Unknown; switch (PutHandleClass) { diff --git a/ydb/core/blobstorage/testload/test_load_write.cpp b/ydb/core/blobstorage/testload/test_load_write.cpp index a7ac7823e8..01e6839b10 100644 --- a/ydb/core/blobstorage/testload/test_load_write.cpp +++ b/ydb/core/blobstorage/testload/test_load_write.cpp @@ -95,8 +95,8 @@ class TLogWriterTestLoadActor : public TActorBootstrapped<TLogWriterTestLoadActo const TDuration ExposePeriod = TDuration::Seconds(10); - TIntrusivePtr<NMonitoring::TDynamicCounters> TagCounters; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> TagCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TWakeupQueue& WakeupQueue; TQueryDispatcher& QueryDispatcher; const ui64 TabletId; @@ -162,7 +162,7 @@ class TLogWriterTestLoadActor : public TActorBootstrapped<TLogWriterTestLoadActo TVector<TReqInfo> ScriptedRequests; public: - TTabletWriter(ui64 tag, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TTabletWriter(ui64 tag, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, TWakeupQueue& wakeupQueue, TQueryDispatcher& queryDispatcher, ui64 tabletId, ui32 channel, TMaybe<ui32> generation, ui32 groupId, NKikimrBlobStorage::EPutHandleClass putHandleClass, const TSizeGenerator& writeSizeGen, const TIntervalGenerator& writeIntervalGen, @@ -761,7 +761,7 @@ class TLogWriterTestLoadActor : public TActorBootstrapped<TLogWriterTestLoadActo TQueryDispatcher QueryDispatcher; - NMonitoring::TDynamicCounters::TCounterPtr ScheduleCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr ScheduleCounter; ui32 TestStoppedRecieved = 0; @@ -771,7 +771,7 @@ public: } TLogWriterTestLoadActor(const NKikimrBlobStorage::TEvTestLoadRequest::TLoadStart& cmd, const TActorId& parent, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, ui64 tag) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, ui64 tag) : Tag(tag) , Parent(parent) , ScheduleCounter(counters->GetSubgroup("subsystem", "scheduler")->GetCounter("ScheduleCounter", true)) @@ -971,7 +971,7 @@ public: }; IActor *CreateWriterTestLoad(const NKikimrBlobStorage::TEvTestLoadRequest::TLoadStart& cmd, const TActorId& parent, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, ui64 tag) { + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, ui64 tag) { return new TLogWriterTestLoadActor(cmd, parent, std::move(counters), tag); } diff --git a/ydb/core/blobstorage/ut_blobstorage/lib/env.h b/ydb/core/blobstorage/ut_blobstorage/lib/env.h index 096d0c29e7..951ba78a65 100644 --- a/ydb/core/blobstorage/ut_blobstorage/lib/env.h +++ b/ydb/core/blobstorage/ut_blobstorage/lib/env.h @@ -369,7 +369,7 @@ struct TEnvironmentSetup { auto config = MakeIntrusive<NSchemeCache::TSchemeCacheConfig>(); config->Roots.emplace_back(DomainId, domain.SchemeRoot, domain.Name); - config->Counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + config->Counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); Runtime->RegisterService(MakeSchemeCacheID(), Runtime->Register(CreateSchemeBoardSchemeCache(config.Get()), nodeId)); } } @@ -503,11 +503,11 @@ struct TEnvironmentSetup { } TActorId CreateQueueActor(const TVDiskID& vdiskId, NKikimrBlobStorage::EVDiskQueueId queueId, ui32 index) { - TBSProxyContextPtr bspctx = MakeIntrusive<TBSProxyContext>(MakeIntrusive<NMonitoring::TDynamicCounters>()); + TBSProxyContextPtr bspctx = MakeIntrusive<TBSProxyContext>(MakeIntrusive<::NMonitoring::TDynamicCounters>()); auto flowRecord = MakeIntrusive<NBackpressure::TFlowRecord>(); auto groupInfo = GetGroupInfo(vdiskId.GroupID); std::unique_ptr<IActor> actor(CreateVDiskBackpressureClient(groupInfo, vdiskId, queueId, - MakeIntrusive<NMonitoring::TDynamicCounters>(), bspctx, + MakeIntrusive<::NMonitoring::TDynamicCounters>(), bspctx, NBackpressure::TQueueClientId(NBackpressure::EQueueClientType::DSProxy, index), TStringBuilder() << "test# " << index, 0, false, TDuration::Seconds(60), flowRecord, NMonitoring::TCountableBase::EVisibility::Private)); const ui32 nodeId = Settings.ControllerNodeId; diff --git a/ydb/core/blobstorage/ut_group/main.cpp b/ydb/core/blobstorage/ut_group/main.cpp index 066e2735d9..0ef59b5479 100644 --- a/ydb/core/blobstorage/ut_group/main.cpp +++ b/ydb/core/blobstorage/ut_group/main.cpp @@ -160,7 +160,7 @@ public: NKikimrBlobStorage::EVDiskStatus Status; }; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; const NPDisk::TKey MainKey = NPDisk::YdbDefaultPDiskSequence; const ui32 NodeCount; const ui32 GroupId = 0; @@ -174,7 +174,7 @@ public: TIntrusivePtr<TStoragePoolCounters> StoragePoolCounters; TTestEnv(ui32 nodeCount) - : Counters(MakeIntrusive<NMonitoring::TDynamicCounters>()) + : Counters(MakeIntrusive<::NMonitoring::TDynamicCounters>()) , NodeCount(nodeCount) {} diff --git a/ydb/core/blobstorage/ut_mirror3of4/main.cpp b/ydb/core/blobstorage/ut_mirror3of4/main.cpp index 9429913f38..f051b062f1 100644 --- a/ydb/core/blobstorage/ut_mirror3of4/main.cpp +++ b/ydb/core/blobstorage/ut_mirror3of4/main.cpp @@ -43,7 +43,7 @@ public: : GType(gtype) , NodeCount(gtype.BlobSubgroupSize()) , PDisks(NodeCount) - , Counters(MakeIntrusive<NMonitoring::TDynamicCounters>()) + , Counters(MakeIntrusive<::NMonitoring::TDynamicCounters>()) { for (ui32 i = 0; i < PDisks.size(); ++i) { PDisks[i] = {i + 1, 1, RandomNumber<ui64>(), nullptr}; @@ -278,7 +278,7 @@ private: } private: - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; }; void ReplicationTest(const TString datum) { diff --git a/ydb/core/blobstorage/ut_pdiskfit/lib/basic_test.h b/ydb/core/blobstorage/ut_pdiskfit/lib/basic_test.h index 2672d3a515..06b5d5a0ba 100644 --- a/ydb/core/blobstorage/ut_pdiskfit/lib/basic_test.h +++ b/ydb/core/blobstorage/ut_pdiskfit/lib/basic_test.h @@ -32,7 +32,7 @@ IActor *CreateFakeVDisk(const TVDiskID& vdiskId, const TActorId& pdiskServiceId, class TBasicTest : public TActorBootstrapped<TBasicTest> { TAutoEvent *StopEvent = nullptr; TStateManager *StateManager = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TIntrusivePtr<TPDiskConfig> PDiskConfig; TActorId PDiskServiceId; const ui32 NumVDisks; diff --git a/ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h b/ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h index 07a6d23e49..f82dcc478e 100644 --- a/ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h +++ b/ydb/core/blobstorage/ut_pdiskfit/lib/fail_injection_test.h @@ -109,7 +109,7 @@ struct TPDiskFailureInjectionTest { ui64 PDiskGuid; bool ErasureEncode = false; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TProgramShouldContinue KikimrShouldContinue; std::unique_ptr<NKikimr::TAppData> AppData; @@ -166,7 +166,7 @@ struct TPDiskFailureInjectionTest { using namespace NActors; // create counters - Counters = new NMonitoring::TDynamicCounters; + Counters = new ::NMonitoring::TDynamicCounters; // initialize app data with pool ids and registries AppData.reset(new NKikimr::TAppData(0u, 1u, 2u, 3u, {}, nullptr, nullptr, nullptr, &KikimrShouldContinue)); diff --git a/ydb/core/blobstorage/ut_vdisk/lib/astest.h b/ydb/core/blobstorage/ut_vdisk/lib/astest.h index a61c2ac8cd..99794a40d9 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/astest.h +++ b/ydb/core/blobstorage/ut_vdisk/lib/astest.h @@ -32,7 +32,7 @@ public: private: TProgramShouldContinue KikimrShouldContinue; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; std::unique_ptr<NActors::TMon> Monitoring; std::unique_ptr<NKikimr::TAppData> AppData; std::shared_ptr<NKikimr::NPDisk::IIoContextFactory> IoContext; @@ -45,7 +45,7 @@ public: inline void TTestWithActorSystem::Run(NActors::IActor *testActor) { using namespace NActors; - Counters = TIntrusivePtr<NMonitoring::TDynamicCounters>(new NMonitoring::TDynamicCounters()); + Counters = TIntrusivePtr<::NMonitoring::TDynamicCounters>(new ::NMonitoring::TDynamicCounters()); TIntrusivePtr<TTableNameserverSetup> nameserverTable(new TTableNameserverSetup()); TPortManager pm; nameserverTable->StaticNodeTable[1] = std::pair<TString, ui32>("127.0.0.1", pm.GetPort(12001)); diff --git a/ydb/core/blobstorage/ut_vdisk/lib/helpers.cpp b/ydb/core/blobstorage/ut_vdisk/lib/helpers.cpp index f7bd796a00..931cd7958d 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/helpers.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/helpers.cpp @@ -215,7 +215,7 @@ class TManyPuts : public TActorBootstrapped<TManyPuts> { void Bootstrap(const TActorContext &ctx) { Become(&TThis::StateWriteFunc); - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; TIntrusivePtr<NBackpressure::TFlowRecord> flowRecord(new NBackpressure::TFlowRecord); QueueActorId = ctx.Register(CreateVDiskBackpressureClient(Conf->GroupInfo, VDiskInfo.VDiskID, NKikimrBlobStorage::PutTabletLog, counters, new TBSProxyContext{counters}, {}, "PutTabletLog", 0, false, @@ -402,7 +402,7 @@ class TManyMultiPuts : public TActorBootstrapped<TManyMultiPuts> { void Bootstrap(const TActorContext &ctx) { Become(&TThis::StateWriteFunc); - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; TIntrusivePtr<NBackpressure::TFlowRecord> flowRecord(new NBackpressure::TFlowRecord); QueueActorId = ctx.Register(CreateVDiskBackpressureClient(Conf->GroupInfo, VDiskInfo.VDiskID, NKikimrBlobStorage::PutTabletLog, counters, new TBSProxyContext{counters}, {}, "PutTabletLog", 0, false, diff --git a/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp b/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp index 1950abff89..ccee189f60 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/prepare.cpp @@ -148,7 +148,7 @@ TAllPDisks::TAllPDisks(const TAllPDisksConfiguration &cfg) } void TAllPDisks::ActorSetupCmd(NActors::TActorSystemSetup *setup, ui32 node, - const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters) { + const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters) { for (ui32 i = 0; i < PDisks.size(); i++) { TOnePDisk &inst = PDisks[i]; inst.PDiskActorID = MakeBlobStoragePDiskID(node, i); @@ -206,7 +206,7 @@ TAllVDisks::~TAllVDisks() { } void TAllVDisks::ActorSetupCmd(NActors::TActorSystemSetup *setup, NKikimr::TBlobStorageGroupInfo *groupInfo, - const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters) { + const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters) { for (ui32 i = 0; i < VDisks.size(); i++) { TVDiskInstance &vdisk = VDisks[i]; if (vdisk.Initialized) { @@ -279,7 +279,7 @@ TConfiguration::~TConfiguration() { static TProgramShouldContinue KikimrShouldContinue; void TConfiguration::Prepare(IVDiskSetup *vdiskSetup, bool newPDisks, bool runRepl) { // FIXME: put newPDisks into configuration (see up) - Counters = TIntrusivePtr<NMonitoring::TDynamicCounters>(new NMonitoring::TDynamicCounters()); + Counters = TIntrusivePtr<::NMonitoring::TDynamicCounters>(new ::NMonitoring::TDynamicCounters()); TIntrusivePtr<TTableNameserverSetup> nameserverTable(new TTableNameserverSetup()); TPortManager pm; diff --git a/ydb/core/blobstorage/ut_vdisk/lib/prepare.h b/ydb/core/blobstorage/ut_vdisk/lib/prepare.h index fc5da8d342..56353d2de6 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/prepare.h +++ b/ydb/core/blobstorage/ut_vdisk/lib/prepare.h @@ -65,7 +65,7 @@ class TAllPDisks { public: TAllPDisks(const TAllPDisksConfiguration &cfg); void ActorSetupCmd(NActors::TActorSystemSetup *setup, ui32 node, - const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters); // get instance by pDiskID (sequential number starting from 1) TOnePDisk &Get(ui32 pDiskID); void EraseDisk(ui32 pDiskId, ui64 newGuid); @@ -100,7 +100,7 @@ public: return VDisks.at(vdisk); } void ActorSetupCmd(NActors::TActorSystemSetup *setup, NKikimr::TBlobStorageGroupInfo *groupInfo, - const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters); ui32 GetSize() const { return VDisks.size(); } @@ -153,7 +153,7 @@ struct TConfiguration { const NKikimr::TErasureType::EErasureSpecies Erasure; TAllPDisksConfiguration PCfg; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; std::unique_ptr<NActors::TMon> Monitoring; std::unique_ptr<NKikimr::TAppData> AppData; std::shared_ptr<NKikimr::NPDisk::IIoContextFactory> IoContext; diff --git a/ydb/core/blobstorage/ut_vdisk/lib/test_huge.cpp b/ydb/core/blobstorage/ut_vdisk/lib/test_huge.cpp index 0e41b8b27f..18d99b9545 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/test_huge.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/test_huge.cpp @@ -92,7 +92,7 @@ public: ///////////////////////////////////////////////////////////////////////////////////////////////////////// struct THugeModuleContext { TConfiguration *Conf; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TIntrusivePtr<TLsnMngr> LsnMngr; TIntrusivePtr<NKikimr::TVDiskConfig> Config; TVDiskContextPtr VCtx; @@ -104,7 +104,7 @@ struct THugeModuleContext { THugeModuleContext(TConfiguration *conf) : Conf(conf) - , Counters(new NMonitoring::TDynamicCounters) + , Counters(new ::NMonitoring::TDynamicCounters) {} }; diff --git a/ydb/core/blobstorage/ut_vdisk/lib/test_repl.cpp b/ydb/core/blobstorage/ut_vdisk/lib/test_repl.cpp index 2baeac688c..425fba5518 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/test_repl.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/test_repl.cpp @@ -196,7 +196,7 @@ private: friend class TActorBootstrapped<TVDiskReplProxyReaderActor>; void Bootstrap(const TActorContext &ctx) { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters; auto groupInfo = TBlobStorageGroupInfo(TBlobStorageGroupType::ErasureMirror3, 2, 4); VCtx.Reset(new TVDiskContext(ctx.SelfID, groupInfo.PickTopology(), counters, VDiskInfo.VDiskID, ctx.ExecutorThread.ActorSystem, NPDisk::DEVICE_TYPE_UNKNOWN)); diff --git a/ydb/core/blobstorage/ut_vdisk/lib/test_synclog.cpp b/ydb/core/blobstorage/ut_vdisk/lib/test_synclog.cpp index 53810322f6..abd18a5be5 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/test_synclog.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/test_synclog.cpp @@ -162,7 +162,7 @@ class TSyncLogTestWriteActor : public TActorBootstrapped<TSyncLogTestWriteActor> void Bootstrap(const TActorContext &ctx) { STR << "RUN TEST\n"; - TIntrusivePtr<NMonitoring::TDynamicCounters> counters(new NMonitoring::TDynamicCounters); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters(new ::NMonitoring::TDynamicCounters); auto &vDiskInstance = Conf->VDisks->Get(0); auto &groupInfo = Conf->GroupInfo; VCtx = MakeIntrusive<TVDiskContext>(ctx.SelfID, groupInfo->PickTopology(), counters, vDiskInstance.VDiskID, diff --git a/ydb/core/blobstorage/ut_vdisk/lib/vdisk_mock.cpp b/ydb/core/blobstorage/ut_vdisk/lib/vdisk_mock.cpp index 048f40d773..d00daeecd3 100644 --- a/ydb/core/blobstorage/ut_vdisk/lib/vdisk_mock.cpp +++ b/ydb/core/blobstorage/ut_vdisk/lib/vdisk_mock.cpp @@ -36,7 +36,7 @@ public: } void Bootstrap(const TActorContext& ctx) { - VCtx.Reset(new TVDiskContext(ctx.SelfID, Top, new NMonitoring::TDynamicCounters, VDiskId, + VCtx.Reset(new TVDiskContext(ctx.SelfID, Top, new ::NMonitoring::TDynamicCounters, VDiskId, ctx.ExecutorThread.ActorSystem, NPDisk::DEVICE_TYPE_UNKNOWN)); Become(&TVDiskMockActor::StateFunc); } diff --git a/ydb/core/blobstorage/ut_vdisk2/env.h b/ydb/core/blobstorage/ut_vdisk2/env.h index d2c4397a39..9a8ad89cc9 100644 --- a/ydb/core/blobstorage/ut_vdisk2/env.h +++ b/ydb/core/blobstorage/ut_vdisk2/env.h @@ -6,7 +6,7 @@ namespace NKikimr { class TTestEnv : TNonCopyable { std::unique_ptr<TTestActorSystem> Runtime; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; TIntrusivePtr<TVDiskConfig> VDiskConfig; TIntrusivePtr<TBlobStorageGroupInfo> Info; const ui32 GroupId = 0; @@ -24,7 +24,7 @@ namespace NKikimr { public: TTestEnv(TIntrusivePtr<TPDiskMockState> state = nullptr) : Runtime(std::make_unique<TTestActorSystem>(1)) - , Counters(new NMonitoring::TDynamicCounters) + , Counters(new ::NMonitoring::TDynamicCounters) , AllVDiskKinds(new TAllVDiskKinds) , PDiskMockState(state ? state : new TPDiskMockState(NodeId, PDiskId, PDiskGuid, (ui64)10 << 40)) { diff --git a/ydb/core/blobstorage/vdisk/anubis_osiris/blobstorage_anubis_osiris.h b/ydb/core/blobstorage/vdisk/anubis_osiris/blobstorage_anubis_osiris.h index 96eec4e406..e44bcae7e7 100644 --- a/ydb/core/blobstorage/vdisk/anubis_osiris/blobstorage_anubis_osiris.h +++ b/ydb/core/blobstorage/vdisk/anubis_osiris/blobstorage_anubis_osiris.h @@ -82,7 +82,7 @@ namespace NKikimr { TEvAnubisOsirisPutResult(NKikimrProto::EReplyStatus status, const TInstant &now, - NMonitoring::TDynamicCounters::TCounterPtr counterPtr, + ::NMonitoring::TDynamicCounters::TCounterPtr counterPtr, NVDiskMon::TLtcHistoPtr histoPtr, NWilson::TTraceId traceId) : TEvVResultBase(now, TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, counterPtr, histoPtr, diff --git a/ydb/core/blobstorage/vdisk/common/memusage.h b/ydb/core/blobstorage/vdisk/common/memusage.h index b045c1e3d5..fbfdeb52d4 100644 --- a/ydb/core/blobstorage/vdisk/common/memusage.h +++ b/ydb/core/blobstorage/vdisk/common/memusage.h @@ -12,10 +12,10 @@ namespace NKikimr { class TMemoryConsumer { - NMonitoring::TDynamicCounters::TCounterPtr Counter; + ::NMonitoring::TDynamicCounters::TCounterPtr Counter; public: - TMemoryConsumer(NMonitoring::TDynamicCounters::TCounterPtr counter) + TMemoryConsumer(::NMonitoring::TDynamicCounters::TCounterPtr counter) : Counter(std::move(counter)) {} @@ -34,14 +34,14 @@ namespace NKikimr { *Counter += static_cast<i64>(bytes); } - NMonitoring::TDynamicCounters::TCounterPtr GetCounter() const { + ::NMonitoring::TDynamicCounters::TCounterPtr GetCounter() const { return Counter; } }; class TMemoryConsumerWithDropOnDestroy : protected TMemoryConsumer { public: - TMemoryConsumerWithDropOnDestroy(NMonitoring::TDynamicCounters::TCounterPtr counter) + TMemoryConsumerWithDropOnDestroy(::NMonitoring::TDynamicCounters::TCounterPtr counter) : TMemoryConsumer(counter) {} TMemoryConsumerWithDropOnDestroy(const TMemoryConsumer &other) diff --git a/ydb/core/blobstorage/vdisk/common/memusage_ut.cpp b/ydb/core/blobstorage/vdisk/common/memusage_ut.cpp index 79022e4ab3..0634a36b56 100644 --- a/ydb/core/blobstorage/vdisk/common/memusage_ut.cpp +++ b/ydb/core/blobstorage/vdisk/common/memusage_ut.cpp @@ -5,9 +5,9 @@ using namespace NKikimr; Y_UNIT_TEST_SUITE(TTrackable) { Y_UNIT_TEST(TVector) { - NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); + ::NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); TMemoryConsumer cons(cntr); - NMonitoring::TDynamicCounters::TCounterPtr cntr2(new NMonitoring::TCounterForPtr); + ::NMonitoring::TDynamicCounters::TCounterPtr cntr2(new NMonitoring::TCounterForPtr); TMemoryConsumer cons2(cntr2); { TTrackableVector<ui32> v{TMemoryConsumer(cons)}; @@ -37,7 +37,7 @@ Y_UNIT_TEST_SUITE(TTrackable) { } Y_UNIT_TEST(TList) { - NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); + ::NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); TMemoryConsumer cons(cntr); TTrackableList<ui32> list{TMemoryConsumer(cons)}; list.push_back(1); @@ -45,12 +45,12 @@ Y_UNIT_TEST_SUITE(TTrackable) { } Y_UNIT_TEST(TString) { - NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); + ::NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); TMemoryConsumer cons(cntr); } Y_UNIT_TEST(TBuffer) { - NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); + ::NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); TMemoryConsumer cons(cntr); } } diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_context.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_context.cpp index 00f0b778c4..a5064cd967 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_context.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_context.cpp @@ -22,7 +22,7 @@ namespace NKikimr { TVDiskContext::TVDiskContext( const TActorId &vdiskActorId, std::shared_ptr<TBlobStorageGroupInfo::TTopology> top, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& vdiskCounters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& vdiskCounters, const TVDiskID &selfVDisk, TActorSystem *as, // as can be nullptr for tests NPDisk::EDeviceType type, diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_context.h b/ydb/core/blobstorage/vdisk/common/vdisk_context.h index 9d383fc15d..4f6c749e97 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_context.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_context.h @@ -16,7 +16,7 @@ namespace NKikimr { // TBSProxyContext ///////////////////////////////////////////////////////////////////////////////////////// struct TBSProxyContext : public TThrRefBase, TNonCopyable { - TBSProxyContext(const TIntrusivePtr<NMonitoring::TDynamicCounters>& mon) + TBSProxyContext(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& mon) : Queue(mon->GetCounter("MemTotal:Queue")) {} @@ -33,8 +33,8 @@ namespace NKikimr { // ActorId of the main VDisk actor (currently ActorId of SkeletonFront) const TActorId VDiskActorId; const std::shared_ptr<TBlobStorageGroupInfo::TTopology> Top; - const TIntrusivePtr<NMonitoring::TDynamicCounters> VDiskCounters; - const TIntrusivePtr<NMonitoring::TDynamicCounters> VDiskMemCounters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters> VDiskCounters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters> VDiskMemCounters; // latency histograms NVDiskMon::THistograms Histograms; std::shared_ptr<NMonGroup::TVDiskIFaceGroup> IFaceMonGroup; @@ -80,7 +80,7 @@ namespace NKikimr { TVDiskContext( const TActorId &vdiskActorId, std::shared_ptr<TBlobStorageGroupInfo::TTopology> top, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& vdiskCounters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& vdiskCounters, const TVDiskID &selfVDisk, TActorSystem *as, // can be nullptr for tests NPDisk::EDeviceType type, diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_events.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_events.cpp index 25a0e24320..f02de6350c 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_events.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_events.cpp @@ -8,7 +8,7 @@ namespace NKikimr { TEvBlobStorage::TEvVPutResult::TEvVPutResult(const NKikimrProto::EReplyStatus status, const TLogoBlobID &logoBlobId, const TVDiskID &vdisk, const ui64 *cookie, TOutOfSpaceStatus oosStatus, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVPut *record, - const TActorIDPtr &skeletonFrontIDPtr, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const TActorIDPtr &skeletonFrontIDPtr, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, const ui64 bufferSizeBytes, NWilson::TTraceId traceId, ui64 incarnationGuid, const TString& errorReason) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_events.h b/ydb/core/blobstorage/vdisk/common/vdisk_events.h index dc52a49d02..dcfcea9eaf 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_events.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_events.h @@ -353,7 +353,7 @@ namespace NKikimr { public: TEvVResultBase() = default; - TEvVResultBase(const TInstant &now, ui32 channel, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + TEvVResultBase(const TInstant &now, ui32 channel, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId) : TVDiskNonlocalResultBase(channel) , Start(now) @@ -390,7 +390,7 @@ namespace NKikimr { private: const TInstant Start; ui64 Size; - NMonitoring::TDynamicCounters::TCounterPtr CounterPtr; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterPtr; NVDiskMon::TLtcHistoPtr HistoPtr; bool Finalized = false; @@ -408,7 +408,7 @@ namespace NKikimr { public: TEvVResultBasePB() = default; - TEvVResultBasePB(const TInstant &now, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + TEvVResultBasePB(const TInstant &now, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui32 channel) : TEvVResultBase(now, channel, counterPtr, histoPtr, std::move(traceId)) {} @@ -431,7 +431,7 @@ namespace NKikimr { } template<typename TQueryRecord> - TEvVResultBaseWithQoSPB(TInstant now, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + TEvVResultBaseWithQoSPB(TInstant now, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui32 channel, ui32 recByteSize, TQueryRecord *queryRecord, const TActorIDPtr &skeletonFrontIDPtr) : TBase(queryRecord ? GetReceivedTimestamp(queryRecord) : now, @@ -715,7 +715,7 @@ namespace NKikimr { TEvVPutResult(const NKikimrProto::EReplyStatus status, const TLogoBlobID &logoBlobId, const TVDiskID &vdisk, const ui64 *cookie, TOutOfSpaceStatus oosStatus, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVPut *queryRecord, const TActorIDPtr &skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, const ui64 bufferSizeBytes, NWilson::TTraceId traceId, ui64 incarnationGuid, const TString& errorReason); @@ -927,7 +927,7 @@ namespace NKikimr { TEvVMultiPutResult(const NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, const ui64 *cookie, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVMultiPut *record, - const TActorIDPtr &skeletonFrontIDPtr, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const TActorIDPtr &skeletonFrontIDPtr, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, const ui64 bufferSizeBytes, NWilson::TTraceId traceId, ui64 incarnationGuid, const TString& errorReason) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), @@ -1263,7 +1263,7 @@ namespace NKikimr { TEvVGetResult(NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVGet *queryRecord, const TActorIDPtr &skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, TMaybe<ui64> cookie, ui32 channel, ui64 incarnationGuid) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), channel, recByteSize, queryRecord, skeletonFrontIDPtr) @@ -1515,7 +1515,7 @@ namespace NKikimr { const TLogoBlobID &patchedBlobId, const TVDiskID &vdisk, TMaybe<ui64> cookie, TOutOfSpaceStatus oosStatus, const TInstant &now, ui32 recByteSize, TReqRecord *record, const TActorIDPtr &skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui64 incarnationGuid, const TString& errorReason) : TBase(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, recByteSize, record, skeletonFrontIDPtr) @@ -1638,7 +1638,7 @@ namespace NKikimr { const TLogoBlobID &patchedBlobId, const TVDiskID &vdisk, TMaybe<ui64> cookie, TOutOfSpaceStatus oosStatus, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVMovedPatch *record, const TActorIDPtr &skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui64 incarnationGuid, const TString& errorReason) : TBase(status, originalBlobId, patchedBlobId, vdisk, cookie, oosStatus, now, recByteSize, record, skeletonFrontIDPtr, counterPtr, histoPtr, std::move(traceId), incarnationGuid, errorReason) @@ -1686,7 +1686,7 @@ namespace NKikimr { const TLogoBlobID &patchedBlobId, const TVDiskID &vdisk, TMaybe<ui64> cookie, TOutOfSpaceStatus oosStatus, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVInplacePatch *record, const TActorIDPtr &skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui64 incarnationGuid, const TString& errorReason) : TBase(status, originalBlobId, patchedBlobId, vdisk, cookie, oosStatus, now, recByteSize, record, skeletonFrontIDPtr, counterPtr, histoPtr, std::move(traceId), incarnationGuid, errorReason) @@ -1736,7 +1736,7 @@ namespace NKikimr { TEvVBlockResult(NKikimrProto::EReplyStatus status, const TTabletActGen *actual, const TVDiskID &vdisk, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVBlock *queryRecord, - const TActorIDPtr &skeletonFrontIDPtr, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const TActorIDPtr &skeletonFrontIDPtr, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui64 incarnationGuid) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, recByteSize, queryRecord, skeletonFrontIDPtr) @@ -1830,7 +1830,7 @@ namespace NKikimr { TEvVPatchFoundParts(NKikimrProto::EReplyStatus status, const TLogoBlobID &originalBlobId, const TLogoBlobID &patchedBlobId, const TVDiskID &vDiskId, TMaybe<ui64> cookie, const TInstant &now, const TString &errorReason, NKikimrBlobStorage::TEvVPatchStart *record, - const TActorIDPtr &skeletonFrontIDPtr, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const TActorIDPtr &skeletonFrontIDPtr, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui64 incarnationGuid) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, record->GetCachedSize(), @@ -1994,7 +1994,7 @@ namespace NKikimr { TEvVPatchXorDiffResult(NKikimrProto::EReplyStatus status, TInstant now, NKikimrBlobStorage::TEvVPatchXorDiff *record, const TActorIDPtr &skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, record->GetCachedSize(), @@ -2028,7 +2028,7 @@ namespace NKikimr { TEvVPatchResult(NKikimrProto::EReplyStatus status, const TLogoBlobID &originalPartBlobId, const TLogoBlobID &patchedPartBlobId, const TVDiskID &vDiskId, TMaybe<ui64> cookie, TInstant now, NKikimrBlobStorage::TEvVPatchDiff *record, const TActorIDPtr &skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui64 incarnationGuid) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, record->GetCachedSize(), @@ -2107,7 +2107,7 @@ namespace NKikimr { TEvVGetBlockResult(NKikimrProto::EReplyStatus status, ui64 tabletId, const TVDiskID &vdisk, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVGetBlock *queryRecord, - const TActorIDPtr &skeletonFrontIDPtr, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const TActorIDPtr &skeletonFrontIDPtr, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, recByteSize, queryRecord, skeletonFrontIDPtr) @@ -2119,7 +2119,7 @@ namespace NKikimr { TEvVGetBlockResult(NKikimrProto::EReplyStatus status, ui64 tabletId, ui32 generation, const TVDiskID &vdisk, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVGetBlock *queryRecord, - const TActorIDPtr &skeletonFrontIDPtr, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const TActorIDPtr &skeletonFrontIDPtr, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, recByteSize, queryRecord, skeletonFrontIDPtr) @@ -2232,7 +2232,7 @@ namespace NKikimr { TEvVCollectGarbageResult(NKikimrProto::EReplyStatus status, ui64 tabletId, ui32 recordGeneration, ui32 channel, const TVDiskID &vdisk, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVCollectGarbage *queryRecord, const TActorIDPtr &skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui64 incarnationGuid) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, recByteSize, queryRecord, skeletonFrontIDPtr) @@ -2327,7 +2327,7 @@ namespace NKikimr { TEvVGetBarrierResult(NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, const TInstant &now, ui32 recByteSize, NKikimrBlobStorage::TEvVGetBarrier *queryRecord, - const TActorIDPtr &skeletonFrontIDPtr, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const TActorIDPtr &skeletonFrontIDPtr, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId) : TEvVResultBaseWithQoSPB(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, recByteSize, queryRecord, skeletonFrontIDPtr) @@ -2497,7 +2497,7 @@ namespace NKikimr { TEvVDbStatResult() = default; TEvVDbStatResult(NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, const TInstant &now, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId) : TEvVResultBasePB(now, counterPtr, histoPtr, std::move(traceId), TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG) @@ -2564,7 +2564,7 @@ namespace NKikimr { // read response TEvVSyncGuidResult(const NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, const TInstant &now, - ui64 guid, EState state, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + ui64 guid, EState state, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui32 channel) : TEvVResultBasePB(now, counterPtr, histoPtr, std::move(traceId), channel) { @@ -2577,7 +2577,7 @@ namespace NKikimr { // write or error response TEvVSyncGuidResult(const NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, const TInstant &now, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui32 channel) : TEvVResultBasePB(now, counterPtr, histoPtr, std::move(traceId), channel) { @@ -2623,7 +2623,7 @@ namespace NKikimr { TEvVSyncResult(const NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, const TSyncState &newSyncState, bool finished, NPDisk::TStatusFlags flags, const TInstant &now, - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui32 channel) : TEvVResultBasePB(now, counterPtr, histoPtr, std::move(traceId), channel) { @@ -2635,7 +2635,7 @@ namespace NKikimr { } TEvVSyncResult(const NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, NPDisk::TStatusFlags flags, - const TInstant &now, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const TInstant &now, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui32 channel) : TEvVResultBasePB(now, counterPtr, histoPtr, std::move(traceId), channel) { @@ -2689,7 +2689,7 @@ namespace NKikimr { TEvVSyncFullResult() = default; TEvVSyncFullResult(const NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, const TSyncState &syncState, - ui64 cookie, const TInstant &now, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + ui64 cookie, const TInstant &now, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui32 channel) : TEvVResultBasePB(now, counterPtr, histoPtr, std::move(traceId), channel) { @@ -2700,7 +2700,7 @@ namespace NKikimr { } TEvVSyncFullResult(const NKikimrProto::EReplyStatus status, const TVDiskID &vdisk, ui64 cookie, - const TInstant &now, const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, + const TInstant &now, const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr, const NVDiskMon::TLtcHistoPtr &histoPtr, NWilson::TTraceId traceId, ui32 channel) : TEvVResultBasePB(now, counterPtr, histoPtr, std::move(traceId), channel) { diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_histogram_latency.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_histogram_latency.cpp index abe249a929..8d80758520 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_histogram_latency.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_histogram_latency.cpp @@ -6,7 +6,7 @@ namespace NKikimr { namespace NVDiskMon { TLtcHisto::TLtcHisto( - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TString &name, const TString &value, NPDisk::EDeviceType type) @@ -15,7 +15,7 @@ namespace NKikimr { ThroughputBytes = group->GetCounter("requestBytes", true); // Set up Histo - TIntrusivePtr<NMonitoring::TDynamicCounters> histoGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> histoGroup; histoGroup = group->GetSubgroup("subsystem", "latency_histo"); auto h = NMonitoring::ExplicitHistogram(GetCommonLatencyHistBounds(type)); diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_histogram_latency.h b/ydb/core/blobstorage/vdisk/common/vdisk_histogram_latency.h index 9ed0594e3b..4d83c296a3 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_histogram_latency.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_histogram_latency.h @@ -20,7 +20,7 @@ namespace NKikimr { ///////////////////////////////////////////////////////////////////////////////////////// class TLtcHisto { public: - TLtcHisto(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + TLtcHisto(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TString &name, const TString &value, NPDisk::EDeviceType type); @@ -30,7 +30,7 @@ namespace NKikimr { private: NMonitoring::THistogramPtr Histo; - NMonitoring::TDynamicCounters::TCounterPtr ThroughputBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr ThroughputBytes; }; using TLtcHistoPtr = std::shared_ptr<TLtcHisto>; diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_histograms.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_histograms.cpp index 8ef4f0c700..04a4062379 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_histograms.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_histograms.cpp @@ -4,7 +4,7 @@ namespace NKikimr { namespace NVDiskMon { THistograms::THistograms( - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, NPDisk::EDeviceType type) { for (const auto& item : { diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_histograms.h b/ydb/core/blobstorage/vdisk/common/vdisk_histograms.h index 5dc749481d..32b397bfb4 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_histograms.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_histograms.h @@ -13,7 +13,7 @@ namespace NKikimr { class THistograms { public: THistograms( - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, NPDisk::EDeviceType type); const NVDiskMon::TLtcHistoPtr &GetHistogram(NKikimrBlobStorage::EGetHandleClass handleClass) const; const NVDiskMon::TLtcHistoPtr &GetHistogram(NKikimrBlobStorage::EPutHandleClass handleClass) const; diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_mongroups.h b/ydb/core/blobstorage/vdisk/common/vdisk_mongroups.h index aa1bff8f84..213e057dcc 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_mongroups.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_mongroups.h @@ -9,28 +9,28 @@ namespace NKikimr { class TBase { public: - TBase(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + TBase(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TString& name, const TString& value) : DerivedCounters(counters) , GroupCounters(DerivedCounters->GetSubgroup(name, value)) {} - TIntrusivePtr<NMonitoring::TDynamicCounters> GetGroup() const { return GroupCounters; } + TIntrusivePtr<::NMonitoring::TDynamicCounters> GetGroup() const { return GroupCounters; } protected: - TIntrusivePtr<NMonitoring::TDynamicCounters> DerivedCounters; - TIntrusivePtr<NMonitoring::TDynamicCounters> GroupCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> DerivedCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> GroupCounters; }; #define COUNTER_DEF(name) \ protected: \ - NMonitoring::TDynamicCounters::TCounterPtr name##_; \ + ::NMonitoring::TDynamicCounters::TCounterPtr name##_; \ public: \ NMonitoring::TDeprecatedCounter &name() { return *name##_; } \ const NMonitoring::TDeprecatedCounter &name() const { return *name##_; } \ - const NMonitoring::TDynamicCounters::TCounterPtr &name##Ptr() const { return name##_; } + const ::NMonitoring::TDynamicCounters::TCounterPtr &name##Ptr() const { return name##_; } #define COUNTER_INIT(name, derivative) \ name##_ = GroupCounters->GetCounter(#name, derivative) @@ -40,7 +40,7 @@ public: NMonitoring::TCountableBase::EVisibility::Private) #define GROUP_CONSTRUCTOR(name) \ - name(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, \ + name(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, \ const TString& name, \ const TString& value) \ : TBase(counters, name, value) @@ -339,8 +339,8 @@ public: // TVDiskStateGroup /////////////////////////////////////////////////////////////////////////////////// class TVDiskStateGroup: public TBase { - std::array<NMonitoring::TDynamicCounters::TCounterPtr, NKikimrWhiteboard::EVDiskState_MAX + 1> VDiskStates; - NMonitoring::TDynamicCounters::TCounterPtr CurrentState; + std::array<::NMonitoring::TDynamicCounters::TCounterPtr, NKikimrWhiteboard::EVDiskState_MAX + 1> VDiskStates; + ::NMonitoring::TDynamicCounters::TCounterPtr CurrentState; public: GROUP_CONSTRUCTOR(TVDiskStateGroup) @@ -397,7 +397,7 @@ public: /////////////////////////////////////////////////////////////////////////////////// class TLsmAllLevelsStat { public: - TIntrusivePtr<NMonitoring::TDynamicCounters> Group; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Group; // per-level information TLsmLevelGroup Level0; TLsmLevelGroup Level1to8; @@ -405,7 +405,7 @@ public: TLsmLevelGroup Level17; TLsmLevelGroup Level18; - TLsmAllLevelsStat(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) + TLsmAllLevelsStat(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) : Group(counters->GetSubgroup("subsystem", "levels")) , Level0(Group, "level", "0") , Level1to8(Group, "level", "1..8") diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_private_events.h b/ydb/core/blobstorage/vdisk/common/vdisk_private_events.h index 7a1f864783..840f5f7da1 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_private_events.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_private_events.h @@ -61,7 +61,7 @@ namespace NKikimr { const ui64 OrderId; TEvDelLogoBlobDataSyncLogResult(ui64 orderId, const TInstant &now, - NMonitoring::TDynamicCounters::TCounterPtr counterPtr, NVDiskMon::TLtcHistoPtr histoPtr, + ::NMonitoring::TDynamicCounters::TCounterPtr counterPtr, NVDiskMon::TLtcHistoPtr histoPtr, NWilson::TTraceId traceId) : TEvVResultBase(now, TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, counterPtr, histoPtr, std::move(traceId)) diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_queues.h b/ydb/core/blobstorage/vdisk/common/vdisk_queues.h index 9deed7fb43..27701db797 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_queues.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_queues.h @@ -48,7 +48,7 @@ namespace NKikimr { void CreateQueuesForVDisks(TContainer &cont, const TActorId &parent, const TIntrusivePtr<NKikimr::TBlobStorageGroupInfo> &gInfo, const TIntrusivePtr<TVDiskContext> &vCtx, const TVDiskContainer &disks, - const TIntrusivePtr<NMonitoring::TDynamicCounters> &groupCounters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters> &groupCounters, const NBackpressure::TQueueClientId &queueClientId, NKikimrBlobStorage::EVDiskQueueId vDiskQueueId, const TString &queueName, TInterconnectChannels::EInterconnectChannels interconnectChannel, TWrapper wrapper = {}) diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_recoverylogwriter.cpp b/ydb/core/blobstorage/vdisk/common/vdisk_recoverylogwriter.cpp index f0ec9c15e4..4c45562f66 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_recoverylogwriter.cpp +++ b/ydb/core/blobstorage/vdisk/common/vdisk_recoverylogwriter.cpp @@ -18,15 +18,15 @@ LWTRACE_USING(BLOBSTORAGE_PROVIDER); //////////////////////////////////////////////////////////////////////////// struct TCounters { struct TItem { - NMonitoring::TDynamicCounters::TCounterPtr Msgs; - NMonitoring::TDynamicCounters::TCounterPtr Bytes; + ::NMonitoring::TDynamicCounters::TCounterPtr Msgs; + ::NMonitoring::TDynamicCounters::TCounterPtr Bytes; TItem() : Msgs() , Bytes() {} - TItem(const TString &prefix, const TString& name, TIntrusivePtr<NMonitoring::TDynamicCounters> mon) { + TItem(const TString &prefix, const TString& name, TIntrusivePtr<::NMonitoring::TDynamicCounters> mon) { Msgs = mon->GetCounter(prefix + name + "Msgs", true); Bytes = mon->GetCounter(prefix + name + "Bytes", true); } @@ -39,7 +39,7 @@ LWTRACE_USING(BLOBSTORAGE_PROVIDER); TVector<TItem> Counters; - TCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> mon) { + TCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> mon) { auto group = mon->GetSubgroup("subsystem", "logrecs"); Counters.reserve(static_cast<size_t>(TLogSignature::Max)); TString prefix("Log"); @@ -91,7 +91,7 @@ LWTRACE_USING(BLOBSTORAGE_PROVIDER); const NPDisk::TOwnerRound OwnerRound; ui64 CurSentLsn = 0; TQueueType Queue; - NMonitoring::TDynamicCounters::TCounterPtr LsmLogBytesWritten; + ::NMonitoring::TDynamicCounters::TCounterPtr LsmLogBytesWritten; TCounters Counters; friend class TActorBootstrapped<TRecoveryLogWriter>; @@ -208,7 +208,7 @@ LWTRACE_USING(BLOBSTORAGE_PROVIDER); TRecoveryLogWriter(const TActorId &yardID, const TActorId &skeletonID, NPDisk::TOwner owner, NPDisk::TOwnerRound ownerRound, ui64 startLsn, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) : TActorBootstrapped<TRecoveryLogWriter>() , YardID(yardID) , SkeletonID(skeletonID) @@ -223,7 +223,7 @@ LWTRACE_USING(BLOBSTORAGE_PROVIDER); IActor* CreateRecoveryLogWriter(const TActorId &yardID, const TActorId &skeletonID, NPDisk::TOwner owner, NPDisk::TOwnerRound ownerRound, - ui64 startLsn, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { + ui64 startLsn, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { return new TRecoveryLogWriter(yardID, skeletonID, owner, ownerRound, startLsn, counters); } diff --git a/ydb/core/blobstorage/vdisk/common/vdisk_recoverylogwriter.h b/ydb/core/blobstorage/vdisk/common/vdisk_recoverylogwriter.h index c38ff753d4..37aad013be 100644 --- a/ydb/core/blobstorage/vdisk/common/vdisk_recoverylogwriter.h +++ b/ydb/core/blobstorage/vdisk/common/vdisk_recoverylogwriter.h @@ -8,6 +8,6 @@ namespace NKikimr { // Writing via LogWriter makes proper ordering of Lsns IActor* CreateRecoveryLogWriter(const TActorId &yardID, const TActorId &skeletonID, NPDisk::TOwner owner, NPDisk::TOwnerRound ownerRound, - ui64 startLsn, TIntrusivePtr<NMonitoring::TDynamicCounters> counters); + ui64 startLsn, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters); } // NKikimr diff --git a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge_ut.cpp b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge_ut.cpp index 451792bb26..6e223e2451 100644 --- a/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge_ut.cpp +++ b/ydb/core/blobstorage/vdisk/huge/blobstorage_hullhuge_ut.cpp @@ -25,7 +25,7 @@ namespace NKikimr { bool oldMapCompatible = false; auto logf = [] (const TString &state) { STR << state; }; - auto counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + auto counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto info = MakeIntrusive<TBlobStorageGroupInfo>(TBlobStorageGroupType::Erasure4Plus2Block); auto vctx = MakeIntrusive<TVDiskContext>(TActorId(), info->PickTopology(), counters, TVDiskID(0, 1, 0, 0, 0), nullptr, NPDisk::DEVICE_TYPE_UNKNOWN); diff --git a/ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h b/ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h index 5a1367202d..d242dc312b 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h +++ b/ydb/core/blobstorage/vdisk/hulldb/base/hullds_ut.h @@ -12,7 +12,7 @@ namespace NKikimr { : ChunkSize(chunkSize) , CompWorthReadSize(compWorthReadSize) , GroupInfo(TBlobStorageGroupType::ErasureMirror3, 2, 4) - , VCtx(new TVDiskContext(TActorId(), GroupInfo.PickTopology(), new NMonitoring::TDynamicCounters(), + , VCtx(new TVDiskContext(TActorId(), GroupInfo.PickTopology(), new ::NMonitoring::TDynamicCounters(), TVDiskID(), nullptr, NPDisk::DEVICE_TYPE_UNKNOWN)) , HullCtx( new THullCtx( diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix.h b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix.h index a4da075ad4..b4e57cf46f 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix.h +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix.h @@ -83,7 +83,7 @@ namespace NKikimr { return sizeof(TRecord) * SortedRecs.size(); } - NMonitoring::TDynamicCounters::TCounterPtr GetCounter() const { + ::NMonitoring::TDynamicCounters::TCounterPtr GetCounter() const { return MemConsumed.GetCounter(); } diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix_ut.cpp index 144cc818c6..9ab7c164dc 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix_ut.cpp @@ -11,7 +11,7 @@ namespace NKikimr { Y_UNIT_TEST_SUITE(TFreshAppendixTest) { - static NMonitoring::TDynamicCounters DynCounters; + static ::NMonitoring::TDynamicCounters DynCounters; std::shared_ptr<TFreshAppendix<int, int>> CreateAppendix(const TVector<int> &v) { auto group = DynCounters.GetSubgroup("subsystem", "memhull"); diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_data_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_data_ut.cpp index 061f2b71ed..b449c40812 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_data_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_data_ut.cpp @@ -305,7 +305,7 @@ namespace NKikimr { struct TCreateAppendixCtx { - NMonitoring::TDynamicCounters DynCounters; + ::NMonitoring::TDynamicCounters DynCounters; TMemoryConsumer MemConsumer; TMemRecLogoBlob MemRec; diff --git a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_ut.cpp index d634bfd707..8b10a88c52 100644 --- a/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_ut.cpp +++ b/ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_ut.cpp @@ -128,7 +128,7 @@ namespace NKikimr { const ui32 From = 2; const ui32 To = 6; const ui32 InsertsThreshold = 1000; - NMonitoring::TDynamicCounters DynCounters; + ::NMonitoring::TDynamicCounters DynCounters; TMemoryConsumer MemConsumer; ui64 *LsnCounter = nullptr; ui32 Part = 0; diff --git a/ydb/core/blobstorage/vdisk/repl/blobstorage_hullreplwritesst_ut.cpp b/ydb/core/blobstorage/vdisk/repl/blobstorage_hullreplwritesst_ut.cpp index 30db44ff22..3cac7e6ff2 100644 --- a/ydb/core/blobstorage/vdisk/repl/blobstorage_hullreplwritesst_ut.cpp +++ b/ydb/core/blobstorage/vdisk/repl/blobstorage_hullreplwritesst_ut.cpp @@ -11,7 +11,7 @@ std::shared_ptr<TReplCtx> CreateReplCtx(TVector<TVDiskID>& vdisks, const TIntrus auto baseInfo = TVDiskConfig::TBaseInfo::SampleForTests(); baseInfo.VDiskIdShort = TVDiskIdShort(vdisks[0]); auto vdiskCfg = MakeIntrusive<TVDiskConfig>(baseInfo); - auto counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + auto counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto vctx = MakeIntrusive<TVDiskContext>(TActorId(), info->PickTopology(), counters, TVDiskID(0, 1, 0, 0, 0), nullptr, NPDisk::DEVICE_TYPE_UNKNOWN); auto hugeBlobCtx = std::make_shared<THugeBlobCtx>(512u << 10u, nullptr); @@ -30,7 +30,7 @@ std::shared_ptr<TReplCtx> CreateReplCtx(TVector<TVDiskID>& vdisks, const TIntrus } TVDiskContextPtr CreateVDiskContext(const TBlobStorageGroupInfo& info) { - return MakeIntrusive<TVDiskContext>(TActorId(), info.PickTopology(), new NMonitoring::TDynamicCounters(), TVDiskID(), + return MakeIntrusive<TVDiskContext>(TActorId(), info.PickTopology(), new ::NMonitoring::TDynamicCounters(), TVDiskID(), nullptr, NPDisk::DEVICE_TYPE_UNKNOWN); } diff --git a/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine_ut.cpp b/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine_ut.cpp index df26bf2c32..02e8a07789 100644 --- a/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine_ut.cpp +++ b/ydb/core/blobstorage/vdisk/repl/blobstorage_replrecoverymachine_ut.cpp @@ -63,7 +63,7 @@ namespace NKikimr { auto baseInfo = TVDiskConfig::TBaseInfo::SampleForTests(); baseInfo.VDiskIdShort = TVDiskIdShort(vdisks[0]); auto vdiskCfg = MakeIntrusive<TVDiskConfig>(baseInfo); - auto counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + auto counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto vctx = MakeIntrusive<TVDiskContext>(TActorId(), info->PickTopology(), counters, TVDiskID(0, 1, 0, 0, 0), nullptr, NPDisk::DEVICE_TYPE_UNKNOWN); auto hugeBlobCtx = std::make_shared<THugeBlobCtx>(512u << 10u, nullptr); diff --git a/ydb/core/blobstorage/vdisk/scrub/blob_recovery.cpp b/ydb/core/blobstorage/vdisk/scrub/blob_recovery.cpp index b611d3c9cb..c4650cffc9 100644 --- a/ydb/core/blobstorage/vdisk/scrub/blob_recovery.cpp +++ b/ydb/core/blobstorage/vdisk/scrub/blob_recovery.cpp @@ -14,7 +14,7 @@ namespace NKikimr { } IActor *CreateBlobRecoveryActor(TIntrusivePtr<TVDiskContext> vctx, TIntrusivePtr<TBlobStorageGroupInfo> info, - NMonitoring::TDynamicCounterPtr counters) { + ::NMonitoring::TDynamicCounterPtr counters) { return new TBlobRecoveryActor(std::move(vctx), std::move(info), std::move(counters)); } diff --git a/ydb/core/blobstorage/vdisk/scrub/blob_recovery.h b/ydb/core/blobstorage/vdisk/scrub/blob_recovery.h index 98c7fbab19..2a06f7df1a 100644 --- a/ydb/core/blobstorage/vdisk/scrub/blob_recovery.h +++ b/ydb/core/blobstorage/vdisk/scrub/blob_recovery.h @@ -94,6 +94,6 @@ namespace NKikimr { }; IActor *CreateBlobRecoveryActor(TIntrusivePtr<TVDiskContext> vctx, TIntrusivePtr<TBlobStorageGroupInfo> info, - NMonitoring::TDynamicCounterPtr counters); + ::NMonitoring::TDynamicCounterPtr counters); } // NKikimr diff --git a/ydb/core/blobstorage/vdisk/scrub/blob_recovery_impl.h b/ydb/core/blobstorage/vdisk/scrub/blob_recovery_impl.h index cca66554af..0e9022168f 100644 --- a/ydb/core/blobstorage/vdisk/scrub/blob_recovery_impl.h +++ b/ydb/core/blobstorage/vdisk/scrub/blob_recovery_impl.h @@ -8,12 +8,12 @@ namespace NKikimr { class TBlobRecoveryActor : public TActorBootstrapped<TBlobRecoveryActor> { const TIntrusivePtr<TVDiskContext> VCtx; TIntrusivePtr<TBlobStorageGroupInfo> Info; - const NMonitoring::TDynamicCounterPtr Counters; + const ::NMonitoring::TDynamicCounterPtr Counters; const TString LogPrefix; public: TBlobRecoveryActor(TIntrusivePtr<TVDiskContext> vctx, TIntrusivePtr<TBlobStorageGroupInfo> info, - NMonitoring::TDynamicCounterPtr counters) + ::NMonitoring::TDynamicCounterPtr counters) : VCtx(std::move(vctx)) , Info(std::move(info)) , Counters(counters) diff --git a/ydb/core/blobstorage/vdisk/scrub/scrub_actor_impl.h b/ydb/core/blobstorage/vdisk/scrub/scrub_actor_impl.h index 7af6d264f6..7f5e3ed298 100644 --- a/ydb/core/blobstorage/vdisk/scrub/scrub_actor_impl.h +++ b/ydb/core/blobstorage/vdisk/scrub/scrub_actor_impl.h @@ -23,16 +23,16 @@ namespace NKikimr { std::optional<NKikimrVDiskData::TScrubState> State; - NMonitoring::TDynamicCounterPtr Counters; - NMonitoring::TDynamicCounters::TCounterPtr SstProcessed; - NMonitoring::TDynamicCounters::TCounterPtr HugeBlobsRead; - NMonitoring::TDynamicCounters::TCounterPtr HugeBlobBytesRead; - NMonitoring::TDynamicCounters::TCounterPtr SmallBlobIntervalsRead; - NMonitoring::TDynamicCounters::TCounterPtr SmallBlobIntervalBytesRead; - NMonitoring::TDynamicCounters::TCounterPtr SmallBlobsRead; - NMonitoring::TDynamicCounters::TCounterPtr SmallBlobBytesRead; - NMonitoring::TDynamicCounters::TCounterPtr UnreadableBlobsFound; - NMonitoring::TDynamicCounters::TCounterPtr BlobsFixed; + ::NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounters::TCounterPtr SstProcessed; + ::NMonitoring::TDynamicCounters::TCounterPtr HugeBlobsRead; + ::NMonitoring::TDynamicCounters::TCounterPtr HugeBlobBytesRead; + ::NMonitoring::TDynamicCounters::TCounterPtr SmallBlobIntervalsRead; + ::NMonitoring::TDynamicCounters::TCounterPtr SmallBlobIntervalBytesRead; + ::NMonitoring::TDynamicCounters::TCounterPtr SmallBlobsRead; + ::NMonitoring::TDynamicCounters::TCounterPtr SmallBlobBytesRead; + ::NMonitoring::TDynamicCounters::TCounterPtr UnreadableBlobsFound; + ::NMonitoring::TDynamicCounters::TCounterPtr BlobsFixed; TRopeArena Arena; diff --git a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp index e89088f086..d01cdc03c2 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp @@ -175,7 +175,7 @@ namespace NKikimr { void UpdateVPatchCtx() { if (!VPatchCtx) { - TIntrusivePtr<NMonitoring::TDynamicCounters> patchGroup = VCtx->VDiskCounters->GetSubgroup("subsystem", "patch"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> patchGroup = VCtx->VDiskCounters->GetSubgroup("subsystem", "patch"); VPatchCtx = MakeIntrusive<TVPatchCtx>(); NBackpressure::TQueueClientId patchQueueClientId(NBackpressure::EQueueClientType::VPatch, VCtx->Top->GetOrderNumber(VCtx->ShortSelfVDisk)); diff --git a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonerr.h b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonerr.h index 7e899b3236..bd98ea87bd 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonerr.h +++ b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonerr.h @@ -17,61 +17,61 @@ namespace NKikimr { // ResultingCounterForEvent -- returns dynamic counter *ResMsgs for an event //////////////////////////////////////////////////////////////////////////////////////////// template <class TEvent> - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &, TEvent &) { - static NMonitoring::TDynamicCounters::TCounterPtr dummy; + static ::NMonitoring::TDynamicCounters::TCounterPtr dummy; return dummy; } template <> - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVPut::TPtr &) { return vctx->IFaceMonGroup->PutResMsgsPtr(); } template <> - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVMultiPut::TPtr &) { return vctx->IFaceMonGroup->MultiPutResMsgsPtr(); } template <> - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVGet::TPtr &) { return vctx->IFaceMonGroup->GetResMsgsPtr(); } - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVBlock::TPtr &) { return vctx->IFaceMonGroup->BlockResMsgsPtr(); } - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVCollectGarbage::TPtr &) { return vctx->IFaceMonGroup->GCResMsgsPtr(); } - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVGetBarrier::TPtr &) { return vctx->IFaceMonGroup->GetBarrierResMsgsPtr(); } - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVMovedPatch::TPtr &) { return vctx->IFaceMonGroup->MovedPatchMsgsPtr(); } - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVPatchFoundParts::TPtr &) { return vctx->IFaceMonGroup->PatchFoundPartsMsgsPtr(); } - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVPatchXorDiffResult::TPtr &) { return vctx->IFaceMonGroup->PatchXorDiffResMsgsPtr(); } - inline const NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, + inline const ::NMonitoring::TDynamicCounters::TCounterPtr &ResultingCounterForEvent(const TVDiskContextPtr &vctx, TEvBlobStorage::TEvVPatchResult::TPtr &) { return vctx->IFaceMonGroup->PatchResMsgsPtr(); } @@ -107,7 +107,7 @@ namespace NKikimr { cookie = record.GetCookie(); } const auto oosStatus = vctx->GetOutOfSpaceState().GetGlobalStatusFlags(); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); return std::make_unique<TEvBlobStorage::TEvVMovedPatchResult>(status, originalId, patchedId, vdiskID, cookie, oosStatus, now, ev->Get()->GetCachedByteSize(), &record, skeletonFrontIDPtr, counterPtr, nullptr, @@ -125,7 +125,7 @@ namespace NKikimr { if (record.HasCookie()) { cookie = record.GetCookie(); } - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); return std::make_unique<TEvBlobStorage::TEvVPatchFoundParts>(status, originalId, patchedId, vdiskID, cookie, now, errorReason, &record, skeletonFrontIDPtr, counterPtr, nullptr, std::move(ev->TraceId), vdiskIncarnationGuid); @@ -143,7 +143,7 @@ namespace NKikimr { if (record.HasCookie()) { cookie = record.GetCookie(); } - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); auto res = std::make_unique<TEvBlobStorage::TEvVPatchResult>(status, originalId, patchedId, vdiskID, cookie, now, &record, skeletonFrontIDPtr, counterPtr, nullptr, std::move(ev->TraceId), vdiskIncarnationGuid); @@ -158,7 +158,7 @@ namespace NKikimr { Y_UNUSED(errorReason, vdiskID, vdiskIncarnationGuid); auto &record = ev->Get()->Record; - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); return std::make_unique<TEvBlobStorage::TEvVPatchXorDiffResult>(status, now, &record, skeletonFrontIDPtr, counterPtr, nullptr, std::move(ev->TraceId)); } @@ -176,7 +176,7 @@ namespace NKikimr { const auto oosStatus = vctx->GetOutOfSpaceState().GetGlobalStatusFlags(); const auto handleClass = record.GetHandleClass(); const NVDiskMon::TLtcHistoPtr &histoPtr = vctx->Histograms.GetHistogram(handleClass); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); return std::make_unique<TEvBlobStorage::TEvVPutResult>(status, id, vdiskID, cookie, oosStatus, now, ev->Get()->GetCachedByteSize(), &record, skeletonFrontIDPtr, counterPtr, histoPtr, @@ -189,7 +189,7 @@ namespace NKikimr { TEvBlobStorage::TEvVBlock::TPtr &ev, const TInstant &now, const TActorIDPtr &skeletonFrontIDPtr, const TVDiskID &vdiskID, ui64 vdiskIncarnationGuid) { - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); return std::make_unique<TEvBlobStorage::TEvVBlockResult>(status, actual, vdiskID, now, ev->Get()->GetCachedByteSize(), &ev->Get()->Record, skeletonFrontIDPtr, counterPtr, nullptr, std::move(ev->TraceId), vdiskIncarnationGuid); @@ -204,7 +204,7 @@ namespace NKikimr { const auto tabletId = record.GetTabletId(); const auto gen = record.GetRecordGeneration(); const auto channel = record.GetChannel(); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); return std::make_unique<TEvBlobStorage::TEvVCollectGarbageResult>(status, tabletId, gen, channel, vdiskID, now, ev->Get()->GetCachedByteSize(), &record, skeletonFrontIDPtr, counterPtr, nullptr, std::move(ev->TraceId), vdiskIncarnationGuid); @@ -269,7 +269,7 @@ namespace NKikimr { const ui64 bufferSizeBytes = ev->Get()->GetBufferBytes(); const auto handleClass = record.GetHandleClass(); const NVDiskMon::TLtcHistoPtr &histoPtr = vctx->Histograms.GetHistogram(handleClass); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); auto result = std::make_unique<TEvBlobStorage::TEvVMultiPutResult>(status, vdiskID, cookie, now, ev->Get()->GetCachedByteSize(), &record, skeletonFrontIDPtr, counterPtr, histoPtr, bufferSizeBytes, std::move(ev->TraceId), vdiskIncarnationGuid, errorReason); @@ -314,7 +314,7 @@ namespace NKikimr { cookie = record.GetCookie(); const auto handleClass = record.GetHandleClass(); const NVDiskMon::TLtcHistoPtr &histoPtr = vctx->Histograms.GetHistogram(handleClass); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); auto result = std::make_unique<TEvBlobStorage::TEvVGetResult>(status, vdiskID, now, ev->Get()->GetCachedByteSize(), &record, skeletonFrontIDPtr, counterPtr, histoPtr, std::move(ev->TraceId), cookie, ev->GetChannel(), vdiskIncarnationGuid); @@ -357,7 +357,7 @@ namespace NKikimr { const TIntrusivePtr<TBlobStorageGroupInfo>& groupInfo) { Y_UNUSED(vdiskIncarnationGuid); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); auto result = std::make_unique<TEvBlobStorage::TEvVGetBlockResult>(status, ev->Get()->Record.GetTabletId(), vdiskID, now, ev->Get()->GetCachedByteSize(), &ev->Get()->Record, skeletonFrontIDPtr, counterPtr, nullptr, std::move(ev->TraceId)); @@ -384,7 +384,7 @@ namespace NKikimr { const TIntrusivePtr<TBlobStorageGroupInfo>& groupInfo) { Y_UNUSED(vdiskIncarnationGuid); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); auto result = std::make_unique<TEvBlobStorage::TEvVGetBarrierResult>(status,vdiskID, now, ev->Get()->GetCachedByteSize(), &ev->Get()->Record, skeletonFrontIDPtr, counterPtr, nullptr, std::move(ev->TraceId)); @@ -399,7 +399,7 @@ namespace NKikimr { const TIntrusivePtr<TBlobStorageGroupInfo>& /*groupInfo*/) { Y_UNUSED(vdiskIncarnationGuid); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); return std::make_unique<TEvBlobStorage::TEvVDbStatResult>(status, vdiskID, now, counterPtr, nullptr, std::move(ev->TraceId)); } @@ -411,7 +411,7 @@ namespace NKikimr { const TIntrusivePtr<TBlobStorageGroupInfo>& /*groupInfo*/) { Y_UNUSED(vdiskIncarnationGuid); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); auto flags = vctx->GetOutOfSpaceState().GetLocalStatusFlags(); return std::make_unique<TEvBlobStorage::TEvVSyncResult>(status, vdiskID, flags, now, counterPtr, nullptr, std::move(ev->TraceId), ev->GetChannel()); @@ -424,7 +424,7 @@ namespace NKikimr { const TIntrusivePtr<TBlobStorageGroupInfo>& /*groupInfo*/) { Y_UNUSED(vdiskIncarnationGuid); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); ui64 cookie = ev->Get()->Record.GetCookie(); return std::make_unique<TEvBlobStorage::TEvVSyncFullResult>(status, vdiskID, cookie, now, counterPtr, nullptr, std::move(ev->TraceId), ev->GetChannel()); @@ -437,7 +437,7 @@ namespace NKikimr { const TIntrusivePtr<TBlobStorageGroupInfo>& /*groupInfo*/) { Y_UNUSED(vdiskIncarnationGuid); - const NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); + const ::NMonitoring::TDynamicCounters::TCounterPtr &counterPtr = ResultingCounterForEvent(vctx, ev); return std::make_unique<TEvBlobStorage::TEvVSyncGuidResult>(status, vdiskID, now, counterPtr, nullptr, std::move(ev->TraceId), ev->GetChannel()); } diff --git a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp index dfaff28696..d555b6f917 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.cpp @@ -150,12 +150,12 @@ namespace NKikimr { const TString Name; private: - NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontInFlightCount; - NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontInFlightCost; - NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontInFlightBytes; - NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontDelayedCount; - NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontDelayedBytes; - NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontCostProcessed; + ::NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontInFlightCount; + ::NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontInFlightCost; + ::NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontInFlightBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontDelayedCount; + ::NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontDelayedBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontCostProcessed; bool CanSendToSkeleton(ui64 cost) const { bool inFlightCond = InFlightCount < MaxInFlightCount; @@ -170,7 +170,7 @@ namespace NKikimr { const TString &name, ui64 maxInFlightCount, ui64 maxInFlightCost, - TIntrusivePtr<NMonitoring::TDynamicCounters> skeletonFrontGroup) + TIntrusivePtr<::NMonitoring::TDynamicCounters> skeletonFrontGroup) : Queue(new TQueueType()) , InFlightCount(0) , InFlightCost(0) @@ -399,9 +399,9 @@ namespace NKikimr { std::unique_ptr<TMyQueueBackpressure> QueueBackpressure; NKikimrBlobStorage::EVDiskQueueId ExtQueueId; TString Name; - NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontDeadline; - NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontOverflow; - NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontIncorrectMsgId; + ::NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontDeadline; + ::NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontOverflow; + ::NMonitoring::TDynamicCounters::TCounterPtr SkeletonFrontIncorrectMsgId; void NotifyOtherClients(const TActorContext &ctx, const TFeedback &feedback) { @@ -422,7 +422,7 @@ namespace NKikimr { public: TExtQueueClass(NKikimrBlobStorage::EVDiskQueueId extQueueId, const TString &name, ui64 totalCost, - bool checkMsgId, TIntrusivePtr<NMonitoring::TDynamicCounters> skeletonFrontGroup, + bool checkMsgId, TIntrusivePtr<::NMonitoring::TDynamicCounters> skeletonFrontGroup, const TIntrusivePtr<TVDiskConfig>& config) : QueueBackpressure() , ExtQueueId(extQueueId) @@ -588,9 +588,9 @@ namespace NKikimr { std::shared_ptr<TBlobStorageGroupInfo::TTopology> Top; TVDiskID SelfVDiskId; TActorId SkeletonId; - TIntrusivePtr<NMonitoring::TDynamicCounters> VDiskCounters; - TIntrusivePtr<NMonitoring::TDynamicCounters> SkeletonFrontGroup; - NMonitoring::TDynamicCounters::TCounterPtr AccessDeniedMessages; + TIntrusivePtr<::NMonitoring::TDynamicCounters> VDiskCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> SkeletonFrontGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr AccessDeniedMessages; std::unique_ptr<TIntQueueClass> IntQueueAsyncGets; std::unique_ptr<TIntQueueClass> IntQueueFastGets; std::unique_ptr<TIntQueueClass> IntQueueDiscover; @@ -1801,10 +1801,10 @@ namespace NKikimr { return NKikimrServices::TActivity::BS_SKELETON_FRONT; } - static TIntrusivePtr<NMonitoring::TDynamicCounters> CreateVDiskCounters( + static TIntrusivePtr<::NMonitoring::TDynamicCounters> CreateVDiskCounters( TIntrusivePtr<TVDiskConfig> cfg, TIntrusivePtr<TBlobStorageGroupInfo> info, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { // create 'vdisks' service counters auto vdiskCounters = GetServiceCounters(counters, "vdisks"); @@ -1832,7 +1832,7 @@ namespace NKikimr { } TSkeletonFront(TIntrusivePtr<TVDiskConfig> cfg, TIntrusivePtr<TBlobStorageGroupInfo> info, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) : TActorBootstrapped<TSkeletonFront>() , VCtx() , Config(cfg) @@ -1901,7 +1901,7 @@ namespace NKikimr { //////////////////////////////////////////////////////////////////////////// IActor* CreateVDiskSkeletonFront(const TIntrusivePtr<TVDiskConfig> &cfg, const TIntrusivePtr<TBlobStorageGroupInfo> &info, - const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters) { + const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters) { return new TSkeletonFront(cfg, info, counters); } diff --git a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.h b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.h index 9044230ab1..b5ef914ef0 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.h +++ b/ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeletonfront.h @@ -39,6 +39,6 @@ namespace NKikimr { struct TVDiskConfig; IActor* CreateVDiskSkeletonFront(const TIntrusivePtr<TVDiskConfig> &cfg, const TIntrusivePtr<TBlobStorageGroupInfo> &info, - const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters); } // NKikimr diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmovedpatch_actor.cpp b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmovedpatch_actor.cpp index 78870536aa..34bc4abbc8 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmovedpatch_actor.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmovedpatch_actor.cpp @@ -23,7 +23,7 @@ namespace NKikimr { std::unique_ptr<TEvBlobStorage::TEvPatch::TDiff[]> Diffs; TActorIDPtr SkeletonFrontIDPtr; - NMonitoring::TDynamicCounters::TCounterPtr MovedPatchResMsgsPtr; + ::NMonitoring::TDynamicCounters::TCounterPtr MovedPatchResMsgsPtr; TEvBlobStorage::TEvVMovedPatch::TPtr Event; TActorId LeaderId; @@ -39,7 +39,7 @@ namespace NKikimr { public: TVMovedPatchActor(TActorId leaderId, TOutOfSpaceStatus oosStatus, TEvBlobStorage::TEvVMovedPatch::TPtr &ev, - TActorIDPtr skeletonFrontIDPtr, NMonitoring::TDynamicCounters::TCounterPtr movedPatchResMsgsPtr, + TActorIDPtr skeletonFrontIDPtr, ::NMonitoring::TDynamicCounters::TCounterPtr movedPatchResMsgsPtr, ui64 incarnationGuid, const TVDiskContextPtr &vCtx) : TActorBootstrapped() , SkeletonFrontIDPtr(skeletonFrontIDPtr) @@ -198,7 +198,7 @@ namespace NKikimr { IActor* CreateSkeletonVMovedPatchActor(TActorId leaderId, TOutOfSpaceStatus oosStatus, TEvBlobStorage::TEvVMovedPatch::TPtr &ev, TActorIDPtr skeletonFrontIDPtr, - NMonitoring::TDynamicCounters::TCounterPtr counterPtr, ui64 incarnationGuid, + ::NMonitoring::TDynamicCounters::TCounterPtr counterPtr, ui64 incarnationGuid, const TVDiskContextPtr &vCtx) { return new NPrivate::TVMovedPatchActor(leaderId, oosStatus, ev, skeletonFrontIDPtr, diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmovedpatch_actor.h b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmovedpatch_actor.h index 91f8109385..01e185f8dd 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmovedpatch_actor.h +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmovedpatch_actor.h @@ -8,7 +8,7 @@ namespace NKikimr { IActor* CreateSkeletonVMovedPatchActor(TActorId leaderId, TOutOfSpaceStatus oosStatus, TEvBlobStorage::TEvVMovedPatch::TPtr &ev, TActorIDPtr skeletonFrontIDPtr, - NMonitoring::TDynamicCounters::TCounterPtr multiPutResMsgsPtr, + ::NMonitoring::TDynamicCounters::TCounterPtr multiPutResMsgsPtr, ui64 incarnationGuid, const TVDiskContextPtr &vCtx); } // NKikimr diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmultiput_actor.cpp b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmultiput_actor.cpp index bbea6637af..581103f602 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmultiput_actor.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmultiput_actor.cpp @@ -35,7 +35,7 @@ namespace NKikimr { TBatchedVec<TItem> Items; ui64 ReceivedResults; TActorIDPtr SkeletonFrontIDPtr; - NMonitoring::TDynamicCounters::TCounterPtr MultiPutResMsgsPtr; + ::NMonitoring::TDynamicCounters::TCounterPtr MultiPutResMsgsPtr; TEvBlobStorage::TEvVMultiPut::TPtr Event; TActorId LeaderId; @@ -46,7 +46,7 @@ namespace NKikimr { public: TBufferVMultiPutActor(TActorId leaderId, const TBatchedVec<NKikimrProto::EReplyStatus> &statuses, TOutOfSpaceStatus oosStatus, TEvBlobStorage::TEvVMultiPut::TPtr &ev, - TActorIDPtr skeletonFrontIDPtr, NMonitoring::TDynamicCounters::TCounterPtr multiPutResMsgsPtr, + TActorIDPtr skeletonFrontIDPtr, ::NMonitoring::TDynamicCounters::TCounterPtr multiPutResMsgsPtr, ui64 incarnationGuid) : TActorBootstrapped() , Items(ev->Get()->Record.ItemsSize()) @@ -174,7 +174,7 @@ namespace NKikimr { IActor* CreateSkeletonVMultiPutActor(TActorId leaderId, const TBatchedVec<NKikimrProto::EReplyStatus> &statuses, TOutOfSpaceStatus oosStatus, TEvBlobStorage::TEvVMultiPut::TPtr &ev, - TActorIDPtr skeletonFrontIDPtr, NMonitoring::TDynamicCounters::TCounterPtr counterPtr, + TActorIDPtr skeletonFrontIDPtr, ::NMonitoring::TDynamicCounters::TCounterPtr counterPtr, ui64 incarnationGuid) { return new NPrivate::TBufferVMultiPutActor(leaderId, statuses, oosStatus, ev, skeletonFrontIDPtr, counterPtr, incarnationGuid); diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmultiput_actor.h b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmultiput_actor.h index 1eebe00456..18d01db17e 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmultiput_actor.h +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vmultiput_actor.h @@ -25,7 +25,7 @@ struct TEvVMultiPutItemResult : TEventLocal<TEvVMultiPutItemResult, TEvBlobStora IActor* CreateSkeletonVMultiPutActor(TActorId leaderId, const TBatchedVec<NKikimrProto::EReplyStatus> &statuses, TOutOfSpaceStatus oosStatus, TEvBlobStorage::TEvVMultiPut::TPtr &ev, - TActorIDPtr skeletonFrontIDPtr, NMonitoring::TDynamicCounters::TCounterPtr multiPutResMsgsPtr, + TActorIDPtr skeletonFrontIDPtr, ::NMonitoring::TDynamicCounters::TCounterPtr multiPutResMsgsPtr, ui64 incarnationGuid); } // NKikimr diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.cpp b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.cpp index 0e1f8eb796..4fd96a584e 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.cpp +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.cpp @@ -90,8 +90,8 @@ namespace NKikimr::NPrivate { TActorId Sender; ui64 Cookie; TActorIDPtr SkeletonFrontIDPtr; - NMonitoring::TDynamicCounters::TCounterPtr VPatchFoundPartsMsgsPtr; - NMonitoring::TDynamicCounters::TCounterPtr VPatchResMsgsPtr; + ::NMonitoring::TDynamicCounters::TCounterPtr VPatchFoundPartsMsgsPtr; + ::NMonitoring::TDynamicCounters::TCounterPtr VPatchResMsgsPtr; const TIntrusivePtr<TVPatchCtx> VPatchCtx; TString VDiskLogPrefix; @@ -119,8 +119,8 @@ namespace NKikimr::NPrivate { public: TSkeletonVPatchActor(TActorId leaderId, const TBlobStorageGroupType &gType, TEvBlobStorage::TEvVPatchStart::TPtr &ev, TInstant now, TActorIDPtr skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &vPatchFoundPartsMsgsPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &vPatchResMsgsPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &vPatchFoundPartsMsgsPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &vPatchResMsgsPtr, const TIntrusivePtr<TVPatchCtx> &vPatchCtx, const TString &vDiskLogPrefix, ui64 incarnationGuid) : TActorBootstrapped() , Sender(ev->Sender) @@ -672,8 +672,8 @@ namespace NKikimr { IActor* CreateSkeletonVPatchActor(TActorId leaderId, const TBlobStorageGroupType &gType, TEvBlobStorage::TEvVPatchStart::TPtr &ev, TInstant now, TActorIDPtr skeletonFrontIDPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &vPatchFoundPartsMsgsPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &vPatchResMsgsPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &vPatchFoundPartsMsgsPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &vPatchResMsgsPtr, const TIntrusivePtr<TVPatchCtx> &vPatchCtx, const TString &vDiskLogPrefix, ui64 incarnationGuid) { return new NPrivate::TSkeletonVPatchActor(leaderId, gType, ev, now, skeletonFrontIDPtr, diff --git a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.h b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.h index 8c2c0d658c..c56e846a47 100644 --- a/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.h +++ b/ydb/core/blobstorage/vdisk/skeleton/skeleton_vpatch_actor.h @@ -32,8 +32,8 @@ struct TVPatchCtx : public TThrRefBase, TNonCopyable { }; IActor* CreateSkeletonVPatchActor(TActorId leaderId, const TBlobStorageGroupType &gType, TEvBlobStorage::TEvVPatchStart::TPtr &ev, - TInstant now, TActorIDPtr skeletonFrontIDPtr, const NMonitoring::TDynamicCounters::TCounterPtr &vPatchFoundPartsMsgsPtr, - const NMonitoring::TDynamicCounters::TCounterPtr &vPatchResMsgsPtr, const TIntrusivePtr<TVPatchCtx> &vPatchCtx, + TInstant now, TActorIDPtr skeletonFrontIDPtr, const ::NMonitoring::TDynamicCounters::TCounterPtr &vPatchFoundPartsMsgsPtr, + const ::NMonitoring::TDynamicCounters::TCounterPtr &vPatchResMsgsPtr, const TIntrusivePtr<TVPatchCtx> &vPatchCtx, const TString &vDiskLogPrefix, ui64 incarnationGuid); } // NKikimr diff --git a/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_localwriter.h b/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_localwriter.h index 701dec57bd..bf26350068 100644 --- a/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_localwriter.h +++ b/ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_localwriter.h @@ -56,7 +56,7 @@ namespace NKikimr { NKikimrProto::EReplyStatus Status; TEvLocalSyncDataResult(NKikimrProto::EReplyStatus status, const TInstant &now, - NMonitoring::TDynamicCounters::TCounterPtr counterPtr, + ::NMonitoring::TDynamicCounters::TCounterPtr counterPtr, NVDiskMon::TLtcHistoPtr histoPtr, NWilson::TTraceId traceId) : TEvVResultBase(now, TInterconnectChannels::IC_BLOBSTORAGE_SMALL_MSG, counterPtr, histoPtr, std::move(traceId)) diff --git a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdata_ut.cpp b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdata_ut.cpp index 5a5024382a..ef6b36cafa 100644 --- a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdata_ut.cpp +++ b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogdata_ut.cpp @@ -18,7 +18,7 @@ namespace NKikimr { ui32 appendBlockSize = 4 << 10; ui32 syncLogAdvisedIndexedBlockSize = 4 << 10; - NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); + ::NMonitoring::TDynamicCounters::TCounterPtr cntr(new NMonitoring::TCounterForPtr); TMemoryConsumer memConsumer(cntr); TSyncLogParams params(pDiskGuid, chunkSize, appendBlockSize, syncLogAdvisedIndexedBlockSize, memConsumer); TEntryPointParser parser(std::move(params)); diff --git a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogkeeper_ut.cpp b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogkeeper_ut.cpp index 266ca6bef3..089ca25d4d 100644 --- a/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogkeeper_ut.cpp +++ b/ydb/core/blobstorage/vdisk/synclog/blobstorage_synclogkeeper_ut.cpp @@ -73,7 +73,7 @@ namespace NKikimr { TIntrusivePtr<TVDiskContext> vctx = new TVDiskContext( TActorId(), groupInfo.PickTopology(), - new NMonitoring::TDynamicCounters(), + new ::NMonitoring::TDynamicCounters(), TVDiskID(), nullptr, NPDisk::DEVICE_TYPE_UNKNOWN); diff --git a/ydb/core/blobstorage/vdisk/vdisk_actor.cpp b/ydb/core/blobstorage/vdisk/vdisk_actor.cpp index f1cca2ed72..53ede8b5f6 100644 --- a/ydb/core/blobstorage/vdisk/vdisk_actor.cpp +++ b/ydb/core/blobstorage/vdisk/vdisk_actor.cpp @@ -6,7 +6,7 @@ namespace NKikimr { IActor* CreateVDisk(const TIntrusivePtr<TVDiskConfig> &cfg, const TIntrusivePtr<TBlobStorageGroupInfo> &info, - const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters) { + const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters) { // some global checks, it's better to VERIFY now than later IngressGlobalCheck(info.Get()); diff --git a/ydb/core/blobstorage/vdisk/vdisk_actor.h b/ydb/core/blobstorage/vdisk/vdisk_actor.h index de1212b9d5..19fe008b26 100644 --- a/ydb/core/blobstorage/vdisk/vdisk_actor.h +++ b/ydb/core/blobstorage/vdisk/vdisk_actor.h @@ -8,6 +8,6 @@ namespace NKikimr { IActor* CreateVDisk(const TIntrusivePtr<TVDiskConfig> &cfg, const TIntrusivePtr<TBlobStorageGroupInfo> &info, - const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters); } // NKikimr diff --git a/ydb/core/client/minikql_compile/mkql_compile_service.cpp b/ydb/core/client/minikql_compile/mkql_compile_service.cpp index e01d61a22c..b88d4904f5 100644 --- a/ydb/core/client/minikql_compile/mkql_compile_service.cpp +++ b/ydb/core/client/minikql_compile/mkql_compile_service.cpp @@ -164,7 +164,7 @@ private: using TCompilingMap = THashMap<TActorId, TCompileContext::TPtr>; TCompilingMap Compiling; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TAlignedPagePoolCounters AllocPoolCounters; TActorId SchemeCache; THolder<NYql::IDbSchemeResolver> DbSchemeResolver; diff --git a/ydb/core/client/server/grpc_server.cpp b/ydb/core/client/server/grpc_server.cpp index aa122da36a..5efc1b304e 100644 --- a/ydb/core/client/server/grpc_server.cpp +++ b/ydb/core/client/server/grpc_server.cpp @@ -380,7 +380,7 @@ void TGRpcService::InitService(grpc::ServerCompletionQueue *cq, NGrpc::TLoggerPt } TFuture<void> TGRpcService::Prepare(TActorSystem* system, const TActorId& pqMeta, const TActorId& msgBusProxy, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { auto promise = NewPromise<void>(); InitCb_ = [=]() mutable { try { diff --git a/ydb/core/client/server/grpc_server.h b/ydb/core/client/server/grpc_server.h index 2f2ae1da6b..f44d8cdadc 100644 --- a/ydb/core/client/server/grpc_server.h +++ b/ydb/core/client/server/grpc_server.h @@ -60,7 +60,7 @@ public: void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; void SetGlobalLimiterHandle(NGrpc::TGlobalLimiter* limiter) override; - NThreading::TFuture<void> Prepare(NActors::TActorSystem* system, const NActors::TActorId& pqMeta, const NActors::TActorId& msgBusProxy, TIntrusivePtr<NMonitoring::TDynamicCounters> counters); + NThreading::TFuture<void> Prepare(NActors::TActorSystem* system, const NActors::TActorId& pqMeta, const NActors::TActorId& msgBusProxy, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters); void Start(); bool IncRequest(); @@ -86,7 +86,7 @@ private: size_t PersQueueWriteSessionsMaxCount = 1000000; size_t PersQueueReadSessionsMaxCount = 100000; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; std::function<void()> InitCb_; // In flight request management. diff --git a/ydb/core/client/server/msgbus_http_server.h b/ydb/core/client/server/msgbus_http_server.h index 4070ca8bd5..f258cdb157 100644 --- a/ydb/core/client/server/msgbus_http_server.h +++ b/ydb/core/client/server/msgbus_http_server.h @@ -11,7 +11,7 @@ namespace NMsgBusProxy { class IMessageBusHttpServer : public NMonitoring::IMonPage { public: - IMessageBusHttpServer(const TString& path, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) + IMessageBusHttpServer(const TString& path, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) : NMonitoring::IMonPage(path) , Counters(counters) {} @@ -19,17 +19,17 @@ public: virtual void Shutdown() = 0; // counters - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; - TIntrusivePtr<NMonitoring::TDynamicCounters> HttpGroup; - NMonitoring::TDynamicCounters::TCounterPtr RequestsActive; - NMonitoring::TDynamicCounters::TCounterPtr RequestsCount; - NMonitoring::TDynamicCounters::TCounterPtr InboundSize; - NMonitoring::TDynamicCounters::TCounterPtr OutboundSize; - NMonitoring::TDynamicCounters::TCounterPtr Status200; - NMonitoring::TDynamicCounters::TCounterPtr Status400; - NMonitoring::TDynamicCounters::TCounterPtr Status500; - NMonitoring::TDynamicCounters::TCounterPtr Status503; - NMonitoring::TDynamicCounters::TCounterPtr Status504; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> HttpGroup; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestsActive; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestsCount; + ::NMonitoring::TDynamicCounters::TCounterPtr InboundSize; + ::NMonitoring::TDynamicCounters::TCounterPtr OutboundSize; + ::NMonitoring::TDynamicCounters::TCounterPtr Status200; + ::NMonitoring::TDynamicCounters::TCounterPtr Status400; + ::NMonitoring::TDynamicCounters::TCounterPtr Status500; + ::NMonitoring::TDynamicCounters::TCounterPtr Status503; + ::NMonitoring::TDynamicCounters::TCounterPtr Status504; NMonitoring::THistogramPtr RequestTotalTimeHistogram; NMonitoring::THistogramPtr RequestPrepareTimeHistogram; }; diff --git a/ydb/core/client/server/msgbus_server_pq_metacache.cpp b/ydb/core/client/server/msgbus_server_pq_metacache.cpp index f695d57000..d0194f184f 100644 --- a/ydb/core/client/server/msgbus_server_pq_metacache.cpp +++ b/ydb/core/client/server/msgbus_server_pq_metacache.cpp @@ -24,7 +24,7 @@ namespace NPqMetaCacheV2 { using namespace NSchemeCache; -IActor* CreateSchemeCache(const TActorContext& ctx, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { +IActor* CreateSchemeCache(const TActorContext& ctx, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { auto appData = AppData(ctx); auto cacheCounters = GetServiceCounters(counters, "pqproxy|schemecache"); auto cacheConfig = MakeIntrusive<TSchemeCacheConfig>(appData, cacheCounters); @@ -37,7 +37,7 @@ public: TPersQueueMetaCacheActor(TPersQueueMetaCacheActor&&) = default; TPersQueueMetaCacheActor& operator=(TPersQueueMetaCacheActor&&) = default; - TPersQueueMetaCacheActor(const NMonitoring::TDynamicCounterPtr& counters, + TPersQueueMetaCacheActor(const ::NMonitoring::TDynamicCounterPtr& counters, const TDuration& versionCheckInterval) : Counters(counters) , VersionCheckInterval(versionCheckInterval) @@ -518,7 +518,7 @@ private: TString Cluster; }; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; TString VersionQuery; TString TopicsQuery; @@ -551,7 +551,7 @@ private: }; -IActor* CreatePQMetaCache(const NMonitoring::TDynamicCounterPtr& counters, const TDuration& versionCheckInterval) { +IActor* CreatePQMetaCache(const ::NMonitoring::TDynamicCounterPtr& counters, const TDuration& versionCheckInterval) { return new TPersQueueMetaCacheActor(counters, versionCheckInterval); } diff --git a/ydb/core/client/server/msgbus_server_pq_metacache.h b/ydb/core/client/server/msgbus_server_pq_metacache.h index d8f7479af9..a14b599a90 100644 --- a/ydb/core/client/server/msgbus_server_pq_metacache.h +++ b/ydb/core/client/server/msgbus_server_pq_metacache.h @@ -110,7 +110,7 @@ struct TEvPqNewMetaCache { {} }; }; -IActor* CreatePQMetaCache(const NMonitoring::TDynamicCounterPtr& counters, +IActor* CreatePQMetaCache(const ::NMonitoring::TDynamicCounterPtr& counters, const TDuration& versionCheckInterval = TDuration::Seconds(1)); IActor* CreatePQMetaCache(const NActors::TActorId& schemeBoardCacheId, diff --git a/ydb/core/client/server/msgbus_server_proxy.h b/ydb/core/client/server/msgbus_server_proxy.h index f9fdfdf593..ad868c1476 100644 --- a/ydb/core/client/server/msgbus_server_proxy.h +++ b/ydb/core/client/server/msgbus_server_proxy.h @@ -9,7 +9,7 @@ namespace NKikimr { namespace NMsgBusProxy { struct TMessageBusDbOpsCounters : TAtomicRefCount<TMessageBusDbOpsCounters> { - TIntrusivePtr<NMonitoring::TDynamicCounters> DbOperationsCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> DbOperationsCounters; NMonitoring::THistogramPtr RequestTotalTimeHistogram; NMonitoring::THistogramPtr RequestPrepareTimeHistogram; NMonitoring::THistogramPtr RequestUpdateTimeHistogram; @@ -18,7 +18,7 @@ struct TMessageBusDbOpsCounters : TAtomicRefCount<TMessageBusDbOpsCounters> { NMonitoring::THistogramPtr RequestBatchTimeHistogram; NMonitoring::THistogramPtr RequestQueryTimeHistogram; - TMessageBusDbOpsCounters(const NMonitoring::TDynamicCounterPtr& counters) { + TMessageBusDbOpsCounters(const ::NMonitoring::TDynamicCounterPtr& counters) { DbOperationsCounters = GetServiceCounters(counters, "proxy")->GetSubgroup("subsystem", "db"); RequestTotalTimeHistogram = DbOperationsCounters->GetHistogram("RequestTotalTimeMs", @@ -41,7 +41,7 @@ struct TMessageBusDbOpsCounters : TAtomicRefCount<TMessageBusDbOpsCounters> { class TMessageBusServerProxy : public TActorBootstrapped<TMessageBusServerProxy> { TMessageBusServer* const Server; - TIntrusivePtr<NMonitoring::TDynamicCounters> SchemeCacheCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> SchemeCacheCounters; TIntrusivePtr<TMessageBusDbOpsCounters> DbOperationsCounters; diff --git a/ydb/core/cms/console/configs_cache.h b/ydb/core/cms/console/configs_cache.h index 08ba529799..fb4e926c7f 100644 --- a/ydb/core/cms/console/configs_cache.h +++ b/ydb/core/cms/console/configs_cache.h @@ -52,7 +52,7 @@ private: NKikimrConfig::TAppConfig CurrentConfig; - NMonitoring::TDynamicCounters::TCounterPtr OutdatedConfiguration; + ::NMonitoring::TDynamicCounters::TCounterPtr OutdatedConfiguration; }; IActor *CreateConfigsCacheActor(const TString &pathToConfigCacheFile); diff --git a/ydb/core/cms/console/console_impl.h b/ydb/core/cms/console/console_impl.h index 0894337c3e..e9683c2249 100644 --- a/ydb/core/cms/console/console_impl.h +++ b/ydb/core/cms/console/console_impl.h @@ -25,7 +25,7 @@ namespace NConsole { using NTabletFlatExecutor::ITransaction; using NTabletFlatExecutor::TTransactionBase; using NTabletFlatExecutor::TTabletExecutedFlat; -using NMonitoring::TDynamicCounterPtr; +using ::NMonitoring::TDynamicCounterPtr; class TConfigsManager; class TTenantsManager; diff --git a/ydb/core/cms/console/console_tenants_manager.h b/ydb/core/cms/console/console_tenants_manager.h index 3a769a9d56..0d35f760d6 100644 --- a/ydb/core/cms/console/console_tenants_manager.h +++ b/ydb/core/cms/console/console_tenants_manager.h @@ -35,7 +35,7 @@ using NTabletFlatExecutor::TTransactionContext; using NSchemeShard::TEvSchemeShard; using NTenantSlotBroker::TEvTenantSlotBroker; using NTenantSlotBroker::TSlotDescription; -using NMonitoring::TDynamicCounterPtr; +using ::NMonitoring::TDynamicCounterPtr; class TConsole; @@ -95,7 +95,7 @@ public: static const THashSet<ECounter> DerivSensors; public: - using TCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; TCounters(TDynamicCounterPtr counters) : Counters(counters) diff --git a/ydb/core/cms/console/console_ut_tenants.cpp b/ydb/core/cms/console/console_ut_tenants.cpp index f2709dbf6e..1bad572d8b 100644 --- a/ydb/core/cms/console/console_ut_tenants.cpp +++ b/ydb/core/cms/console/console_ut_tenants.cpp @@ -351,7 +351,7 @@ void CheckCounter(TTenantTestRuntime &runtime, TTenantsManager::ECounter counter, ui64 value) { - NMonitoring::TDynamicCounterPtr counters; + ::NMonitoring::TDynamicCounterPtr counters; for (ui32 i = 0; i < runtime.GetNodeCount() && !counters; ++i) { auto tablets = GetServiceCounters(runtime.GetDynamicCounters(i), "tablets"); counters = tablets->FindSubgroup("type", "CONSOLE"); diff --git a/ydb/core/cms/sentinel.cpp b/ydb/core/cms/sentinel.cpp index 1823586d28..aedc452479 100644 --- a/ydb/core/cms/sentinel.cpp +++ b/ydb/core/cms/sentinel.cpp @@ -724,8 +724,8 @@ private: class TSentinel: public TActorBootstrapped<TSentinel> { struct TCounters { - using TDynamicCounters = NMonitoring::TDynamicCounters; - using TDynamicCounterPtr = NMonitoring::TDynamicCounterPtr; + using TDynamicCounters = ::NMonitoring::TDynamicCounters; + using TDynamicCounterPtr = ::NMonitoring::TDynamicCounterPtr; TDynamicCounterPtr Group; TDynamicCounters::TCounterPtr PDisksTotal; diff --git a/ydb/core/control/immediate_control_board_actor.cpp b/ydb/core/control/immediate_control_board_actor.cpp index bcb4a3344c..5a8ca7d9b5 100644 --- a/ydb/core/control/immediate_control_board_actor.cpp +++ b/ydb/core/control/immediate_control_board_actor.cpp @@ -36,8 +36,8 @@ class TImmediateControlActor : public TActorBootstrapped<TImmediateControlActor> TIntrusivePtr<TControlBoard> Board; TVector<TLogRecord> HistoryLog; - NMonitoring::TDynamicCounters::TCounterPtr HasChanged; - NMonitoring::TDynamicCounters::TCounterPtr ChangedCount; + ::NMonitoring::TDynamicCounters::TCounterPtr HasChanged; + ::NMonitoring::TDynamicCounters::TCounterPtr ChangedCount; public: static constexpr NKikimrServices::TActivity::EType ActorActivityType() { @@ -45,10 +45,10 @@ public: } TImmediateControlActor(TIntrusivePtr<TControlBoard> board, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) : Board(board) { - TIntrusivePtr<NMonitoring::TDynamicCounters> IcbGroup = GetServiceCounters(counters, "utils"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> IcbGroup = GetServiceCounters(counters, "utils"); HasChanged = IcbGroup->GetCounter("Icb/HasChangedContol"); ChangedCount = IcbGroup->GetCounter("Icb/ChangedControlsCount"); } @@ -129,7 +129,7 @@ private: }; NActors::IActor* CreateImmediateControlActor(TIntrusivePtr<TControlBoard> board, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) { + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) { return new NKikimr::TImmediateControlActor(board, counters); } }; diff --git a/ydb/core/control/immediate_control_board_actor.h b/ydb/core/control/immediate_control_board_actor.h index 0b2cff4cf6..bd453c6a7f 100644 --- a/ydb/core/control/immediate_control_board_actor.h +++ b/ydb/core/control/immediate_control_board_actor.h @@ -15,6 +15,6 @@ inline NActors::TActorId MakeIcbId(ui32 node) { class TImmediateControlActor; -NActors::IActor* CreateImmediateControlActor(TIntrusivePtr<TControlBoard> board, const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters); +NActors::IActor* CreateImmediateControlActor(TIntrusivePtr<TControlBoard> board, const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters); } diff --git a/ydb/core/control/immediate_control_board_actor_ut.cpp b/ydb/core/control/immediate_control_board_actor_ut.cpp index 2753077d93..0cb9da2783 100644 --- a/ydb/core/control/immediate_control_board_actor_ut.cpp +++ b/ydb/core/control/immediate_control_board_actor_ut.cpp @@ -46,7 +46,7 @@ static bool IsVerbose = false; static THolder<TActorSystem> ActorSystem; -static TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; +static TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; static THolder<NActors::TMon> Monitoring; static TAtomic DoneCounter = 0; @@ -77,7 +77,7 @@ static void Run(i64 instances = 1) { nullptr, nullptr, nullptr, nullptr); try { - Counters = TIntrusivePtr<NMonitoring::TDynamicCounters>(new NMonitoring::TDynamicCounters()); + Counters = TIntrusivePtr<::NMonitoring::TDynamicCounters>(new ::NMonitoring::TDynamicCounters()); testIds.resize(instances); diff --git a/ydb/core/driver_lib/run/factories.h b/ydb/core/driver_lib/run/factories.h index 1be49a906e..eeca39d03f 100644 --- a/ydb/core/driver_lib/run/factories.h +++ b/ydb/core/driver_lib/run/factories.h @@ -47,7 +47,7 @@ struct TModuleFactories { IActor*(*CreateTicketParser)(const NKikimrProto::TAuthConfig&); IActor*(*FolderServiceFactory)(const NKikimrProto::NFolderService::TFolderServiceConfig&); - std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig, const NMonitoring::TDynamicCounterPtr& counters)> YqAuditServiceFactory; + std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig, const ::NMonitoring::TDynamicCounterPtr& counters)> YqAuditServiceFactory; NKikimr::TYdbCredentialsProviderFactory YdbCredentialProviderFactory; // Factory for grpc services TGrpcServiceFactory GrpcServiceFactory; diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp index 994a288e03..a26dcec3fb 100644 --- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp +++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp @@ -525,7 +525,7 @@ void TBasicServicesInitializer::InitializeServices(NActors::TActorSystemSetup* s Y_VERIFY(systemConfig.ExecutorSize()); const ui32 systemPoolId = appData->SystemPoolId; - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters = appData->Counters; + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters = appData->Counters; setup->NodeId = NodeId; setup->MaxActivityType = GetActivityTypeCount(); @@ -1034,8 +1034,8 @@ void TSharedCacheInitializer::InitializeServices( config->TotalAsyncQueueInFlyLimit = cfg.GetAsyncQueueInFlyLimit(); config->TotalScanQueueInFlyLimit = cfg.GetScanQueueInFlyLimit(); - TIntrusivePtr<NMonitoring::TDynamicCounters> tabletGroup = GetServiceCounters(appData->Counters, "tablets"); - TIntrusivePtr<NMonitoring::TDynamicCounters> sausageGroup = tabletGroup->GetSubgroup("type", "S_CACHE"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> tabletGroup = GetServiceCounters(appData->Counters, "tablets"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> sausageGroup = tabletGroup->GetSubgroup("type", "S_CACHE"); config->CacheConfig = new TCacheCacheConfig(cfg.GetMemoryLimit(), sausageGroup->GetCounter("fresh"), @@ -1061,8 +1061,8 @@ void TBlobCacheInitializer::InitializeServices( NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) { - TIntrusivePtr<NMonitoring::TDynamicCounters> tabletGroup = GetServiceCounters(appData->Counters, "tablets"); - TIntrusivePtr<NMonitoring::TDynamicCounters> blobCacheGroup = tabletGroup->GetSubgroup("type", "BLOB_CACHE"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> tabletGroup = GetServiceCounters(appData->Counters, "tablets"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> blobCacheGroup = tabletGroup->GetSubgroup("type", "BLOB_CACHE"); static const constexpr ui64 DEFAULT_CACHE_SIZE_BYTES = 1000ull << 20; setup->LocalServices.push_back(std::pair<TActorId, TActorSetupCmd>(NBlobCache::MakeBlobCacheServiceId(), @@ -1084,7 +1084,7 @@ TLoggerInitializer::TLoggerInitializer(const TKikimrRunConfig& runConfig, void TLoggerInitializer::InitializeServices( NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) { - const TIntrusivePtr<NMonitoring::TDynamicCounters> utilsCounters = GetServiceCounters(appData->Counters, "utils"); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> utilsCounters = GetServiceCounters(appData->Counters, "utils"); // log settings must be initialized before calling this method NActors::TLoggerActor *loggerActor = new NActors::TLoggerActor(LogSettings, LogBackend, utilsCounters); @@ -1129,7 +1129,7 @@ TProfilerInitializer::TProfilerInitializer(const TKikimrRunConfig& runConfig) void TProfilerInitializer::InitializeServices( NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) { - const TIntrusivePtr<NMonitoring::TDynamicCounters> utilsCounters = GetServiceCounters(appData->Counters, "utils"); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> utilsCounters = GetServiceCounters(appData->Counters, "utils"); TActorSetupCmd profilerSetup(CreateProfilerActor(utilsCounters, "/var/tmp"), TMailboxType::HTSwap, 0); setup->LocalServices.push_back(std::pair<TActorId, TActorSetupCmd>(MakeProfilerID(NodeId), profilerSetup)); @@ -1166,7 +1166,7 @@ void TResourceBrokerInitializer::InitializeServices( // TRestartsCountPublisher -void TRestartsCountPublisher::PublishRestartsCount(const NMonitoring::TDynamicCounters::TCounterPtr& counter, +void TRestartsCountPublisher::PublishRestartsCount(const ::NMonitoring::TDynamicCounters::TCounterPtr& counter, const TString& restartsCountFile) { if (restartsCountFile.size()) { try { @@ -1189,7 +1189,7 @@ void TRestartsCountPublisher::InitializeServices( NActors::TActorSystemSetup* setup, const NKikimr::TAppData* appData) { Y_UNUSED(setup); - const TIntrusivePtr<NMonitoring::TDynamicCounters> utilsCounters = GetServiceCounters(appData->Counters, "utils"); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> utilsCounters = GetServiceCounters(appData->Counters, "utils"); if (Config.HasRestartsCountConfig()) { const auto& restartsCountConfig = Config.GetRestartsCountConfig(); @@ -1877,8 +1877,8 @@ void TPersQueueL2CacheInitializer::InitializeServices(NActors::TActorSystemSetup params.KeepTime = TDuration::Seconds(cfg.GetCacheKeepTimeSec()); } - TIntrusivePtr<NMonitoring::TDynamicCounters> tabletGroup = GetServiceCounters(appData->Counters, "tablets"); - TIntrusivePtr<NMonitoring::TDynamicCounters> pqCacheGroup = tabletGroup->GetSubgroup("type", "PQ_CACHE"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> tabletGroup = GetServiceCounters(appData->Counters, "tablets"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> pqCacheGroup = tabletGroup->GetSubgroup("type", "PQ_CACHE"); IActor* actor = NPQ::CreateNodePersQueueL2Cache(params, pqCacheGroup); setup->LocalServices.push_back(std::pair<TActorId, TActorSetupCmd>( diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.h b/ydb/core/driver_lib/run/kikimr_services_initializers.h index a4e29b62bb..e98898c39b 100644 --- a/ydb/core/driver_lib/run/kikimr_services_initializers.h +++ b/ydb/core/driver_lib/run/kikimr_services_initializers.h @@ -168,7 +168,7 @@ public: }; class TRestartsCountPublisher : public IKikimrServicesInitializer { - static void PublishRestartsCount(const NMonitoring::TDynamicCounters::TCounterPtr& counter, + static void PublishRestartsCount(const ::NMonitoring::TDynamicCounters::TCounterPtr& counter, const TString& restartsCountFile); public: diff --git a/ydb/core/driver_lib/run/log_backend.cpp b/ydb/core/driver_lib/run/log_backend.cpp index d817f5b459..3a33ab6cac 100644 --- a/ydb/core/driver_lib/run/log_backend.cpp +++ b/ydb/core/driver_lib/run/log_backend.cpp @@ -18,7 +18,7 @@ TAutoPtr<TLogBackend> TLogBackendFactory::CreateLogBackendFromLogConfig(const TK TAutoPtr<TLogBackend> TLogBackendFactory::CreateLogBackend( const TKikimrRunConfig& runConfig, - NMonitoring::TDynamicCounterPtr counters) { + ::NMonitoring::TDynamicCounterPtr counters) { Y_UNUSED(counters); TAutoPtr<TLogBackend> logBackend = CreateLogBackendFromLogConfig(runConfig); if (logBackend) { diff --git a/ydb/core/driver_lib/run/log_backend.h b/ydb/core/driver_lib/run/log_backend.h index df877d69be..d641a0fd9d 100644 --- a/ydb/core/driver_lib/run/log_backend.h +++ b/ydb/core/driver_lib/run/log_backend.h @@ -10,7 +10,7 @@ class ILogBackendFactory { public: virtual TAutoPtr<TLogBackend> CreateLogBackend( const TKikimrRunConfig& runConfig, - NMonitoring::TDynamicCounterPtr counters) = 0; + ::NMonitoring::TDynamicCounterPtr counters) = 0; virtual ~ILogBackendFactory() {} }; @@ -23,7 +23,7 @@ protected: public: virtual TAutoPtr<TLogBackend> CreateLogBackend( const TKikimrRunConfig& runConfig, - NMonitoring::TDynamicCounterPtr counters) override; + ::NMonitoring::TDynamicCounterPtr counters) override; }; } // NKikimr diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp index 33ebb33854..0b7431c527 100644 --- a/ydb/core/driver_lib/run/run.cpp +++ b/ydb/core/driver_lib/run/run.cpp @@ -322,7 +322,7 @@ public: TKikimrRunner::TKikimrRunner(std::shared_ptr<TModuleFactories> factories) : ModuleFactories(std::move(factories)) - , Counters(MakeIntrusive<NMonitoring::TDynamicCounters>()) + , Counters(MakeIntrusive<::NMonitoring::TDynamicCounters>()) , PollerThreads(new NInterconnect::TPollerThreads) { } diff --git a/ydb/core/driver_lib/run/run.h b/ydb/core/driver_lib/run/run.h index 21c7e47d03..53f5a19ffd 100644 --- a/ydb/core/driver_lib/run/run.h +++ b/ydb/core/driver_lib/run/run.h @@ -36,7 +36,7 @@ protected: NYq::IYqSharedResources::TPtr YqSharedResources; TAutoPtr<TMon> Monitoring; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; NMonitoring::TIndexMonPage *ActorsMonPage = nullptr; bool EnabledGrpcService = false; diff --git a/ydb/core/grpc_services/counters/counters.cpp b/ydb/core/grpc_services/counters/counters.cpp index b47428c319..1d9d8733ae 100644 --- a/ydb/core/grpc_services/counters/counters.cpp +++ b/ydb/core/grpc_services/counters/counters.cpp @@ -15,20 +15,20 @@ namespace NGRpcService { using namespace NActors; struct TYdbRpcCounters { - TYdbRpcCounters(const NMonitoring::TDynamicCounterPtr& counters, const char* serviceName, + TYdbRpcCounters(const ::NMonitoring::TDynamicCounterPtr& counters, const char* serviceName, const char* requestName, bool forDatabase); - NMonitoring::TDynamicCounters::TCounterPtr RequestCount; - NMonitoring::TDynamicCounters::TCounterPtr RequestInflight; - NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; - NMonitoring::TDynamicCounters::TCounterPtr RequestInflightBytes; - NMonitoring::TDynamicCounters::TCounterPtr RequestRpcError; - - NMonitoring::TDynamicCounters::TCounterPtr ResponseBytes; - NMonitoring::TDynamicCounters::TCounterPtr ResponseRpcError; - NMonitoring::TDynamicCounters::TCounterPtr ResponseRpcNotAuthenticated; - NMonitoring::TDynamicCounters::TCounterPtr ResponseRpcResourceExhausted; - THashMap<ui32, NMonitoring::TDynamicCounters::TCounterPtr> ResponseByStatus; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestCount; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestInflight; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestInflightBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestRpcError; + + ::NMonitoring::TDynamicCounters::TCounterPtr ResponseBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr ResponseRpcError; + ::NMonitoring::TDynamicCounters::TCounterPtr ResponseRpcNotAuthenticated; + ::NMonitoring::TDynamicCounters::TCounterPtr ResponseRpcResourceExhausted; + THashMap<ui32, ::NMonitoring::TDynamicCounters::TCounterPtr> ResponseByStatus; }; class TYdbCounterBlock : public NGrpc::ICounterBlock { @@ -38,27 +38,27 @@ protected: // "Internal" counters // TODO: Switch to public YDB counters - NMonitoring::TDynamicCounters::TCounterPtr TotalCounter; - NMonitoring::TDynamicCounters::TCounterPtr InflyCounter; - NMonitoring::TDynamicCounters::TCounterPtr NotOkRequestCounter; - NMonitoring::TDynamicCounters::TCounterPtr NotOkResponseCounter; - NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; - NMonitoring::TDynamicCounters::TCounterPtr InflyRequestBytes; - NMonitoring::TDynamicCounters::TCounterPtr ResponseBytes; - NMonitoring::TDynamicCounters::TCounterPtr NotAuthenticated; - NMonitoring::TDynamicCounters::TCounterPtr ResourceExhausted; - NMonitoring::TDynamicCounters::TCounterPtr RequestsWithoutDatabase; - NMonitoring::TDynamicCounters::TCounterPtr RequestsWithoutToken; - NMonitoring::TDynamicCounters::TCounterPtr RequestsWithoutTls; + ::NMonitoring::TDynamicCounters::TCounterPtr TotalCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr InflyCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr NotOkRequestCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr NotOkResponseCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr InflyRequestBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr ResponseBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr NotAuthenticated; + ::NMonitoring::TDynamicCounters::TCounterPtr ResourceExhausted; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestsWithoutDatabase; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestsWithoutToken; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestsWithoutTls; NMonitoring::TPercentileTracker<4, 512, 15> RequestHistMs; - std::array<NMonitoring::TDynamicCounters::TCounterPtr, 2> GRpcStatusCounters; + std::array<::NMonitoring::TDynamicCounters::TCounterPtr, 2> GRpcStatusCounters; TYdbRpcCounters YdbCounters; public: - TYdbCounterBlock(const NMonitoring::TDynamicCounterPtr& counters, const char* serviceName, + TYdbCounterBlock(const ::NMonitoring::TDynamicCounterPtr& counters, const char* serviceName, const char* requestName, bool percentile, bool streaming, - bool forDatabase = false, NMonitoring::TDynamicCounterPtr internalGroup = {}); + bool forDatabase = false, ::NMonitoring::TDynamicCounterPtr internalGroup = {}); void CountNotOkRequest() override { NotOkRequestCounter->Inc(); @@ -153,10 +153,10 @@ public: } }; -TYdbRpcCounters::TYdbRpcCounters(const NMonitoring::TDynamicCounterPtr& counters, +TYdbRpcCounters::TYdbRpcCounters(const ::NMonitoring::TDynamicCounterPtr& counters, const char* serviceName, const char* requestName, bool forDatabase) { - NMonitoring::TDynamicCounterPtr ydbGroup; + ::NMonitoring::TDynamicCounterPtr ydbGroup; if (forDatabase) { ydbGroup = counters; } else { @@ -220,15 +220,15 @@ TYdbRpcCounters::TYdbRpcCounters(const NMonitoring::TDynamicCounterPtr& counters typeGroup->GetSubgroup("status", "SESSION_BUSY")->GetNamedCounter("name", countName, true); } -TYdbCounterBlock::TYdbCounterBlock(const NMonitoring::TDynamicCounterPtr& counters, const char* serviceName, +TYdbCounterBlock::TYdbCounterBlock(const ::NMonitoring::TDynamicCounterPtr& counters, const char* serviceName, const char* requestName, bool percentile, bool streaming, - bool forDatabase, NMonitoring::TDynamicCounterPtr internalGroup) + bool forDatabase, ::NMonitoring::TDynamicCounterPtr internalGroup) : Streaming(streaming) , Percentile(percentile) , YdbCounters(counters, serviceName, requestName, forDatabase) { // group for all counters - NMonitoring::TDynamicCounterPtr group; + ::NMonitoring::TDynamicCounterPtr group; if (forDatabase) { group = internalGroup; } else { @@ -293,9 +293,9 @@ using TYdbCounterBlockPtr = TIntrusivePtr<TYdbCounterBlock>; class TYdbDbCounterBlock : public TYdbCounterBlock { public: - TYdbDbCounterBlock(const NMonitoring::TDynamicCounterPtr& counters, const char* serviceName, + TYdbDbCounterBlock(const ::NMonitoring::TDynamicCounterPtr& counters, const char* serviceName, const char* requestName, bool percentile, bool streaming, - NMonitoring::TDynamicCounterPtr internalGroup = {}) + ::NMonitoring::TDynamicCounterPtr internalGroup = {}) : TYdbCounterBlock(counters, serviceName, requestName, percentile, streaming, true, internalGroup) {} @@ -354,11 +354,11 @@ using TYdbDbCounterBlockPtr = TIntrusivePtr<TYdbDbCounterBlock>; class TGRpcDbCounters : public NSysView::IDbCounters { public: TGRpcDbCounters() - : Counters(new NMonitoring::TDynamicCounters) - , InternalGroup(new NMonitoring::TDynamicCounters) + : Counters(new ::NMonitoring::TDynamicCounters) + , InternalGroup(new ::NMonitoring::TDynamicCounters) {} - TGRpcDbCounters(NMonitoring::TDynamicCounterPtr counters, NMonitoring::TDynamicCounterPtr internalGroup) + TGRpcDbCounters(::NMonitoring::TDynamicCounterPtr counters, ::NMonitoring::TDynamicCounterPtr internalGroup) : Counters(counters) , InternalGroup(internalGroup) {} @@ -394,8 +394,8 @@ public: } private: - NMonitoring::TDynamicCounterPtr Counters; - NMonitoring::TDynamicCounterPtr InternalGroup; + ::NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr InternalGroup; using TKey = std::pair<TString, TString>; TConcurrentRWHashMap<TKey, TYdbDbCounterBlockPtr, 16> CounterBlocks; @@ -470,7 +470,7 @@ class TYdbCounterBlockWrapper : public NGrpc::ICounterBlock { bool Percentile = false; bool Streaming = false; - NMonitoring::TDynamicCounterPtr Root; + ::NMonitoring::TDynamicCounterPtr Root; TYdbDbCounterBlockPtr Db; public: @@ -481,7 +481,7 @@ public: , RequestName(requestName) , Percentile(percentile) , Streaming(streaming) - , Root(new NMonitoring::TDynamicCounters) + , Root(new ::NMonitoring::TDynamicCounters) , Db(new TYdbDbCounterBlock(Root, serviceName.c_str(), requestName.c_str(), percentile, streaming, Root)) {} @@ -607,7 +607,7 @@ public: }) }; -TServiceCounterCB::TServiceCounterCB(NMonitoring::TDynamicCounterPtr counters, TActorSystem *actorSystem) +TServiceCounterCB::TServiceCounterCB(::NMonitoring::TDynamicCounterPtr counters, TActorSystem *actorSystem) : Counters(std::move(counters)) , ActorSystem(actorSystem) { @@ -635,8 +635,8 @@ NGrpc::ICounterBlockPtr TServiceCounterCB::operator()(const char* serviceName, } TIntrusivePtr<NSysView::IDbCounters> CreateGRpcDbCounters( - NMonitoring::TDynamicCounterPtr externalGroup, - NMonitoring::TDynamicCounterPtr internalGroup) + ::NMonitoring::TDynamicCounterPtr externalGroup, + ::NMonitoring::TDynamicCounterPtr internalGroup) { return new TGRpcDbCounters(externalGroup, internalGroup); } diff --git a/ydb/core/grpc_services/counters/counters.h b/ydb/core/grpc_services/counters/counters.h index da499dac9e..198a415a57 100644 --- a/ydb/core/grpc_services/counters/counters.h +++ b/ydb/core/grpc_services/counters/counters.h @@ -9,26 +9,26 @@ namespace NGRpcService { class TServiceCounterCB { public: - TServiceCounterCB(NMonitoring::TDynamicCounterPtr counters, TActorSystem *actorSystem); + TServiceCounterCB(::NMonitoring::TDynamicCounterPtr counters, TActorSystem *actorSystem); NGrpc::ICounterBlockPtr operator()(const char* serviceName, const char* requestName, bool percentile = true, bool streaming = false) const; private: - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TActorSystem* ActorSystem; TActorId ActorId; }; -inline TServiceCounterCB CreateCounterCb(NMonitoring::TDynamicCounterPtr counters, +inline TServiceCounterCB CreateCounterCb(::NMonitoring::TDynamicCounterPtr counters, TActorSystem *actorSystem) { return TServiceCounterCB(std::move(counters), actorSystem); } TIntrusivePtr<NSysView::IDbCounters> CreateGRpcDbCounters( - NMonitoring::TDynamicCounterPtr externalGroup, - NMonitoring::TDynamicCounterPtr internalGroup); + ::NMonitoring::TDynamicCounterPtr externalGroup, + ::NMonitoring::TDynamicCounterPtr internalGroup); } // namespace NGRpcService } // namespace NKikimr diff --git a/ydb/core/grpc_services/counters/proxy_counters.cpp b/ydb/core/grpc_services/counters/proxy_counters.cpp index 618d2bcd8b..893a4c5f2b 100644 --- a/ydb/core/grpc_services/counters/proxy_counters.cpp +++ b/ydb/core/grpc_services/counters/proxy_counters.cpp @@ -12,18 +12,18 @@ namespace NGRpcService { class TGRpcProxyCounters : public IGRpcProxyCounters { protected: - NMonitoring::TDynamicCounters::TCounterPtr DatabaseAccessDenyCounter_; - NMonitoring::TDynamicCounters::TCounterPtr DatabaseSchemeErrorCounter_; - NMonitoring::TDynamicCounters::TCounterPtr DatabaseUnavailableCounter_; - NMonitoring::TDynamicCounters::TCounterPtr DatabaseRateLimitedCounter_; - NMonitoring::TDynamicCounters::TCounterPtr ConsumedRUCounter_; + ::NMonitoring::TDynamicCounters::TCounterPtr DatabaseAccessDenyCounter_; + ::NMonitoring::TDynamicCounters::TCounterPtr DatabaseSchemeErrorCounter_; + ::NMonitoring::TDynamicCounters::TCounterPtr DatabaseUnavailableCounter_; + ::NMonitoring::TDynamicCounters::TCounterPtr DatabaseRateLimitedCounter_; + ::NMonitoring::TDynamicCounters::TCounterPtr ConsumedRUCounter_; NMonitoring::THistogramPtr ThrottleDelayHistogram_; public: using TPtr = TIntrusivePtr<TGRpcProxyCounters>; - TGRpcProxyCounters(NMonitoring::TDynamicCounterPtr counters, bool forDatabase) { - NMonitoring::TDynamicCounterPtr group; + TGRpcProxyCounters(::NMonitoring::TDynamicCounterPtr counters, bool forDatabase) { + ::NMonitoring::TDynamicCounterPtr group; if (forDatabase) { group = counters; } else { @@ -126,7 +126,7 @@ class TGRpcProxyDbCounters : public TGRpcProxyCounters, public NSysView::IDbCoun public: using TPtr = TIntrusivePtr<TGRpcProxyDbCounters>; - explicit TGRpcProxyDbCounters(NMonitoring::TDynamicCounterPtr counters) + explicit TGRpcProxyDbCounters(::NMonitoring::TDynamicCounterPtr counters) : TGRpcProxyCounters(counters, true) {} @@ -183,7 +183,7 @@ public: class TGRpcProxyDbCountersRegistry { - NMonitoring::TDynamicCounterPtr Root; + ::NMonitoring::TDynamicCounterPtr Root; TConcurrentRWHashMap<TString, TGRpcProxyDbCounters::TPtr, 256> DbCounters; TActorSystem* ActorSystem = {}; TActorId DbWatcherActorId; @@ -197,7 +197,7 @@ class TGRpcProxyDbCountersRegistry { public: TGRpcProxyDbCountersRegistry() - : Root(new NMonitoring::TDynamicCounters) + : Root(new ::NMonitoring::TDynamicCounters) {} void Initialize(TActorSystem* actorSystem) { @@ -245,13 +245,13 @@ public: class TGRpcProxyCountersWrapper : public IGRpcProxyCounters { IGRpcProxyCounters::TPtr Common; - NMonitoring::TDynamicCounterPtr Root; + ::NMonitoring::TDynamicCounterPtr Root; TGRpcProxyDbCounters::TPtr Db; public: explicit TGRpcProxyCountersWrapper(IGRpcProxyCounters::TPtr common) : Common(common) - , Root(new NMonitoring::TDynamicCounters) + , Root(new ::NMonitoring::TDynamicCounters) , Db(new TGRpcProxyDbCounters(Root)) {} @@ -301,13 +301,13 @@ IGRpcProxyCounters::TPtr WrapGRpcProxyDbCounters(IGRpcProxyCounters::TPtr common return MakeIntrusive<TGRpcProxyCountersWrapper>(common); } -IGRpcProxyCounters::TPtr CreateGRpcProxyCounters(NMonitoring::TDynamicCounterPtr appCounters) { +IGRpcProxyCounters::TPtr CreateGRpcProxyCounters(::NMonitoring::TDynamicCounterPtr appCounters) { return MakeIntrusive<TGRpcProxyCounters>(appCounters, false); } TIntrusivePtr<NSysView::IDbCounters> CreateGRpcProxyDbCounters( - NMonitoring::TDynamicCounterPtr externalGroup, - NMonitoring::TDynamicCounterPtr internalGroup) + ::NMonitoring::TDynamicCounterPtr externalGroup, + ::NMonitoring::TDynamicCounterPtr internalGroup) { Y_UNUSED(externalGroup); return MakeIntrusive<TGRpcProxyDbCounters>(internalGroup); diff --git a/ydb/core/grpc_services/counters/proxy_counters.h b/ydb/core/grpc_services/counters/proxy_counters.h index 27e6217465..e0cab10822 100644 --- a/ydb/core/grpc_services/counters/proxy_counters.h +++ b/ydb/core/grpc_services/counters/proxy_counters.h @@ -24,11 +24,11 @@ public: IGRpcProxyCounters::TPtr WrapGRpcProxyDbCounters(IGRpcProxyCounters::TPtr common); -IGRpcProxyCounters::TPtr CreateGRpcProxyCounters(NMonitoring::TDynamicCounterPtr appCounters); +IGRpcProxyCounters::TPtr CreateGRpcProxyCounters(::NMonitoring::TDynamicCounterPtr appCounters); TIntrusivePtr<NSysView::IDbCounters> CreateGRpcProxyDbCounters( - NMonitoring::TDynamicCounterPtr externalGroup, - NMonitoring::TDynamicCounterPtr internalGroup); + ::NMonitoring::TDynamicCounterPtr externalGroup, + ::NMonitoring::TDynamicCounterPtr internalGroup); void InitializeGRpcProxyDbCountersRegistry(TActorSystem* actorSystem); diff --git a/ydb/core/grpc_streaming/grpc_streaming_ut.cpp b/ydb/core/grpc_streaming/grpc_streaming_ut.cpp index fe0b6aec6a..8d1a452513 100644 --- a/ydb/core/grpc_streaming/grpc_streaming_ut.cpp +++ b/ydb/core/grpc_streaming/grpc_streaming_ut.cpp @@ -41,7 +41,7 @@ public: TSelf, 413>; //GRPC_SERVER = 413, services.proto - TStreamingService(TActorSystem* as, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) + TStreamingService(TActorSystem* as, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) : ActorSystem(*as) , Counters(std::move(counters)) { } @@ -78,7 +78,7 @@ public: private: TActorSystem& ActorSystem; - TIntrusivePtr<NMonitoring::TDynamicCounters> const Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> const Counters; grpc::ServerCompletionQueue* CQ = nullptr; NGrpc::TGlobalLimiter* Limiter = nullptr; @@ -101,7 +101,7 @@ public: GRpcServer.Reset(new NGrpc::TGRpcServer(options)); auto* as = Server->GetRuntime()->GetAnyNodeActorSystem(); - TIntrusivePtr<NMonitoring::TDynamicCounters> counters(MakeIntrusive<NMonitoring::TDynamicCounters>()); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters(MakeIntrusive<::NMonitoring::TDynamicCounters>()); GRpcServer->AddService(new TStreamingService<TImplActor>(as, counters)); GRpcServer->Start(); diff --git a/ydb/core/http_proxy/grpc_service.cpp b/ydb/core/http_proxy/grpc_service.cpp index 309e7574e0..5e5c3ce098 100644 --- a/ydb/core/http_proxy/grpc_service.cpp +++ b/ydb/core/http_proxy/grpc_service.cpp @@ -135,7 +135,7 @@ static TString GetSdkBuildInfo(NGrpc::IRequestContextBase* reqCtx) { } TGRpcDiscoveryService::TGRpcDiscoveryService(NActors::TActorSystem *system, std::shared_ptr<NYdb::ICredentialsProvider> credentialsProvider, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) : ActorSystem_(system) , CredentialsProvider_(credentialsProvider) , Counters_(counters) diff --git a/ydb/core/http_proxy/grpc_service.h b/ydb/core/http_proxy/grpc_service.h index 8ff4423778..8d13c3a92c 100644 --- a/ydb/core/http_proxy/grpc_service.h +++ b/ydb/core/http_proxy/grpc_service.h @@ -17,7 +17,7 @@ class TGRpcDiscoveryService { public: TGRpcDiscoveryService(NActors::TActorSystem* system, std::shared_ptr<NYdb::ICredentialsProvider> credentialsProvider, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; void SetGlobalLimiterHandle(NGrpc::TGlobalLimiter* limiter) override; @@ -32,7 +32,7 @@ private: grpc::ServerCompletionQueue* CQ_; std::shared_ptr<NYdb::ICredentialsProvider> CredentialsProvider_; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NGrpc::TGlobalLimiter* Limiter_; }; diff --git a/ydb/core/http_proxy/metrics_actor.h b/ydb/core/http_proxy/metrics_actor.h index 95a80706c3..457ca51494 100644 --- a/ydb/core/http_proxy/metrics_actor.h +++ b/ydb/core/http_proxy/metrics_actor.h @@ -9,7 +9,7 @@ namespace NKikimr::NHttpProxy { struct TMetricsSettings { - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; //TODO: TTL }; diff --git a/ydb/core/kesus/tablet/quoter_resource_tree.cpp b/ydb/core/kesus/tablet/quoter_resource_tree.cpp index 3f9d6e5653..69a1f6c191 100644 --- a/ydb/core/kesus/tablet/quoter_resource_tree.cpp +++ b/ydb/core/kesus/tablet/quoter_resource_tree.cpp @@ -206,7 +206,7 @@ public: void DeactivateIfFull(TInstant now); - void SetResourceCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> resourceCounters) override; + void SetResourceCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> resourceCounters) override; void SetLimitCounter(); @@ -287,7 +287,7 @@ public: ClientId); Active = true; GetResource()->AddActiveChild(this, queue, now); - const NMonitoring::TDynamicCounters::TCounterPtr& activeSessions = GetResource()->GetCounters().ActiveSessions; + const ::NMonitoring::TDynamicCounters::TCounterPtr& activeSessions = GetResource()->GetCounters().ActiveSessions; if (activeSessions) { activeSessions->Inc(); } @@ -302,7 +302,7 @@ public: Active = false; AmountRequested = 0.0; GetResource()->RemoveActiveChild(this); - const NMonitoring::TDynamicCounters::TCounterPtr& activeSessions = GetResource()->GetCounters().ActiveSessions; + const ::NMonitoring::TDynamicCounters::TCounterPtr& activeSessions = GetResource()->GetCounters().ActiveSessions; if (activeSessions) { activeSessions->Dec(); } @@ -517,7 +517,7 @@ void TQuoterResourceTree::CalcParameters() { } } -void TQuoterResourceTree::SetResourceCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> resourceCounters) { +void TQuoterResourceTree::SetResourceCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> resourceCounters) { Counters.SetResourceCounters(std::move(resourceCounters)); } @@ -534,7 +534,7 @@ void TQuoterResourceTree::StopActiveTime(TInstant now) { StartActiveTime = TInstant::Zero(); } -void TQuoterResourceTree::TCounters::SetResourceCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> resourceCounters) { +void TQuoterResourceTree::TCounters::SetResourceCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> resourceCounters) { ResourceCounters = std::move(resourceCounters); if (ResourceCounters) { Allocated = ResourceCounters->GetCounter(ALLOCATED_COUNTER_NAME, true); @@ -929,7 +929,7 @@ THolder<TQuoterSession> THierarhicalDRRQuoterResourceTree::DoCreateSession(const return MakeHolder<THierarhicalDRRQuoterSession>(clientId, this); } -void THierarhicalDRRQuoterResourceTree::SetResourceCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> resourceCounters) { +void THierarhicalDRRQuoterResourceTree::SetResourceCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> resourceCounters) { TQuoterResourceTree::SetResourceCounters(std::move(resourceCounters)); if (RateAccounting) { RateAccounting->SetResourceCounters(Counters.ResourceCounters); @@ -1163,7 +1163,7 @@ void TQuoterResources::SetResourceCounters(TQuoterResourceTree* res) { ); } -void TQuoterResources::SetQuoterCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> quoterCounters) { +void TQuoterResources::SetQuoterCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> quoterCounters) { Counters.QuoterCounters = std::move(quoterCounters); ReinitResourceCounters(); diff --git a/ydb/core/kesus/tablet/quoter_resource_tree.h b/ydb/core/kesus/tablet/quoter_resource_tree.h index bc28e518c3..da22972205 100644 --- a/ydb/core/kesus/tablet/quoter_resource_tree.h +++ b/ydb/core/kesus/tablet/quoter_resource_tree.h @@ -200,7 +200,7 @@ public: virtual ~TQuoterResourceTree() = default; - virtual void SetResourceCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> resourceCounters); + virtual void SetResourceCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> resourceCounters); ui64 GetResourceId() const { return ResourceId; @@ -277,21 +277,21 @@ public: class TCounters { public: - TIntrusivePtr<NMonitoring::TDynamicCounters> ResourceCounters; - NMonitoring::TDynamicCounters::TCounterPtr Sessions; - NMonitoring::TDynamicCounters::TCounterPtr ActiveSessions; - NMonitoring::TDynamicCounters::TCounterPtr Limit; // Current limit according to settings. If resource has no explicit limit, the counter is nullptr. - NMonitoring::TDynamicCounters::TCounterPtr ElapsedMicrosecWhenResourceActive; + TIntrusivePtr<::NMonitoring::TDynamicCounters> ResourceCounters; + ::NMonitoring::TDynamicCounters::TCounterPtr Sessions; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveSessions; + ::NMonitoring::TDynamicCounters::TCounterPtr Limit; // Current limit according to settings. If resource has no explicit limit, the counter is nullptr. + ::NMonitoring::TDynamicCounters::TCounterPtr ElapsedMicrosecWhenResourceActive; void AddAllocated(double allocated); ui64 GetAllocated() const { return Allocated ? Allocated->Val() : 0; } - void SetResourceCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> resourceCounters); + void SetResourceCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> resourceCounters); void SetLimit(TMaybe<double> limit); private: - NMonitoring::TDynamicCounters::TCounterPtr Allocated; + ::NMonitoring::TDynamicCounters::TCounterPtr Allocated; double AllocatedRemainder = 0.0; }; @@ -330,15 +330,15 @@ protected: class TQuoterResources { public: struct TCounters { - TIntrusivePtr<NMonitoring::TDynamicCounters> QuoterCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> QuoterCounters; bool DetailedCountersMode = false; - NMonitoring::TDynamicCounters::TCounterPtr ResourceSubscriptions = MakeIntrusive<NMonitoring::TCounterForPtr>(true); - NMonitoring::TDynamicCounters::TCounterPtr UnknownResourceSubscriptions = MakeIntrusive<NMonitoring::TCounterForPtr>(true); - NMonitoring::TDynamicCounters::TCounterPtr ResourceConsumptionStarts = MakeIntrusive<NMonitoring::TCounterForPtr>(true); - NMonitoring::TDynamicCounters::TCounterPtr ResourceConsumptionStops = MakeIntrusive<NMonitoring::TCounterForPtr>(true); - NMonitoring::TDynamicCounters::TCounterPtr ElapsedMicrosecOnResourceAllocation = MakeIntrusive<NMonitoring::TCounterForPtr>(true); - NMonitoring::TDynamicCounters::TCounterPtr TickProcessorTasksProcessed = MakeIntrusive<NMonitoring::TCounterForPtr>(true); + ::NMonitoring::TDynamicCounters::TCounterPtr ResourceSubscriptions = MakeIntrusive<NMonitoring::TCounterForPtr>(true); + ::NMonitoring::TDynamicCounters::TCounterPtr UnknownResourceSubscriptions = MakeIntrusive<NMonitoring::TCounterForPtr>(true); + ::NMonitoring::TDynamicCounters::TCounterPtr ResourceConsumptionStarts = MakeIntrusive<NMonitoring::TCounterForPtr>(true); + ::NMonitoring::TDynamicCounters::TCounterPtr ResourceConsumptionStops = MakeIntrusive<NMonitoring::TCounterForPtr>(true); + ::NMonitoring::TDynamicCounters::TCounterPtr ElapsedMicrosecOnResourceAllocation = MakeIntrusive<NMonitoring::TCounterForPtr>(true); + ::NMonitoring::TDynamicCounters::TCounterPtr TickProcessorTasksProcessed = MakeIntrusive<NMonitoring::TCounterForPtr>(true); }; public: @@ -354,7 +354,7 @@ public: TQuoterResourceTree* AddResource(ui64 resourceId, const NKikimrKesus::TStreamingQuoterResource& props, TString& errorMessage); bool DeleteResource(TQuoterResourceTree* resource, TString& errorMessage); - void SetQuoterCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> quoterCounters); + void SetQuoterCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> quoterCounters); void EnableDetailedCountersMode(bool enable = true); void FillCounters(NKikimrKesus::TEvGetQuoterResourceCountersResult& counters); diff --git a/ydb/core/kesus/tablet/rate_accounting.cpp b/ydb/core/kesus/tablet/rate_accounting.cpp index 1459eafbc0..7b451232af 100644 --- a/ydb/core/kesus/tablet/rate_accounting.cpp +++ b/ydb/core/kesus/tablet/rate_accounting.cpp @@ -78,7 +78,7 @@ class TBillingMetric { TInstant Accumulated; // start of accumulation `Quantity` // Monitoring - NMonitoring::TDynamicCounters::TCounterPtr Billed; + ::NMonitoring::TDynamicCounters::TCounterPtr Billed; // Configuration NKikimrKesus::TAccountingConfig::TMetric Cfg; @@ -100,7 +100,7 @@ public: return TTimeGrid(TDuration::Seconds(seconds)); } - void SetResourceCounters(const NMonitoring::TDynamicCounters::TCounterPtr& billed) { + void SetResourceCounters(const ::NMonitoring::TDynamicCounters::TCounterPtr& billed) { Billed = billed; } @@ -450,7 +450,7 @@ bool TRateAccounting::RunAccounting() { return accountingRequired || cleaningRequried; } -void TRateAccounting::SetResourceCounters(const TIntrusivePtr<NMonitoring::TDynamicCounters>& resourceCounters) { +void TRateAccounting::SetResourceCounters(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& resourceCounters) { Counters.SetResourceCounters(resourceCounters); TActivationContext::Send(new NActors::IEventHandle(AccountingActor, Kesus, new TEvPrivate::TEvCounters(Counters))); diff --git a/ydb/core/kesus/tablet/rate_accounting.h b/ydb/core/kesus/tablet/rate_accounting.h index 4faa1ea114..d1a8f16d4c 100644 --- a/ydb/core/kesus/tablet/rate_accounting.h +++ b/ydb/core/kesus/tablet/rate_accounting.h @@ -30,12 +30,12 @@ public: IBillSink::TPtr MakeMeteringSink(); struct TRateAccountingCounters { - TIntrusivePtr<NMonitoring::TDynamicCounters> ResourceCounters; - NMonitoring::TDynamicCounters::TCounterPtr Provisioned; - NMonitoring::TDynamicCounters::TCounterPtr OnDemand; - NMonitoring::TDynamicCounters::TCounterPtr Overshoot; + TIntrusivePtr<::NMonitoring::TDynamicCounters> ResourceCounters; + ::NMonitoring::TDynamicCounters::TCounterPtr Provisioned; + ::NMonitoring::TDynamicCounters::TCounterPtr OnDemand; + ::NMonitoring::TDynamicCounters::TCounterPtr Overshoot; - void SetResourceCounters(const TIntrusivePtr<NMonitoring::TDynamicCounters>& resourceCounters) { + void SetResourceCounters(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& resourceCounters) { ResourceCounters = resourceCounters; if (ResourceCounters) { Provisioned = ResourceCounters->GetCounter("Provisioned", true); @@ -82,7 +82,7 @@ public: // Returns true iff there are unsent reports (retry on next tick is required) bool RunAccounting(); - void SetResourceCounters(const TIntrusivePtr<NMonitoring::TDynamicCounters>& resourceCounters); + void SetResourceCounters(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& resourceCounters); private: void ConfigureImpl(); diff --git a/ydb/core/kqp/counters/kqp_counters.cpp b/ydb/core/kqp/counters/kqp_counters.cpp index 7385f21495..12e329f918 100644 --- a/ydb/core/kqp/counters/kqp_counters.cpp +++ b/ydb/core/kqp/counters/kqp_counters.cpp @@ -18,7 +18,7 @@ namespace NKqp { using namespace NYql; -NMonitoring::TDynamicCounterPtr TKqpCountersBase::GetQueryReplayCounters() const { +::NMonitoring::TDynamicCounterPtr TKqpCountersBase::GetQueryReplayCounters() const { return QueryReplayGroup; } @@ -579,15 +579,15 @@ void TKqpCountersBase::ReportRecompileRequestGet() { TKqpDbCounters::TKqpDbCounters() { - Counters = new NMonitoring::TDynamicCounters(); + Counters = new ::NMonitoring::TDynamicCounters(); KqpGroup = Counters->GetSubgroup("group", "kqp"); YdbGroup = Counters->GetSubgroup("group", "ydb"); Init(); } -TKqpDbCounters::TKqpDbCounters(const NMonitoring::TDynamicCounterPtr& externalGroup, - const NMonitoring::TDynamicCounterPtr& internalGroup) +TKqpDbCounters::TKqpDbCounters(const ::NMonitoring::TDynamicCounterPtr& externalGroup, + const ::NMonitoring::TDynamicCounterPtr& internalGroup) { Counters = internalGroup; KqpGroup = Counters; @@ -713,7 +713,7 @@ void TKqpCounters::UpdateTxCounters(const TKqpTransactionInfo& txInfo, byKind->Queries->Collect(txInfo.QueriesCount); } -TKqpCounters::TKqpCounters(const NMonitoring::TDynamicCounterPtr& counters, const TActorContext* ctx) +TKqpCounters::TKqpCounters(const ::NMonitoring::TDynamicCounterPtr& counters, const TActorContext* ctx) : AllocCounters(counters, "kqp") { Counters = counters; @@ -792,7 +792,7 @@ TKqpCounters::TKqpCounters(const NMonitoring::TDynamicCounterPtr& counters, cons "NE/ScanTxTotalTimeMs", NMonitoring::ExponentialHistogram(20, 2, 1)); } -NMonitoring::TDynamicCounterPtr TKqpCounters::GetQueryReplayCounters() const { +::NMonitoring::TDynamicCounterPtr TKqpCounters::GetQueryReplayCounters() const { return QueryReplayGroup; } @@ -1172,11 +1172,11 @@ void TKqpCounters::ReportNewEngineCompatibleQueryStats(NKikimrKqp::EQueryAction } } -const NMonitoring::TDynamicCounters::TCounterPtr TKqpCounters::RecompileRequestGet() const { +const ::NMonitoring::TDynamicCounters::TCounterPtr TKqpCounters::RecompileRequestGet() const { return TKqpCountersBase::CompileRequestsRecompile; } -NMonitoring::TDynamicCounters::TCounterPtr TKqpCounters::GetQueryTypeCounter( +::NMonitoring::TDynamicCounters::TCounterPtr TKqpCounters::GetQueryTypeCounter( NKikimrKqp::EQueryType queryType) { return QueryTypes[queryType]; diff --git a/ydb/core/kqp/counters/kqp_counters.h b/ydb/core/kqp/counters/kqp_counters.h index cbbadf7380..0a8b1bbeb1 100644 --- a/ydb/core/kqp/counters/kqp_counters.h +++ b/ydb/core/kqp/counters/kqp_counters.h @@ -98,36 +98,36 @@ protected: void ReportCompileRequestTimeout(); void ReportCompileDurations(TDuration duration, TDuration cpuTime); void ReportRecompileRequestGet(); - NMonitoring::TDynamicCounterPtr GetQueryReplayCounters() const; + ::NMonitoring::TDynamicCounterPtr GetQueryReplayCounters() const; protected: - NMonitoring::TDynamicCounterPtr Counters; - NMonitoring::TDynamicCounterPtr KqpGroup; - NMonitoring::TDynamicCounterPtr YdbGroup; - NMonitoring::TDynamicCounterPtr QueryReplayGroup; + ::NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr KqpGroup; + ::NMonitoring::TDynamicCounterPtr YdbGroup; + ::NMonitoring::TDynamicCounterPtr QueryReplayGroup; // Requests - THashMap<NKikimrKqp::EQueryAction, NMonitoring::TDynamicCounters::TCounterPtr> QueryActionRequests; - NMonitoring::TDynamicCounters::TCounterPtr OtherQueryRequests; - NMonitoring::TDynamicCounters::TCounterPtr CloseSessionRequests; - NMonitoring::TDynamicCounters::TCounterPtr CreateSessionRequests; - NMonitoring::TDynamicCounters::TCounterPtr PingSessionRequests; - - NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; - NMonitoring::TDynamicCounters::TCounterPtr YdbRequestBytes; - NMonitoring::TDynamicCounters::TCounterPtr QueryBytes; - NMonitoring::TDynamicCounters::TCounterPtr ParametersBytes; - NMonitoring::TDynamicCounters::TCounterPtr YdbParametersBytes; - - NMonitoring::TDynamicCounters::TCounterPtr SqlV0Translations; - NMonitoring::TDynamicCounters::TCounterPtr SqlV1Translations; - NMonitoring::TDynamicCounters::TCounterPtr SqlUnknownTranslations; - - THashMap<NKikimrKqp::EQueryType, NMonitoring::TDynamicCounters::TCounterPtr> QueryTypes; - NMonitoring::TDynamicCounters::TCounterPtr OtherQueryTypes; - - NMonitoring::TDynamicCounters::TCounterPtr QueriesWithRangeScan; - NMonitoring::TDynamicCounters::TCounterPtr QueriesWithFullScan; + THashMap<NKikimrKqp::EQueryAction, ::NMonitoring::TDynamicCounters::TCounterPtr> QueryActionRequests; + ::NMonitoring::TDynamicCounters::TCounterPtr OtherQueryRequests; + ::NMonitoring::TDynamicCounters::TCounterPtr CloseSessionRequests; + ::NMonitoring::TDynamicCounters::TCounterPtr CreateSessionRequests; + ::NMonitoring::TDynamicCounters::TCounterPtr PingSessionRequests; + + ::NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr YdbRequestBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr QueryBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr ParametersBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr YdbParametersBytes; + + ::NMonitoring::TDynamicCounters::TCounterPtr SqlV0Translations; + ::NMonitoring::TDynamicCounters::TCounterPtr SqlV1Translations; + ::NMonitoring::TDynamicCounters::TCounterPtr SqlUnknownTranslations; + + THashMap<NKikimrKqp::EQueryType, ::NMonitoring::TDynamicCounters::TCounterPtr> QueryTypes; + ::NMonitoring::TDynamicCounters::TCounterPtr OtherQueryTypes; + + ::NMonitoring::TDynamicCounters::TCounterPtr QueriesWithRangeScan; + ::NMonitoring::TDynamicCounters::TCounterPtr QueriesWithFullScan; NMonitoring::THistogramPtr QueryAffectedShardsCount; NMonitoring::THistogramPtr QueryReadSetsCount; NMonitoring::THistogramPtr QueryReadBytes; @@ -140,69 +140,69 @@ protected: NMonitoring::THistogramPtr YdbQueryExecuteLatency; // Responses - NMonitoring::TDynamicCounters::TCounterPtr OtherResponses; - NMonitoring::TDynamicCounters::TCounterPtr YdbResponsesLocksInvalidated; + ::NMonitoring::TDynamicCounters::TCounterPtr OtherResponses; + ::NMonitoring::TDynamicCounters::TCounterPtr YdbResponsesLocksInvalidated; - THashMap<Ydb::StatusIds::StatusCode, NMonitoring::TDynamicCounters::TCounterPtr> YdbResponses; - NMonitoring::TDynamicCounters::TCounterPtr OtherYdbResponses; + THashMap<Ydb::StatusIds::StatusCode, ::NMonitoring::TDynamicCounters::TCounterPtr> YdbResponses; + ::NMonitoring::TDynamicCounters::TCounterPtr OtherYdbResponses; - NMonitoring::TDynamicCounters::TCounterPtr ResponseBytes; - NMonitoring::TDynamicCounters::TCounterPtr YdbResponseBytes; - NMonitoring::TDynamicCounters::TCounterPtr QueryResultsBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr ResponseBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr YdbResponseBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr QueryResultsBytes; - THashMap<ui32, NMonitoring::TDynamicCounters::TCounterPtr> IssueCounters; + THashMap<ui32, ::NMonitoring::TDynamicCounters::TCounterPtr> IssueCounters; // Workers NMonitoring::THistogramPtr WorkerLifeSpan; NMonitoring::THistogramPtr QueriesPerWorker; - NMonitoring::TDynamicCounters::TCounterPtr WorkersCreated; - NMonitoring::TDynamicCounters::TCounterPtr WorkersClosedIdle; - NMonitoring::TDynamicCounters::TCounterPtr WorkersClosedError; - NMonitoring::TDynamicCounters::TCounterPtr WorkersClosedRequest; - NMonitoring::TDynamicCounters::TCounterPtr ActiveWorkers; - NMonitoring::TDynamicCounters::TCounterPtr SessionGracefulShutdownHit; - NMonitoring::TDynamicCounters::TCounterPtr SessionBalancerShutdowns; - NMonitoring::TDynamicCounters::TCounterPtr ProxyForwardedRequests; + ::NMonitoring::TDynamicCounters::TCounterPtr WorkersCreated; + ::NMonitoring::TDynamicCounters::TCounterPtr WorkersClosedIdle; + ::NMonitoring::TDynamicCounters::TCounterPtr WorkersClosedError; + ::NMonitoring::TDynamicCounters::TCounterPtr WorkersClosedRequest; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveWorkers; + ::NMonitoring::TDynamicCounters::TCounterPtr SessionGracefulShutdownHit; + ::NMonitoring::TDynamicCounters::TCounterPtr SessionBalancerShutdowns; + ::NMonitoring::TDynamicCounters::TCounterPtr ProxyForwardedRequests; NMonitoring::THistogramPtr WorkerCleanupLatency; // Workers and SessionActors - NMonitoring::TDynamicCounters::TCounterPtr YdbSessionsClosedIdle; - NMonitoring::TDynamicCounters::TCounterPtr YdbSessionsActiveCount; + ::NMonitoring::TDynamicCounters::TCounterPtr YdbSessionsClosedIdle; + ::NMonitoring::TDynamicCounters::TCounterPtr YdbSessionsActiveCount; // SessionActors NMonitoring::THistogramPtr SessionActorLifeSpan; NMonitoring::THistogramPtr QueriesPerSessionActor; - NMonitoring::TDynamicCounters::TCounterPtr SessionActorsCreated; - NMonitoring::TDynamicCounters::TCounterPtr SessionActorsClosedIdle; - //NMonitoring::TDynamicCounters::TCounterPtr YdbSessionActorsClosedIdle; - NMonitoring::TDynamicCounters::TCounterPtr SessionActorsClosedError; - NMonitoring::TDynamicCounters::TCounterPtr SessionActorsClosedRequest; - NMonitoring::TDynamicCounters::TCounterPtr ActiveSessionActors; + ::NMonitoring::TDynamicCounters::TCounterPtr SessionActorsCreated; + ::NMonitoring::TDynamicCounters::TCounterPtr SessionActorsClosedIdle; + //::NMonitoring::TDynamicCounters::TCounterPtr YdbSessionActorsClosedIdle; + ::NMonitoring::TDynamicCounters::TCounterPtr SessionActorsClosedError; + ::NMonitoring::TDynamicCounters::TCounterPtr SessionActorsClosedRequest; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveSessionActors; NMonitoring::THistogramPtr SessionActorCleanupLatency; // Transactions - NMonitoring::TDynamicCounters::TCounterPtr TxCreated; - NMonitoring::TDynamicCounters::TCounterPtr TxAborted; - NMonitoring::TDynamicCounters::TCounterPtr TxCommited; - NMonitoring::TDynamicCounters::TCounterPtr TxEvicted; + ::NMonitoring::TDynamicCounters::TCounterPtr TxCreated; + ::NMonitoring::TDynamicCounters::TCounterPtr TxAborted; + ::NMonitoring::TDynamicCounters::TCounterPtr TxCommited; + ::NMonitoring::TDynamicCounters::TCounterPtr TxEvicted; NMonitoring::THistogramPtr TxActivePerSession; NMonitoring::THistogramPtr TxAbortedPerSession; THashMap<TKqpTransactionInfo::EKind, TYdbTxByKindCounters> YdbTxByKind; // Compile service - NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheHits; - NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheMisses; - NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsCompile; - NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsGet; - NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsInvalidate; - NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsRejected; - NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsTimeout; - NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsRecompile; - NMonitoring::TDynamicCounters::TCounterPtr CompileTotal; - NMonitoring::TDynamicCounters::TCounterPtr CompileErrors; - NMonitoring::TDynamicCounters::TCounterPtr CompileActive; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheHits; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheMisses; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsCompile; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsGet; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsInvalidate; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsRejected; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsTimeout; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileRequestsRecompile; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileTotal; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileErrors; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileActive; NMonitoring::THistogramPtr CompileCpuTime; NMonitoring::THistogramPtr YdbCompileDuration; }; @@ -216,8 +216,8 @@ public: TKqpDbCounters(); // created in SVP, exposed - explicit TKqpDbCounters(const NMonitoring::TDynamicCounterPtr& externalGroup, - const NMonitoring::TDynamicCounterPtr& internalGroup); + explicit TKqpDbCounters(const ::NMonitoring::TDynamicCounterPtr& externalGroup, + const ::NMonitoring::TDynamicCounterPtr& internalGroup); void ToProto(NKikimr::NSysView::TDbServiceCounters& counters) override; void FromProto(NKikimr::NSysView::TDbServiceCounters& counters) override; @@ -261,7 +261,7 @@ private: THashMap<TKqpTransactionInfo::EKind, TTxByKindCounters>& txCounters); public: - explicit TKqpCounters(const NMonitoring::TDynamicCounterPtr& counters, const TActorContext* ctx = nullptr); + explicit TKqpCounters(const ::NMonitoring::TDynamicCounterPtr& counters, const TActorContext* ctx = nullptr); void ReportProxyForwardedRequest(TKqpDbCountersPtr dbCounters); void ReportSessionGracefulShutdownHit(TKqpDbCountersPtr dbCounters); @@ -329,10 +329,10 @@ public: void ReportCompileDurations(TKqpDbCountersPtr dbCounters, TDuration duration, TDuration cpuTime); void ReportRecompileRequestGet(TKqpDbCountersPtr dbCounters); - const NMonitoring::TDynamicCounters::TCounterPtr RecompileRequestGet() const; - NMonitoring::TDynamicCounterPtr GetQueryReplayCounters() const; + const ::NMonitoring::TDynamicCounters::TCounterPtr RecompileRequestGet() const; + ::NMonitoring::TDynamicCounterPtr GetQueryReplayCounters() const; - NMonitoring::TDynamicCounters::TCounterPtr GetQueryTypeCounter(NKikimrKqp::EQueryType queryType); + ::NMonitoring::TDynamicCounters::TCounterPtr GetQueryTypeCounter(NKikimrKqp::EQueryType queryType); TKqpDbCountersPtr GetDbCounters(const TString& database); void RemoveDbCounters(const TString& database); @@ -342,42 +342,42 @@ public: THashMap<TKqpTransactionInfo::EKind, TTxByKindCounters> TxByKind; // Compile service - NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheSize; - NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheBytes; - NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheEvicted; - NMonitoring::TDynamicCounters::TCounterPtr CompileQueueSize; - NMonitoring::TDynamicCounters::TCounterPtr ForceNewEngineCompileErrors; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheSize; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileQueryCacheEvicted; + ::NMonitoring::TDynamicCounters::TCounterPtr CompileQueueSize; + ::NMonitoring::TDynamicCounters::TCounterPtr ForceNewEngineCompileErrors; // Resource Manager - NMonitoring::TDynamicCounters::TCounterPtr RmComputeActors; - NMonitoring::TDynamicCounters::TCounterPtr RmMemory; - NMonitoring::TDynamicCounters::TCounterPtr RmExternalMemory; - NMonitoring::TDynamicCounters::TCounterPtr RmNotEnoughMemory; - NMonitoring::TDynamicCounters::TCounterPtr RmNotEnoughComputeActors; - NMonitoring::TDynamicCounters::TCounterPtr RmExtraMemAllocs; - NMonitoring::TDynamicCounters::TCounterPtr RmInternalError; + ::NMonitoring::TDynamicCounters::TCounterPtr RmComputeActors; + ::NMonitoring::TDynamicCounters::TCounterPtr RmMemory; + ::NMonitoring::TDynamicCounters::TCounterPtr RmExternalMemory; + ::NMonitoring::TDynamicCounters::TCounterPtr RmNotEnoughMemory; + ::NMonitoring::TDynamicCounters::TCounterPtr RmNotEnoughComputeActors; + ::NMonitoring::TDynamicCounters::TCounterPtr RmExtraMemAllocs; + ::NMonitoring::TDynamicCounters::TCounterPtr RmInternalError; // Spilling counters - NMonitoring::TDynamicCounters::TCounterPtr SpillingWriteBlobs; - NMonitoring::TDynamicCounters::TCounterPtr SpillingReadBlobs; - NMonitoring::TDynamicCounters::TCounterPtr SpillingStoredBlobs; - NMonitoring::TDynamicCounters::TCounterPtr SpillingTotalSpaceUsed; - NMonitoring::TDynamicCounters::TCounterPtr SpillingTooBigFileErrors; - NMonitoring::TDynamicCounters::TCounterPtr SpillingNoSpaceErrors; - NMonitoring::TDynamicCounters::TCounterPtr SpillingIoErrors; + ::NMonitoring::TDynamicCounters::TCounterPtr SpillingWriteBlobs; + ::NMonitoring::TDynamicCounters::TCounterPtr SpillingReadBlobs; + ::NMonitoring::TDynamicCounters::TCounterPtr SpillingStoredBlobs; + ::NMonitoring::TDynamicCounters::TCounterPtr SpillingTotalSpaceUsed; + ::NMonitoring::TDynamicCounters::TCounterPtr SpillingTooBigFileErrors; + ::NMonitoring::TDynamicCounters::TCounterPtr SpillingNoSpaceErrors; + ::NMonitoring::TDynamicCounters::TCounterPtr SpillingIoErrors; // Scan queries counters - NMonitoring::TDynamicCounters::TCounterPtr ScanQueryShardDisconnect; - NMonitoring::TDynamicCounters::TCounterPtr ScanQueryShardResolve; + ::NMonitoring::TDynamicCounters::TCounterPtr ScanQueryShardDisconnect; + ::NMonitoring::TDynamicCounters::TCounterPtr ScanQueryShardResolve; NMonitoring::THistogramPtr ScanQueryRateLimitLatency; // NewEngine vs OldEngine THashMap<NKikimrKqp::EQueryAction, NMonitoring::THistogramPtr> NewEngineForcedQueryLatencies; THashMap<NKikimrKqp::EQueryAction, NMonitoring::THistogramPtr> NewEngineCompatibleQueryLatencies; - NMonitoring::TDynamicCounters::TCounterPtr NewEngineForcedComputeCpuTime; - NMonitoring::TDynamicCounters::TCounterPtr NewEngineForcedQueryCount; - NMonitoring::TDynamicCounters::TCounterPtr NewEngineCompatibleComputeCpuTime; - NMonitoring::TDynamicCounters::TCounterPtr NewEngineCompatibleQueryCount; + ::NMonitoring::TDynamicCounters::TCounterPtr NewEngineForcedComputeCpuTime; + ::NMonitoring::TDynamicCounters::TCounterPtr NewEngineForcedQueryCount; + ::NMonitoring::TDynamicCounters::TCounterPtr NewEngineCompatibleComputeCpuTime; + ::NMonitoring::TDynamicCounters::TCounterPtr NewEngineCompatibleQueryCount; // NewEngine tx duration NMonitoring::THistogramPtr LiteralTxTotalTimeHistogram; diff --git a/ydb/core/kqp/node/kqp_node_ut.cpp b/ydb/core/kqp/node/kqp_node_ut.cpp index 6023a0b817..c131bd69f3 100644 --- a/ydb/core/kqp/node/kqp_node_ut.cpp +++ b/ydb/core/kqp/node/kqp_node_ut.cpp @@ -152,7 +152,7 @@ public: auto now = Now(); Runtime->UpdateCurrentTime(now); - Counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + Counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); KqpCounters = MakeIntrusive<TKqpCounters>(Counters); auto resourceBrokerConfig = MakeResourceBrokerTestConfig(); @@ -259,7 +259,7 @@ public: private: THolder<TTestBasicRuntime> Runtime; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TIntrusivePtr<TKqpCounters> KqpCounters; THolder<TMockKqpComputeActorFactory> CompFactory; TActorId ResourceBrokerActorId; diff --git a/ydb/core/kqp/rm/kqp_rm_ut.cpp b/ydb/core/kqp/rm/kqp_rm_ut.cpp index 3ea0e1beb5..197da71a01 100644 --- a/ydb/core/kqp/rm/kqp_rm_ut.cpp +++ b/ydb/core/kqp/rm/kqp_rm_ut.cpp @@ -109,7 +109,7 @@ public: auto now = Now(); Runtime->UpdateCurrentTime(now); - Counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + Counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto resourceBrokerConfig = MakeResourceBrokerTestConfig(); auto broker = CreateResourceBrokerActor(resourceBrokerConfig, Counters); @@ -176,7 +176,7 @@ public: private: THolder<TTestBasicRuntime> Runtime; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; // TIntrusivePtr<TKqpCounters> KqpCounters; TActorId ResourceBrokerActorId; TActorId ResourceManagerActorId; diff --git a/ydb/core/kqp/runtime/kqp_spilling_file_ut.cpp b/ydb/core/kqp/runtime/kqp_spilling_file_ut.cpp index 5802111ba8..c81956398f 100644 --- a/ydb/core/kqp/runtime/kqp_spilling_file_ut.cpp +++ b/ydb/core/kqp/runtime/kqp_spilling_file_ut.cpp @@ -31,8 +31,8 @@ void AssertEquals(const TBuffer& lhs, const TBuffer& rhs) { UNIT_ASSERT_STRINGS_EQUAL(l, r); } -TIntrusivePtr<NMonitoring::TDynamicCounters> Counters() { - static auto counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); +TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters() { + static auto counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); return counters; } diff --git a/ydb/core/kqp/ut/fat/kqp_force_newengine_ut.cpp b/ydb/core/kqp/ut/fat/kqp_force_newengine_ut.cpp index 7a5fd4c286..eb0479aa45 100644 --- a/ydb/core/kqp/ut/fat/kqp_force_newengine_ut.cpp +++ b/ydb/core/kqp/ut/fat/kqp_force_newengine_ut.cpp @@ -422,7 +422,7 @@ public: private: std::unique_ptr<TKikimrRunner> Kikimr; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; std::unique_ptr<TKqpCounters> KqpCounters; }; UNIT_TEST_SUITE_REGISTRATION(KqpForceNewEngine); diff --git a/ydb/core/mind/bscontroller/storage_pool_stat.h b/ydb/core/mind/bscontroller/storage_pool_stat.h index 0e6527f58e..28ffd9f135 100644 --- a/ydb/core/mind/bscontroller/storage_pool_stat.h +++ b/ydb/core/mind/bscontroller/storage_pool_stat.h @@ -7,22 +7,22 @@ namespace NKikimr::NBsController { class TStoragePoolStat { struct TStoragePoolCounters { TString Id; - NMonitoring::TDynamicCounterPtr Root; + ::NMonitoring::TDynamicCounterPtr Root; TString Name; - NMonitoring::TDynamicCounterPtr Subgroup; - NMonitoring::TDynamicCounterPtr FlagsSubgroup; - NMonitoring::TDynamicCounters::TCounterPtr NumUnknown; - NMonitoring::TDynamicCounters::TCounterPtr NumGreen; - NMonitoring::TDynamicCounters::TCounterPtr NumCyan; - NMonitoring::TDynamicCounters::TCounterPtr NumLightYellow; - NMonitoring::TDynamicCounters::TCounterPtr NumYellow; - NMonitoring::TDynamicCounters::TCounterPtr NumLightOrange; - NMonitoring::TDynamicCounters::TCounterPtr NumOrange; - NMonitoring::TDynamicCounters::TCounterPtr NumRed; - NMonitoring::TDynamicCounters::TCounterPtr NumBlack; - NMonitoring::TDynamicCounters::TCounterPtr AllocatedSize; - - TStoragePoolCounters(NMonitoring::TDynamicCounterPtr counters, TString id, TString name, ui64 allocatedSize) + ::NMonitoring::TDynamicCounterPtr Subgroup; + ::NMonitoring::TDynamicCounterPtr FlagsSubgroup; + ::NMonitoring::TDynamicCounters::TCounterPtr NumUnknown; + ::NMonitoring::TDynamicCounters::TCounterPtr NumGreen; + ::NMonitoring::TDynamicCounters::TCounterPtr NumCyan; + ::NMonitoring::TDynamicCounters::TCounterPtr NumLightYellow; + ::NMonitoring::TDynamicCounters::TCounterPtr NumYellow; + ::NMonitoring::TDynamicCounters::TCounterPtr NumLightOrange; + ::NMonitoring::TDynamicCounters::TCounterPtr NumOrange; + ::NMonitoring::TDynamicCounters::TCounterPtr NumRed; + ::NMonitoring::TDynamicCounters::TCounterPtr NumBlack; + ::NMonitoring::TDynamicCounters::TCounterPtr AllocatedSize; + + TStoragePoolCounters(::NMonitoring::TDynamicCounterPtr counters, TString id, TString name, ui64 allocatedSize) : Id(std::move(id)) , Root(std::move(counters)) , Name(std::move(name)) @@ -62,7 +62,7 @@ namespace NKikimr::NBsController { *AllocatedSize += allocatedSizeIncrement; } - const NMonitoring::TDynamicCounters::TCounterPtr& GetCounter(TStorageStatusFlags flags) const { + const ::NMonitoring::TDynamicCounters::TCounterPtr& GetCounter(TStorageStatusFlags flags) const { if (!flags.Check(NKikimrBlobStorage::StatusIsValid)) { return NumUnknown; } else if (flags.Check(NKikimrBlobStorage::StatusDiskSpaceBlack)) { @@ -85,11 +85,11 @@ namespace NKikimr::NBsController { } }; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; std::unordered_map<TString, TStoragePoolCounters> Map; public: - TStoragePoolStat(NMonitoring::TDynamicCounterPtr counters) + TStoragePoolStat(::NMonitoring::TDynamicCounterPtr counters) : Counters(std::move(counters)) {} diff --git a/ydb/core/mind/bscontroller/sys_view.cpp b/ydb/core/mind/bscontroller/sys_view.cpp index 6e7704f6cb..3f828974a5 100644 --- a/ydb/core/mind/bscontroller/sys_view.cpp +++ b/ydb/core/mind/bscontroller/sys_view.cpp @@ -82,7 +82,7 @@ class TSystemViewsCollector : public TActorBootstrapped<TSystemViewsCollector> { TBlobStorageController::THostRecordMap HostRecords; ui32 GroupReserveMin = 0; ui32 GroupReservePart = 0; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; std::unordered_set<std::tuple<TString>> PDiskFilterCounters; std::unordered_set<std::tuple<TString, TString>> ErasureCounters; TActorId StorageStatsCalculatorId; @@ -93,7 +93,7 @@ public: return NKikimrServices::TActivity::BSC_SYSTEM_VIEWS_COLLECTOR; } - TSystemViewsCollector(NMonitoring::TDynamicCounterPtr counters) + TSystemViewsCollector(::NMonitoring::TDynamicCounterPtr counters) : Counters(std::move(counters)) {} diff --git a/ydb/core/mind/labels_maintainer.cpp b/ydb/core/mind/labels_maintainer.cpp index 19138c7d23..36f1cb379a 100644 --- a/ydb/core/mind/labels_maintainer.cpp +++ b/ydb/core/mind/labels_maintainer.cpp @@ -244,8 +244,8 @@ private: auto oldGroup = root->GetSubgroup("counters", svc); if (!subSvc.empty()) oldGroup = oldGroup->GetSubgroup("subsystem", subSvc); - TIntrusivePtr<NMonitoring::TDynamicCounters> serviceGroup = new NMonitoring::TDynamicCounters; - TIntrusivePtr<NMonitoring::TDynamicCounters> curGroup = serviceGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> serviceGroup = new ::NMonitoring::TDynamicCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> curGroup = serviceGroup; const auto* actualLabels = &labels; diff --git a/ydb/core/mind/local.cpp b/ydb/core/mind/local.cpp index 5fc863440e..65f6ff3e00 100644 --- a/ydb/core/mind/local.cpp +++ b/ydb/core/mind/local.cpp @@ -115,25 +115,25 @@ class TLocalNodeRegistrar : public TActorBootstrapped<TLocalNodeRegistrar> { NKikimrTabletBase::TMetrics ResourceLimit; TResourceProfilesPtr ResourceProfiles; TSharedQuotaPtr TxCacheQuota; - NMonitoring::TDynamicCounterPtr Counters; - - NMonitoring::TDynamicCounters::TCounterPtr CounterStartAttempts; - NMonitoring::TDynamicCounters::TCounterPtr CounterFollowerAttempts; - NMonitoring::TDynamicCounters::TCounterPtr CounterRestored; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelLocked; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelSSTimeout; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelRace; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelError; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelBootBSError; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelOutdated; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelBootSSError; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelPoisonPill; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelDemotedBySS; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelBSError; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelInconsistentCommit; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelIsolated; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelDemotedByBS; - NMonitoring::TDynamicCounters::TCounterPtr CounterCancelUnknownReason; + ::NMonitoring::TDynamicCounterPtr Counters; + + ::NMonitoring::TDynamicCounters::TCounterPtr CounterStartAttempts; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterFollowerAttempts; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterRestored; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelLocked; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelSSTimeout; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelRace; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelError; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelBootBSError; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelOutdated; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelBootSSError; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelPoisonPill; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelDemotedBySS; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelBSError; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelInconsistentCommit; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelIsolated; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelDemotedByBS; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterCancelUnknownReason; void Die(const TActorContext &ctx) override { if (HivePipeClient) { @@ -875,7 +875,7 @@ public: TLocalNodeRegistrar(const TActorId &owner, ui64 hiveId, TVector<TSubDomainKey> servicedDomains, const NKikimrTabletBase::TMetrics &resourceLimit, TIntrusivePtr<TLocalConfig> config, - NMonitoring::TDynamicCounterPtr counters) + ::NMonitoring::TDynamicCounterPtr counters) : Owner(owner) , HiveId(hiveId) , ServicedDomains(std::move(servicedDomains)) diff --git a/ydb/core/mind/tenant_slot_broker_impl.h b/ydb/core/mind/tenant_slot_broker_impl.h index b5e3b107ab..ef08bb73b3 100644 --- a/ydb/core/mind/tenant_slot_broker_impl.h +++ b/ydb/core/mind/tenant_slot_broker_impl.h @@ -175,8 +175,8 @@ using NTabletFlatExecutor::TTabletExecutedFlat; using NTabletFlatExecutor::ITransaction; using NTabletFlatExecutor::TTransactionBase; using NTabletFlatExecutor::TTransactionContext; -using NMonitoring::TDynamicCounterPtr; -using NMonitoring::TDynamicCounters; +using ::NMonitoring::TDynamicCounterPtr; +using ::NMonitoring::TDynamicCounters; class TTenantSlotBroker : public TActor<TTenantSlotBroker>, public TTabletExecutedFlat { private: diff --git a/ydb/core/mind/tenant_ut_pool.cpp b/ydb/core/mind/tenant_ut_pool.cpp index 9ac6b6843c..a8a0a7be11 100644 --- a/ydb/core/mind/tenant_ut_pool.cpp +++ b/ydb/core/mind/tenant_ut_pool.cpp @@ -145,7 +145,7 @@ void CheckTenantPoolStatus(TTenantTestRuntime &runtime, CheckTenantPoolStatus(runtime, 0, domain1); } -void CheckLabels(TIntrusivePtr<NMonitoring::TDynamicCounters> counters, +void CheckLabels(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const TString &database, const TString &slot, THashMap<TString, TString> attrs = {}, @@ -501,7 +501,7 @@ Y_UNIT_TEST_SUITE(TTenantPoolTests) { auto serviceGroup = GetServiceCounters(counters, service, false); auto tenantGroup = serviceGroup->FindSubgroup(DATABASE_LABEL, TENANT1_1_NAME); UNIT_ASSERT(tenantGroup); - TIntrusivePtr<NMonitoring::TDynamicCounters> slotGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> slotGroup; if (attrServices.contains(service)) { slotGroup = tenantGroup->FindSubgroup(HOST_LABEL, "slot-1"); } else { @@ -591,7 +591,7 @@ Y_UNIT_TEST_SUITE(TTenantPoolTests) { auto serviceGroup = GetServiceCounters(counters, service, false); auto tenantGroup = serviceGroup->FindSubgroup(DATABASE_LABEL, TENANT1_1_NAME); UNIT_ASSERT(tenantGroup); - NMonitoring::TDynamicCounterPtr slotGroup; + ::NMonitoring::TDynamicCounterPtr slotGroup; if (attrServices.contains(service)) { slotGroup = tenantGroup->FindSubgroup(HOST_LABEL, "slot-1"); } else { @@ -612,7 +612,7 @@ Y_UNIT_TEST_SUITE(TTenantPoolTests) { auto serviceGroup = GetServiceCounters(counters, service, false); auto tenantGroup = serviceGroup->FindSubgroup(DATABASE_LABEL, CanonizePath(DOMAIN1_NAME)); UNIT_ASSERT(tenantGroup); - NMonitoring::TDynamicCounterPtr slotGroup; + ::NMonitoring::TDynamicCounterPtr slotGroup; if (attrServices.contains(service)) { slotGroup = tenantGroup; } else { @@ -633,7 +633,7 @@ Y_UNIT_TEST_SUITE(TTenantPoolTests) { auto serviceGroup = GetServiceCounters(counters, service, false); auto tenantGroup = serviceGroup->FindSubgroup(DATABASE_LABEL, "<none>"); UNIT_ASSERT(tenantGroup); - NMonitoring::TDynamicCounterPtr slotGroup; + ::NMonitoring::TDynamicCounterPtr slotGroup; if (attrServices.contains(service)) { slotGroup = tenantGroup->FindSubgroup(HOST_LABEL, "unassigned"); } else { diff --git a/ydb/core/mon/async_http_mon.cpp b/ydb/core/mon/async_http_mon.cpp index 1337b71f1d..348fea3320 100644 --- a/ydb/core/mon/async_http_mon.cpp +++ b/ydb/core/mon/async_http_mon.cpp @@ -764,7 +764,7 @@ NMonitoring::IMonPage* TAsyncHttpMon::RegisterActorPage(TRegisterActorPageFields return page.Get(); } -NMonitoring::IMonPage* TAsyncHttpMon::RegisterCountersPage(const TString& path, const TString& title, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { +NMonitoring::IMonPage* TAsyncHttpMon::RegisterCountersPage(const TString& path, const TString& title, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { TDynamicCountersPage* page = new TDynamicCountersPage(path, title, counters); page->SetUnknownGroupPolicy(EUnknownGroupPolicy::Ignore); Register(page); diff --git a/ydb/core/mon/async_http_mon.h b/ydb/core/mon/async_http_mon.h index 77938962a4..aff58155b4 100644 --- a/ydb/core/mon/async_http_mon.h +++ b/ydb/core/mon/async_http_mon.h @@ -23,7 +23,7 @@ public: void Register(NMonitoring::IMonPage* page) override; NMonitoring::TIndexMonPage* RegisterIndexPage(const TString& path, const TString& title) override; NMonitoring::IMonPage* RegisterActorPage(TRegisterActorPageFields fields) override; - NMonitoring::IMonPage* RegisterCountersPage(const TString& path, const TString& title, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) override; + NMonitoring::IMonPage* RegisterCountersPage(const TString& path, const TString& title, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) override; NMonitoring::IMonPage* FindPage(const TString& relPath) override; protected: diff --git a/ydb/core/mon/mon.h b/ydb/core/mon/mon.h index 822db0fcdc..8bf82ca724 100644 --- a/ydb/core/mon/mon.h +++ b/ydb/core/mon/mon.h @@ -52,7 +52,7 @@ public: virtual NMonitoring::IMonPage* RegisterActorPage(TRegisterActorPageFields fields) = 0; NMonitoring::IMonPage* RegisterActorPage(NMonitoring::TIndexMonPage* index, const TString& relPath, const TString& title, bool preTag, TActorSystem* actorSystem, const TActorId& actorId, bool useAuth = true); - virtual NMonitoring::IMonPage* RegisterCountersPage(const TString& path, const TString& title, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) = 0; + virtual NMonitoring::IMonPage* RegisterCountersPage(const TString& path, const TString& title, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) = 0; virtual NMonitoring::IMonPage* FindPage(const TString& relPath) = 0; }; diff --git a/ydb/core/mon/sync_http_mon.h b/ydb/core/mon/sync_http_mon.h index 717461e87f..9a61980c77 100644 --- a/ydb/core/mon/sync_http_mon.h +++ b/ydb/core/mon/sync_http_mon.h @@ -21,7 +21,7 @@ public: void Register(NMonitoring::IMonPage *page) override; NMonitoring::TIndexMonPage* RegisterIndexPage(const TString& path, const TString& title) override; NMonitoring::IMonPage* RegisterActorPage(TRegisterActorPageFields fields) override; - NMonitoring::IMonPage* RegisterCountersPage(const TString& path, const TString& title, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) override; + NMonitoring::IMonPage* RegisterCountersPage(const TString& path, const TString& title, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) override; void OutputIndexPage(IOutputStream& out) override; NMonitoring::IMonPage* FindPage(const TString& relPath) override; diff --git a/ydb/core/mon_alloc/monitor.cpp b/ydb/core/mon_alloc/monitor.cpp index f72e136eb3..78037477f3 100644 --- a/ydb/core/mon_alloc/monitor.cpp +++ b/ydb/core/mon_alloc/monitor.cpp @@ -20,8 +20,8 @@ #include <util/stream/str.h> namespace NKikimr { - using TDynamicCountersPtr = TIntrusivePtr<NMonitoring::TDynamicCounters>; - using TDynamicCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TDynamicCountersPtr = TIntrusivePtr<::NMonitoring::TDynamicCounters>; + using TDynamicCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; namespace { class TLfAllocMonitor: public IAllocMonitor { diff --git a/ydb/core/mon_alloc/monitor.h b/ydb/core/mon_alloc/monitor.h index 36b167c5e5..3209e44305 100644 --- a/ydb/core/mon_alloc/monitor.h +++ b/ydb/core/mon_alloc/monitor.h @@ -46,5 +46,5 @@ namespace NKikimr { NActors::IActor* CreateMemProfMonitor( ui32 intervalSec, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters); } diff --git a/ydb/core/mon_alloc/profiler.cpp b/ydb/core/mon_alloc/profiler.cpp index bfff45c180..cc7d9a201e 100644 --- a/ydb/core/mon_alloc/profiler.cpp +++ b/ydb/core/mon_alloc/profiler.cpp @@ -28,8 +28,8 @@ #include <stdio.h> namespace NActors { - using TDynamicCountersPtr = TIntrusivePtr<NMonitoring::TDynamicCounters>; - using TDynamicCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TDynamicCountersPtr = TIntrusivePtr<::NMonitoring::TDynamicCounters>; + using TDynamicCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; namespace { diff --git a/ydb/core/mon_alloc/profiler.h b/ydb/core/mon_alloc/profiler.h index 4fba8941da..fa440b5780 100644 --- a/ydb/core/mon_alloc/profiler.h +++ b/ydb/core/mon_alloc/profiler.h @@ -116,7 +116,7 @@ namespace NActors { } IActor* CreateProfilerActor( - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, TString dir, std::unique_ptr<IProfilerLogic> profiler = nullptr); } diff --git a/ydb/core/mon_alloc/stats.cpp b/ydb/core/mon_alloc/stats.cpp index 050822241c..c8e6844c17 100644 --- a/ydb/core/mon_alloc/stats.cpp +++ b/ydb/core/mon_alloc/stats.cpp @@ -14,8 +14,8 @@ #include <util/datetime/base.h> namespace NKikimr { - using TDynamicCountersPtr = TIntrusivePtr<NMonitoring::TDynamicCounters>; - using TDynamicCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TDynamicCountersPtr = TIntrusivePtr<::NMonitoring::TDynamicCounters>; + using TDynamicCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; namespace { class TLfAllocStats: public IAllocStats { diff --git a/ydb/core/mon_alloc/stats.h b/ydb/core/mon_alloc/stats.h index a5528e5afd..0a54242bb0 100644 --- a/ydb/core/mon_alloc/stats.h +++ b/ydb/core/mon_alloc/stats.h @@ -13,7 +13,7 @@ namespace NKikimr { NActors::IActor* CreateMemStatsCollector( ui32 intervalSec, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters); struct IAllocState { diff --git a/ydb/core/mon_alloc/tcmalloc.cpp b/ydb/core/mon_alloc/tcmalloc.cpp index 14a5e66833..8c3dc6f357 100644 --- a/ydb/core/mon_alloc/tcmalloc.cpp +++ b/ydb/core/mon_alloc/tcmalloc.cpp @@ -15,8 +15,8 @@ using namespace NActors; namespace NKikimr { -using TDynamicCountersPtr = TIntrusivePtr<NMonitoring::TDynamicCounters>; -using TDynamicCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; +using TDynamicCountersPtr = TIntrusivePtr<::NMonitoring::TDynamicCounters>; +using TDynamicCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; using THistogramPtr = NMonitoring::THistogramPtr; static void FormatPrettyNumber(IOutputStream& out, ssize_t val) { diff --git a/ydb/core/mon_alloc/tcmalloc.h b/ydb/core/mon_alloc/tcmalloc.h index db69ea16a8..566cbcbc2d 100644 --- a/ydb/core/mon_alloc/tcmalloc.h +++ b/ydb/core/mon_alloc/tcmalloc.h @@ -7,12 +7,12 @@ namespace NKikimr { std::unique_ptr<IAllocStats> CreateTcMallocStats( - TIntrusivePtr<NMonitoring::TDynamicCounters> group); + TIntrusivePtr<::NMonitoring::TDynamicCounters> group); std::unique_ptr<IAllocState> CreateTcMallocState(); std::unique_ptr<IAllocMonitor> CreateTcMallocMonitor( - TIntrusivePtr<NMonitoring::TDynamicCounters> group); + TIntrusivePtr<::NMonitoring::TDynamicCounters> group); std::unique_ptr<NActors::IProfilerLogic> CreateTcMallocProfiler(); diff --git a/ydb/core/persqueue/percentile_counter.cpp b/ydb/core/persqueue/percentile_counter.cpp index 4a9d63fc9d..54b4242ba5 100644 --- a/ydb/core/persqueue/percentile_counter.cpp +++ b/ydb/core/persqueue/percentile_counter.cpp @@ -7,7 +7,7 @@ namespace NKikimr { namespace NPQ { -TMultiCounter::TMultiCounter(NMonitoring::TDynamicCounterPtr counters, +TMultiCounter::TMultiCounter(::NMonitoring::TDynamicCounterPtr counters, const TVector<NPersQueue::TPQLabelsInfo>& labels, const TVector<std::pair<TString, TString>>& subgroups, const TVector<TString>& counter_names, @@ -63,7 +63,7 @@ TMultiCounter::operator bool() { TPercentileCounter::TPercentileCounter( - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const TVector<NPersQueue::TPQLabelsInfo>& labels, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const TVector<NPersQueue::TPQLabelsInfo>& labels, const TVector<std::pair<TString, TString>>& subgroups, const TString& sensor, const TVector<std::pair<ui64, TString>>& intervals, const bool deriv, bool expiring ) { @@ -102,7 +102,7 @@ void TPercentileCounter::DecFor(ui64 key, ui64 value) { } NKikimr::NPQ::TPercentileCounter CreateSLIDurationCounter( - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, TVector<NPersQueue::TPQLabelsInfo> aggr, const TString name, ui32 border, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, TVector<NPersQueue::TPQLabelsInfo> aggr, const TString name, ui32 border, TVector<ui32> durations ) { bool found = false; diff --git a/ydb/core/persqueue/percentile_counter.h b/ydb/core/persqueue/percentile_counter.h index 06c2b1ae08..21b9e7fc1c 100644 --- a/ydb/core/persqueue/percentile_counter.h +++ b/ydb/core/persqueue/percentile_counter.h @@ -10,7 +10,7 @@ class TMultiCounter { public: TMultiCounter() = default; - TMultiCounter(NMonitoring::TDynamicCounterPtr counters, + TMultiCounter(::NMonitoring::TDynamicCounterPtr counters, const TVector<NPersQueue::TPQLabelsInfo>& labels, const TVector<std::pair<TString, TString>>& subgroups, const TVector<TString>& counter_names, @@ -26,13 +26,13 @@ public: private: ui64 Value = 0; - TVector<NMonitoring::TDynamicCounters::TCounterPtr> Counters; + TVector<::NMonitoring::TDynamicCounters::TCounterPtr> Counters; }; class TPercentileCounter { public: TPercentileCounter() = default; - TPercentileCounter(TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TPercentileCounter(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const TVector<NPersQueue::TPQLabelsInfo>& labels, const TVector<std::pair<TString, TString>>& subgroups, const TString& sensor, @@ -49,7 +49,7 @@ private: }; NKikimr::NPQ::TPercentileCounter CreateSLIDurationCounter( - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, TVector<NPersQueue::TPQLabelsInfo> aggr, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, TVector<NPersQueue::TPQLabelsInfo> aggr, const TString name, ui32 border, TVector<ui32> durations); }// NPQ diff --git a/ydb/core/persqueue/pq_l2_cache.cpp b/ydb/core/persqueue/pq_l2_cache.cpp index 01dfa5caaa..cd12e5bf6a 100644 --- a/ydb/core/persqueue/pq_l2_cache.cpp +++ b/ydb/core/persqueue/pq_l2_cache.cpp @@ -4,7 +4,7 @@ namespace NKikimr { namespace NPQ { -IActor* CreateNodePersQueueL2Cache(const TCacheL2Parameters& params, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) +IActor* CreateNodePersQueueL2Cache(const TCacheL2Parameters& params, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { return new TPersQueueCacheL2(params, counters); } diff --git a/ydb/core/persqueue/pq_l2_cache.h b/ydb/core/persqueue/pq_l2_cache.h index 2ec6e97ced..07fae217d3 100644 --- a/ydb/core/persqueue/pq_l2_cache.h +++ b/ydb/core/persqueue/pq_l2_cache.h @@ -15,17 +15,17 @@ namespace NPQ { static const ui32 MAX_BLOB_SIZE = 8_MB; struct TL2Counters { - NMonitoring::TDynamicCounters::TCounterPtr TotalSize; - NMonitoring::TDynamicCounters::TCounterPtr TotalCount; - NMonitoring::TDynamicCounters::TCounterPtr Hits; - NMonitoring::TDynamicCounters::TCounterPtr Misses; - NMonitoring::TDynamicCounters::TCounterPtr Touches; - NMonitoring::TDynamicCounters::TCounterPtr Evictions; - NMonitoring::TDynamicCounters::TCounterPtr Used; - NMonitoring::TDynamicCounters::TCounterPtr Unused; - NMonitoring::TDynamicCounters::TCounterPtr Retention; - - TL2Counters(TIntrusivePtr<NMonitoring::TDynamicCounters> group) + ::NMonitoring::TDynamicCounters::TCounterPtr TotalSize; + ::NMonitoring::TDynamicCounters::TCounterPtr TotalCount; + ::NMonitoring::TDynamicCounters::TCounterPtr Hits; + ::NMonitoring::TDynamicCounters::TCounterPtr Misses; + ::NMonitoring::TDynamicCounters::TCounterPtr Touches; + ::NMonitoring::TDynamicCounters::TCounterPtr Evictions; + ::NMonitoring::TDynamicCounters::TCounterPtr Used; + ::NMonitoring::TDynamicCounters::TCounterPtr Unused; + ::NMonitoring::TDynamicCounters::TCounterPtr Retention; + + TL2Counters(TIntrusivePtr<::NMonitoring::TDynamicCounters> group) { TotalSize = group->GetCounter("NodeCacheSizeBytes", false); TotalCount = group->GetCounter("NodeCacheSizeBlobs", false); @@ -77,7 +77,7 @@ public: return NKikimrServices::TActivity::PERSQUEUE_CACHE_L2_ACTOR; } - TPersQueueCacheL2(const TCacheL2Parameters& params, TIntrusivePtr<NMonitoring::TDynamicCounters> countersGroup) + TPersQueueCacheL2(const TCacheL2Parameters& params, TIntrusivePtr<::NMonitoring::TDynamicCounters> countersGroup) : Cache(1_TB / MAX_BLOB_SIZE) // It's some "much bigger then we need" size here. , MaxSize(ClampMinSize(params.MaxSizeMB * 1_MB)) , CurrentSize(0) diff --git a/ydb/core/persqueue/pq_l2_service.h b/ydb/core/persqueue/pq_l2_service.h index a9c5eefd16..40a6cd85c5 100644 --- a/ydb/core/persqueue/pq_l2_service.h +++ b/ydb/core/persqueue/pq_l2_service.h @@ -19,7 +19,7 @@ struct TCacheL2Parameters { TDuration KeepTime; }; -IActor* CreateNodePersQueueL2Cache(const TCacheL2Parameters&, TIntrusivePtr<NMonitoring::TDynamicCounters>); +IActor* CreateNodePersQueueL2Cache(const TCacheL2Parameters&, TIntrusivePtr<::NMonitoring::TDynamicCounters>); // diff --git a/ydb/core/persqueue/working_time_counter.h b/ydb/core/persqueue/working_time_counter.h index 4f4d81d263..78e75a2685 100644 --- a/ydb/core/persqueue/working_time_counter.h +++ b/ydb/core/persqueue/working_time_counter.h @@ -11,11 +11,11 @@ namespace NPQ { class TWorkingTimeCounter { private: bool IsInWorkingState; - NMonitoring::TDynamicCounters::TCounterPtr WorkingTimeMicroSec; + ::NMonitoring::TDynamicCounters::TCounterPtr WorkingTimeMicroSec; TInstant LastUpdateTimestamp; public: - TWorkingTimeCounter(NMonitoring::TDynamicCounters::TCounterPtr counter) + TWorkingTimeCounter(::NMonitoring::TDynamicCounters::TCounterPtr counter) : IsInWorkingState(false) , WorkingTimeMicroSec(counter) {} @@ -36,7 +36,7 @@ public: } } - void SetCounter(NMonitoring::TDynamicCounterPtr counter, + void SetCounter(::NMonitoring::TDynamicCounterPtr counter, const TVector<std::pair<TString, TString>>& subgroups, const std::tuple<TString, TString, bool>& expiring) { for (const auto& subgroup : subgroups) { diff --git a/ydb/core/quoter/kesus_quoter_proxy.cpp b/ydb/core/quoter/kesus_quoter_proxy.cpp index 4d2d20691e..cc4a854e99 100644 --- a/ydb/core/quoter/kesus_quoter_proxy.cpp +++ b/ydb/core/quoter/kesus_quoter_proxy.cpp @@ -76,12 +76,12 @@ class TKesusQuoterProxy : public TActorBootstrapped<TKesusQuoterProxy> { public: TDoubleCounter() = default; - TDoubleCounter(NMonitoring::TDynamicCounters::TCounterPtr counter) + TDoubleCounter(::NMonitoring::TDynamicCounters::TCounterPtr counter) : Counter(std::move(counter)) { } - TDoubleCounter& operator=(NMonitoring::TDynamicCounters::TCounterPtr counter) { + TDoubleCounter& operator=(::NMonitoring::TDynamicCounters::TCounterPtr counter) { Counter = std::move(counter); return *this; } @@ -97,19 +97,19 @@ class TKesusQuoterProxy : public TActorBootstrapped<TKesusQuoterProxy> { } private: - NMonitoring::TDynamicCounters::TCounterPtr Counter; + ::NMonitoring::TDynamicCounters::TCounterPtr Counter; double Remainder = 0.0; }; - std::vector<NMonitoring::TDynamicCounters::TCounterPtr> ParentConsumed; // Aggregated consumed counters for parent resources. - NMonitoring::TDynamicCounters::TCounterPtr QueueSize; - NMonitoring::TDynamicCounters::TCounterPtr QueueWeight; - NMonitoring::TDynamicCounters::TCounterPtr Dropped; - NMonitoring::TDynamicCounters::TCounterPtr Accumulated; + std::vector<::NMonitoring::TDynamicCounters::TCounterPtr> ParentConsumed; // Aggregated consumed counters for parent resources. + ::NMonitoring::TDynamicCounters::TCounterPtr QueueSize; + ::NMonitoring::TDynamicCounters::TCounterPtr QueueWeight; + ::NMonitoring::TDynamicCounters::TCounterPtr Dropped; + ::NMonitoring::TDynamicCounters::TCounterPtr Accumulated; TDoubleCounter AllocatedOffline; TDoubleCounter ReceivedFromKesus; - TCounters(const TString& resource, const NMonitoring::TDynamicCounterPtr& quoterCounters) { + TCounters(const TString& resource, const ::NMonitoring::TDynamicCounterPtr& quoterCounters) { if (!quoterCounters) { return; } @@ -133,7 +133,7 @@ class TKesusQuoterProxy : public TActorBootstrapped<TKesusQuoterProxy> { } void AddConsumed(ui64 consumed) { - for (NMonitoring::TDynamicCounters::TCounterPtr& counter : ParentConsumed) { + for (::NMonitoring::TDynamicCounters::TCounterPtr& counter : ParentConsumed) { *counter += consumed; } } @@ -141,7 +141,7 @@ class TKesusQuoterProxy : public TActorBootstrapped<TKesusQuoterProxy> { TCounters Counters; - explicit TResourceState(const TString& resource, const NMonitoring::TDynamicCounterPtr& quoterCounters) + explicit TResourceState(const TString& resource, const ::NMonitoring::TDynamicCounterPtr& quoterCounters) : Resource(resource) , Counters(resource, quoterCounters) {} @@ -265,12 +265,12 @@ class TKesusQuoterProxy : public TActorBootstrapped<TKesusQuoterProxy> { THashMap<TDuration, THolder<TEvPrivate::TEvOfflineResourceAllocation>> OfflineAllocationEvSchedule; struct TCounters { - NMonitoring::TDynamicCounterPtr QuoterCounters; + ::NMonitoring::TDynamicCounterPtr QuoterCounters; - NMonitoring::TDynamicCounters::TCounterPtr Disconnects; + ::NMonitoring::TDynamicCounters::TCounterPtr Disconnects; void Init(const TString& quoterPath) { - TIntrusivePtr<NMonitoring::TDynamicCounters> serviceCounters = GetServiceCounters(AppData()->Counters, QUOTER_SERVICE_COUNTER_SENSOR_NAME); + TIntrusivePtr<::NMonitoring::TDynamicCounters> serviceCounters = GetServiceCounters(AppData()->Counters, QUOTER_SERVICE_COUNTER_SENSOR_NAME); if (serviceCounters) { QuoterCounters = serviceCounters->GetSubgroup(QUOTER_COUNTER_SENSOR_NAME, quoterPath); Disconnects = QuoterCounters->GetCounter(DISCONNECTS_COUNTER_SENSOR_NAME, true); diff --git a/ydb/core/quoter/quoter_service.cpp b/ydb/core/quoter/quoter_service.cpp index b9a1b629f5..b6cb58d2f5 100644 --- a/ydb/core/quoter/quoter_service.cpp +++ b/ydb/core/quoter/quoter_service.cpp @@ -364,7 +364,7 @@ TInstant TQuoterService::TimeToGranularity(TInstant rawTime) { } void TQuoterService::Bootstrap() { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = GetServiceCounters(AppData()->Counters, QUOTER_SERVICE_COUNTER_SENSOR_NAME); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = GetServiceCounters(AppData()->Counters, QUOTER_SERVICE_COUNTER_SENSOR_NAME); Counters.ActiveQuoterProxies = counters->GetCounter("ActiveQuoterProxies", false); Counters.ActiveProxyResources = counters->GetCounter("ActiveProxyResources", false); diff --git a/ydb/core/quoter/quoter_service_impl.h b/ydb/core/quoter/quoter_service_impl.h index d27ea134e1..98eb1525ad 100644 --- a/ydb/core/quoter/quoter_service_impl.h +++ b/ydb/core/quoter/quoter_service_impl.h @@ -150,15 +150,15 @@ struct TResource { TInstant StartStarvationTime = TInstant::Zero(); struct { - NMonitoring::TDynamicCounters::TCounterPtr Consumed; - NMonitoring::TDynamicCounters::TCounterPtr Requested; - NMonitoring::TDynamicCounters::TCounterPtr RequestsCount; - NMonitoring::TDynamicCounters::TCounterPtr ElapsedMicrosecInStarvation; + ::NMonitoring::TDynamicCounters::TCounterPtr Consumed; + ::NMonitoring::TDynamicCounters::TCounterPtr Requested; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestsCount; + ::NMonitoring::TDynamicCounters::TCounterPtr ElapsedMicrosecInStarvation; NMonitoring::THistogramPtr RequestQueueTime; NMonitoring::THistogramPtr RequestTime; } Counters; - TResource(ui64 quoterId, ui64 resourceId, const TString& quoter, const TString& resource, const TQuoterServiceConfig "erServiceConfig, const NMonitoring::TDynamicCounterPtr& quoterCounters) + TResource(ui64 quoterId, ui64 resourceId, const TString& quoter, const TString& resource, const TQuoterServiceConfig "erServiceConfig, const ::NMonitoring::TDynamicCounterPtr& quoterCounters) : QuoterId(quoterId) , ResourceId(resourceId) , Quoter(quoter) @@ -199,17 +199,17 @@ struct TQuoterState { TMap<TString, TSet<ui32>> WaitingResource; // => requests struct { - NMonitoring::TDynamicCounterPtr QuoterCounters; + ::NMonitoring::TDynamicCounterPtr QuoterCounters; } Counters; TResource& GetOrCreate(ui64 quoterId, ui64 resId, const TString& quoter, const TString& resource, const TQuoterServiceConfig "erServiceConfig); bool Empty(); - void InitCounters(const NMonitoring::TDynamicCounterPtr& serviceCounters) { + void InitCounters(const ::NMonitoring::TDynamicCounterPtr& serviceCounters) { Counters.QuoterCounters = serviceCounters->GetSubgroup(QUOTER_COUNTER_SENSOR_NAME, QuoterName); } - TQuoterState(const TString& quoterName, const NMonitoring::TDynamicCounterPtr& serviceCounters) + TQuoterState(const TString& quoterName, const ::NMonitoring::TDynamicCounterPtr& serviceCounters) : QuoterName(quoterName) { if (serviceCounters) { @@ -241,15 +241,15 @@ class TQuoterService : public TActorBootstrapped<TQuoterService> { TMap<ui64, TDeque<TEvQuota::TProxyStat>> StatsToPublish; // quoterId -> stats struct { - NMonitoring::TDynamicCounterPtr ServiceCounters; - NMonitoring::TDynamicCounters::TCounterPtr ActiveQuoterProxies; - NMonitoring::TDynamicCounters::TCounterPtr ActiveProxyResources; - NMonitoring::TDynamicCounters::TCounterPtr KnownLocalResources; - NMonitoring::TDynamicCounters::TCounterPtr RequestsInFly; - NMonitoring::TDynamicCounters::TCounterPtr Requests; - NMonitoring::TDynamicCounters::TCounterPtr ResultOk; - NMonitoring::TDynamicCounters::TCounterPtr ResultDeadline; - NMonitoring::TDynamicCounters::TCounterPtr ResultError; + ::NMonitoring::TDynamicCounterPtr ServiceCounters; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveQuoterProxies; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveProxyResources; + ::NMonitoring::TDynamicCounters::TCounterPtr KnownLocalResources; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestsInFly; + ::NMonitoring::TDynamicCounters::TCounterPtr Requests; + ::NMonitoring::TDynamicCounters::TCounterPtr ResultOk; + ::NMonitoring::TDynamicCounters::TCounterPtr ResultDeadline; + ::NMonitoring::TDynamicCounters::TCounterPtr ResultError; NMonitoring::THistogramPtr RequestLatency; } Counters; diff --git a/ydb/core/security/ticket_parser.cpp b/ydb/core/security/ticket_parser.cpp index 5654a8310b..58e79d644f 100644 --- a/ydb/core/security/ticket_parser.cpp +++ b/ydb/core/security/ticket_parser.cpp @@ -24,15 +24,15 @@ class TTicketParser : public TActorBootstrapped<TTicketParser> { NKikimrProto::TAuthConfig Config; TString DomainName; - NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsReceived; - NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsSuccess; - NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsErrors; - NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsErrorsRetryable; - NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsErrorsPermanent; - NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsBuiltin; - NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsLogin; - NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsCacheHit; - NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsCacheMiss; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsReceived; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsSuccess; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsErrors; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsErrorsRetryable; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsErrorsPermanent; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsBuiltin; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsLogin; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsCacheHit; + ::NMonitoring::TDynamicCounters::TCounterPtr CounterTicketsCacheMiss; NMonitoring::THistogramPtr CounterTicketsBuildTime; TDuration RefreshPeriod = TDuration::Seconds(1); // how often do we check for ticket freshness/expiration @@ -572,9 +572,9 @@ public: } void Bootstrap(const TActorContext& ctx) { - TIntrusivePtr<NMonitoring::TDynamicCounters> rootCounters = AppData(ctx)->Counters; - TIntrusivePtr<NMonitoring::TDynamicCounters> authCounters = GetServiceCounters(rootCounters, "auth"); - NMonitoring::TDynamicCounterPtr counters = authCounters->GetSubgroup("subsystem", "TicketParser"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> rootCounters = AppData(ctx)->Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> authCounters = GetServiceCounters(rootCounters, "auth"); + ::NMonitoring::TDynamicCounterPtr counters = authCounters->GetSubgroup("subsystem", "TicketParser"); CounterTicketsReceived = counters->GetCounter("TicketsReceived", true); CounterTicketsSuccess = counters->GetCounter("TicketsSuccess", true); CounterTicketsErrors = counters->GetCounter("TicketsErrors", true); diff --git a/ydb/core/sys_view/processor/processor_impl.cpp b/ydb/core/sys_view/processor/processor_impl.cpp index f6566b07e3..f3c5437984 100644 --- a/ydb/core/sys_view/processor/processor_impl.cpp +++ b/ydb/core/sys_view/processor/processor_impl.cpp @@ -13,11 +13,11 @@ TSysViewProcessor::TSysViewProcessor(const TActorId& tablet, TTabletStorageInfo* , TTabletExecutedFlat(info, tablet, new NMiniKQL::TMiniKQLFactory) , TotalInterval(TDuration::Seconds(processorMode == EProcessorMode::FAST ? 1 : 60)) , CollectInterval(TotalInterval / 2) - , ExternalGroup(new NMonitoring::TDynamicCounters) + , ExternalGroup(new ::NMonitoring::TDynamicCounters) { - InternalGroups["kqp_serverless"] = new NMonitoring::TDynamicCounters; - InternalGroups["tablets_serverless"] = new NMonitoring::TDynamicCounters; - InternalGroups["grpc_serverless"] = new NMonitoring::TDynamicCounters; + InternalGroups["kqp_serverless"] = new ::NMonitoring::TDynamicCounters; + InternalGroups["tablets_serverless"] = new ::NMonitoring::TDynamicCounters; + InternalGroups["grpc_serverless"] = new ::NMonitoring::TDynamicCounters; } void TSysViewProcessor::OnDetach(const TActorContext& ctx) { diff --git a/ydb/core/sys_view/processor/processor_impl.h b/ydb/core/sys_view/processor/processor_impl.h index 1211671c30..3867fd457a 100644 --- a/ydb/core/sys_view/processor/processor_impl.h +++ b/ydb/core/sys_view/processor/processor_impl.h @@ -354,8 +354,8 @@ private: TString FolderId; TString DatabaseId; - NMonitoring::TDynamicCounterPtr ExternalGroup; - std::unordered_map<TString, NMonitoring::TDynamicCounterPtr> InternalGroups; + ::NMonitoring::TDynamicCounterPtr ExternalGroup; + std::unordered_map<TString, ::NMonitoring::TDynamicCounterPtr> InternalGroups; using TDbCountersServiceMap = std::unordered_map<NKikimrSysView::EDbCountersService, NKikimr::NSysView::TDbServiceCounters>; diff --git a/ydb/core/sys_view/service/ext_counters.cpp b/ydb/core/sys_view/service/ext_counters.cpp index bebbd04786..9b6a8eb314 100644 --- a/ydb/core/sys_view/service/ext_counters.cpp +++ b/ydb/core/sys_view/service/ext_counters.cpp @@ -9,7 +9,7 @@ namespace NSysView { class TExtCountersUpdaterActor : public TActorBootstrapped<TExtCountersUpdaterActor> { - using TCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; const TExtCountersConfig Config; diff --git a/ydb/core/sys_view/ut_counters.cpp b/ydb/core/sys_view/ut_counters.cpp index 7be8de4eed..51bc0c4965 100644 --- a/ydb/core/sys_view/ut_counters.cpp +++ b/ydb/core/sys_view/ut_counters.cpp @@ -81,10 +81,10 @@ Y_UNIT_TEST_SUITE(DbCounters) { for (size_t iter = 0; iter < 30; ++iter) { Cerr << "iteration " << iter << Endl; - auto checkTabletCounters = [] (NMonitoring::TDynamicCounterPtr databaseGroup, + auto checkTabletCounters = [] (::NMonitoring::TDynamicCounterPtr databaseGroup, const char* databaseName) { - auto checkCounter = [databaseName] (NMonitoring::TDynamicCounterPtr group, + auto checkCounter = [databaseName] (::NMonitoring::TDynamicCounterPtr group, const char* sensorName, bool isDerivative) { auto value = group->GetCounter(sensorName, isDerivative)->Val(); diff --git a/ydb/core/tablet/node_whiteboard.cpp b/ydb/core/tablet/node_whiteboard.cpp index 11a2abdfae..50e1648690 100644 --- a/ydb/core/tablet/node_whiteboard.cpp +++ b/ydb/core/tablet/node_whiteboard.cpp @@ -38,8 +38,8 @@ public: } void Bootstrap(const TActorContext &ctx) { - TIntrusivePtr<NMonitoring::TDynamicCounters> tabletsGroup = GetServiceCounters(AppData(ctx)->Counters, "tablets"); - TIntrusivePtr<NMonitoring::TDynamicCounters> introspectionGroup = tabletsGroup->GetSubgroup("type", "introspection"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> tabletsGroup = GetServiceCounters(AppData(ctx)->Counters, "tablets"); + TIntrusivePtr<::NMonitoring::TDynamicCounters> introspectionGroup = tabletsGroup->GetSubgroup("type", "introspection"); TabletIntrospectionData.Reset(NTracing::CreateTraceCollection(introspectionGroup)); SystemStateInfo.SetNumberOfCpus(NSystemInfo::NumberOfCpus()); @@ -648,12 +648,12 @@ protected: // void Handle(TEvWhiteboard::TEvNodeStateRequest::TPtr &ev, const TActorContext &ctx) { // TAutoPtr<TEvWhiteboard::TEvNodeStateResponse> response = new TEvWhiteboard::TEvNodeStateResponse(); // auto& record = response->Record; -// const TIntrusivePtr<NMonitoring::TDynamicCounters> &counters = AppData(ctx)->Counters; -// TIntrusivePtr<NMonitoring::TDynamicCounters> interconnectCounters = GetServiceCounters(counters, "interconnect"); +// const TIntrusivePtr<::NMonitoring::TDynamicCounters> &counters = AppData(ctx)->Counters; +// TIntrusivePtr<::NMonitoring::TDynamicCounters> interconnectCounters = GetServiceCounters(counters, "interconnect"); // interconnectCounters->EnumerateSubgroups([&record, &interconnectCounters](const TString &name, const TString &value) -> void { // NKikimrWhiteboard::TNodeStateInfo &nodeStateInfo = *record.AddNodeStateInfo(); -// TIntrusivePtr<NMonitoring::TDynamicCounters> peerCounters = interconnectCounters->GetSubgroup(name, value); -// NMonitoring::TDynamicCounters::TCounterPtr connectedCounter = peerCounters->GetCounter("Connected"); +// TIntrusivePtr<::NMonitoring::TDynamicCounters> peerCounters = interconnectCounters->GetSubgroup(name, value); +// ::NMonitoring::TDynamicCounters::TCounterPtr connectedCounter = peerCounters->GetCounter("Connected"); // nodeStateInfo.SetPeerName(value); // nodeStateInfo.SetConnected(connectedCounter->Val()); // }); diff --git a/ydb/core/tablet/resource_broker.cpp b/ydb/core/tablet/resource_broker.cpp index effe8256fe..4ff2abcd09 100644 --- a/ydb/core/tablet/resource_broker.cpp +++ b/ydb/core/tablet/resource_broker.cpp @@ -84,7 +84,7 @@ void TTask::OutputState(IOutputStream &os, const TString &prefix) const << prefix << " FinishTime: " << FinishTime.ToStringLocalUpToSeconds() << Endl; } -TBaseCounters::TBaseCounters(const NMonitoring::TDynamicCounterPtr &counters) +TBaseCounters::TBaseCounters(const ::NMonitoring::TDynamicCounterPtr &counters) { Consumption[CPU] = counters->GetCounter("CPUConsumption"); Consumption[MEMORY] = counters->GetCounter("MemoryConsumption"); @@ -105,12 +105,12 @@ void TBaseCounters::ReleaseResources(const TResourceValues &values) *Consumption[i] -= values[i]; } -TQueueCounters::TQueueCounters(const NMonitoring::TDynamicCounterPtr &counters) +TQueueCounters::TQueueCounters(const ::NMonitoring::TDynamicCounterPtr &counters) : TBaseCounters(counters) { } -TTaskCounters::TTaskCounters(const NMonitoring::TDynamicCounterPtr &counters) +TTaskCounters::TTaskCounters(const ::NMonitoring::TDynamicCounterPtr &counters) : TBaseCounters(counters) { } @@ -156,7 +156,7 @@ bool TTaskQueue::TTaskEarlier::operator()(const TTaskPtr &l, } TTaskQueue::TTaskQueue(const NKikimrResourceBroker::TQueueConfig &config, - const NMonitoring::TDynamicCounterPtr &counters, + const ::NMonitoring::TDynamicCounterPtr &counters, TResourceLimitPtr totalLimit, TQueueCountersPtr totalCounters) : Name(config.GetName()) @@ -360,7 +360,7 @@ TScheduler::TTaskConfig::TTaskConfig(const TString &name, { } -TScheduler::TScheduler(const NMonitoring::TDynamicCounterPtr &counters) +TScheduler::TScheduler(const ::NMonitoring::TDynamicCounterPtr &counters) : Counters(counters) , TotalCounters(new TQueueCounters(counters->GetSubgroup("queue", "total"))) , MissingTaskTypeCounter(counters->GetCounter("MissingTaskType", true)) @@ -800,7 +800,7 @@ void TScheduler::OutputState(IOutputStream &os) const } TResourceBroker::TResourceBroker(const TResourceBrokerConfig &config, - const NMonitoring::TDynamicCounterPtr &counters, + const ::NMonitoring::TDynamicCounterPtr &counters, TActorSystem *actorSystem) : Config(config) , Scheduler(counters) @@ -1096,7 +1096,7 @@ void TResourceBroker::OutputState(TStringStream& str) } TResourceBrokerActor::TResourceBrokerActor(const TResourceBrokerConfig &config, - const NMonitoring::TDynamicCounterPtr &counters) + const ::NMonitoring::TDynamicCounterPtr &counters) : Config(config) , Counters(counters) { @@ -1558,7 +1558,7 @@ void MergeConfigUpdates( IActor* CreateResourceBrokerActor(const NKikimrResourceBroker::TResourceBrokerConfig &config, - const NMonitoring::TDynamicCounterPtr &counters) + const ::NMonitoring::TDynamicCounterPtr &counters) { return new TResourceBrokerActor(config, counters); } diff --git a/ydb/core/tablet/resource_broker.h b/ydb/core/tablet/resource_broker.h index 095702cc19..855a734ddf 100644 --- a/ydb/core/tablet/resource_broker.h +++ b/ydb/core/tablet/resource_broker.h @@ -234,7 +234,7 @@ void MergeConfigUpdates(NKikimrResourceBroker::TResourceBrokerConfig &config, const NKikimrResourceBroker::TResourceBrokerConfig &updates); IActor* CreateResourceBrokerActor(const NKikimrResourceBroker::TResourceBrokerConfig &config, - const NMonitoring::TDynamicCounterPtr& counters); + const ::NMonitoring::TDynamicCounterPtr& counters); } // NResourceBroker } // NKikimr diff --git a/ydb/core/tablet/resource_broker_impl.h b/ydb/core/tablet/resource_broker_impl.h index 2c781692f6..42ef140626 100644 --- a/ydb/core/tablet/resource_broker_impl.h +++ b/ydb/core/tablet/resource_broker_impl.h @@ -92,7 +92,7 @@ using TTaskPtr = TIntrusivePtr<TTask>; class TBaseCounters : public TThrRefBase { public: TBaseCounters() = default; - TBaseCounters(const NMonitoring::TDynamicCounterPtr &counters); + TBaseCounters(const ::NMonitoring::TDynamicCounterPtr &counters); TBaseCounters(const TBaseCounters &other) = default; TBaseCounters(TBaseCounters &&other) = default; @@ -103,10 +103,10 @@ public: void ReleaseResources(const TResourceValues &values); public: - std::array<NMonitoring::TDynamicCounters::TCounterPtr, RESOURCE_COUNT> Consumption; - NMonitoring::TDynamicCounters::TCounterPtr FinishedTasks; - NMonitoring::TDynamicCounters::TCounterPtr EnqueuedTasks; - NMonitoring::TDynamicCounters::TCounterPtr InFlyTasks; + std::array<::NMonitoring::TDynamicCounters::TCounterPtr, RESOURCE_COUNT> Consumption; + ::NMonitoring::TDynamicCounters::TCounterPtr FinishedTasks; + ::NMonitoring::TDynamicCounters::TCounterPtr EnqueuedTasks; + ::NMonitoring::TDynamicCounters::TCounterPtr InFlyTasks; }; /** @@ -114,7 +114,7 @@ public: */ class TQueueCounters : public TBaseCounters { public: - TQueueCounters(const NMonitoring::TDynamicCounterPtr &counters); + TQueueCounters(const ::NMonitoring::TDynamicCounterPtr &counters); }; using TQueueCountersPtr = TIntrusivePtr<TQueueCounters>; @@ -124,7 +124,7 @@ using TQueueCountersPtr = TIntrusivePtr<TQueueCounters>; class TTaskCounters : public TBaseCounters { public: TTaskCounters() = default; - TTaskCounters(const NMonitoring::TDynamicCounterPtr &counters); + TTaskCounters(const ::NMonitoring::TDynamicCounterPtr &counters); TTaskCounters(const TTaskCounters &other) = default; TTaskCounters(TTaskCounters &&other) = default; @@ -213,7 +213,7 @@ private: public: TTaskQueue(const NKikimrResourceBroker::TQueueConfig &config, - const NMonitoring::TDynamicCounterPtr &counters, + const ::NMonitoring::TDynamicCounterPtr &counters, TResourceLimitPtr totalLimit, TQueueCountersPtr totalCounters); /** @@ -301,7 +301,7 @@ private: }; public: - TScheduler(const NMonitoring::TDynamicCounterPtr &counters); + TScheduler(const ::NMonitoring::TDynamicCounterPtr &counters); ~TScheduler(); /** @@ -392,9 +392,9 @@ private: THashMap<TString, TTaskConfig> TaskConfigs; TResourceLimitPtr ResourceLimit; THashMap<std::pair<TActorId, ui64>, TTaskPtr> Tasks; - const NMonitoring::TDynamicCounterPtr Counters; + const ::NMonitoring::TDynamicCounterPtr Counters; TQueueCountersPtr TotalCounters; - NMonitoring::TDynamicCounters::TCounterPtr MissingTaskTypeCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr MissingTaskTypeCounter; ui64 NextTaskId; }; @@ -404,7 +404,7 @@ private: class TResourceBroker : public IResourceBroker { public: TResourceBroker(const NKikimrResourceBroker::TResourceBrokerConfig &config, - const NMonitoring::TDynamicCounterPtr &counters, + const ::NMonitoring::TDynamicCounterPtr &counters, TActorSystem *actorSystem); bool SubmitTaskInstant(const TEvResourceBroker::TEvSubmitTask &ev, const TActorId &sender) override; @@ -441,7 +441,7 @@ public: } TResourceBrokerActor(const NKikimrResourceBroker::TResourceBrokerConfig &config, - const NMonitoring::TDynamicCounterPtr &counters); + const ::NMonitoring::TDynamicCounterPtr &counters); void Bootstrap(const TActorContext &ctx); @@ -477,7 +477,7 @@ private: void Handle(NMon::TEvHttpInfo::TPtr &ev, const TActorContext &ctx); NKikimrResourceBroker::TResourceBrokerConfig Config; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; TIntrusivePtr<TResourceBroker> ResourceBroker; }; diff --git a/ydb/core/tablet/resource_broker_ut.cpp b/ydb/core/tablet/resource_broker_ut.cpp index 5948509025..aa2ba8131c 100644 --- a/ydb/core/tablet/resource_broker_ut.cpp +++ b/ydb/core/tablet/resource_broker_ut.cpp @@ -159,7 +159,7 @@ WaitForError(TTestActorRuntime &runtime, ui64 id, TEvResourceBroker::TStatus::EC } static void -CheckCounters(NMonitoring::TDynamicCounterPtr counters, const TString &group, const TString &name, +CheckCounters(::NMonitoring::TDynamicCounterPtr counters, const TString &group, const TString &name, ui64 cpu, ui64 memory, ui64 finished, ui64 enqueued, ui64 infly) { auto g = counters->GetSubgroup(group, name); @@ -203,7 +203,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { TActorId sender1 = runtime.AllocateEdgeActor(); TActorId sender2 = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -283,7 +283,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -321,7 +321,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -411,7 +411,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -460,7 +460,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -555,7 +555,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -613,7 +613,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -650,7 +650,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { TActorId sender1 = runtime.AllocateEdgeActor(); TActorId sender2 = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -688,7 +688,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -725,7 +725,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -762,7 +762,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -808,7 +808,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -851,7 +851,7 @@ Y_UNIT_TEST_SUITE(TResourceBroker) { runtime.UpdateCurrentTime(now); TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto config = MakeTestConfig(); auto broker = CreateResourceBrokerActor(config, counters); auto brokerId = runtime.Register(broker); @@ -901,7 +901,7 @@ Y_UNIT_TEST_SUITE(TResourceBrokerInstant) { TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto broker = runtime.Register(CreateResourceBrokerActor(MakeTestConfig(), counters)); WaitForBootstrap(runtime); @@ -928,7 +928,7 @@ Y_UNIT_TEST_SUITE(TResourceBrokerInstant) { TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto broker = runtime.Register(CreateResourceBrokerActor(MakeTestConfig(), counters)); WaitForBootstrap(runtime); @@ -960,7 +960,7 @@ Y_UNIT_TEST_SUITE(TResourceBrokerInstant) { TActorId sender = runtime.AllocateEdgeActor(); - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto broker = runtime.Register(CreateResourceBrokerActor(MakeTestConfig(), counters)); WaitForBootstrap(runtime); diff --git a/ydb/core/tablet/tablet_counters_aggregator.cpp b/ydb/core/tablet/tablet_counters_aggregator.cpp index 5456ab37f1..94a0aea199 100644 --- a/ydb/core/tablet/tablet_counters_aggregator.cpp +++ b/ydb/core/tablet/tablet_counters_aggregator.cpp @@ -59,7 +59,7 @@ const ui32 WAKEUP_TIMEOUT_SECONDS = 4; //////////////////////////////////////////// -using TCountersVector = TVector<NMonitoring::TDynamicCounters::TCounterPtr>; +using TCountersVector = TVector<::NMonitoring::TDynamicCounters::TCounterPtr>; struct THistogramCounter { TVector<TTabletPercentileCounter::TRangeDef> Ranges; @@ -78,7 +78,7 @@ struct THistogramCounter { } void Clear() { - for (const NMonitoring::TDynamicCounters::TCounterPtr& cnt : Values) { + for (const ::NMonitoring::TDynamicCounters::TCounterPtr& cnt : Values) { *cnt = 0; } @@ -98,7 +98,7 @@ using THistogramVector = TVector<THolder<THistogramCounter>>; class TAggregatedSimpleCounters { public: // - TAggregatedSimpleCounters(NMonitoring::TDynamicCounterPtr counterGroup) + TAggregatedSimpleCounters(::NMonitoring::TDynamicCounterPtr counterGroup) : CounterGroup(counterGroup) {} @@ -183,7 +183,7 @@ public: private: // - NMonitoring::TDynamicCounterPtr CounterGroup; + ::NMonitoring::TDynamicCounterPtr CounterGroup; TCountersVector MaxSimpleCounters; TCountersVector SumSimpleCounters; @@ -222,7 +222,7 @@ private: class TAggregatedCumulativeCounters { public: // - TAggregatedCumulativeCounters(NMonitoring::TDynamicCounterPtr counterGroup) + TAggregatedCumulativeCounters(::NMonitoring::TDynamicCounterPtr counterGroup) : CounterGroup(counterGroup) {} @@ -292,7 +292,7 @@ public: private: // - NMonitoring::TDynamicCounterPtr CounterGroup; + ::NMonitoring::TDynamicCounterPtr CounterGroup; TCountersVector MaxCumulativeCounters; THistogramVector HistCumulativeCounters; @@ -328,7 +328,7 @@ class TAggregatedHistogramCounters { public: // - TAggregatedHistogramCounters(NMonitoring::TDynamicCounterPtr counterGroup) + TAggregatedHistogramCounters(::NMonitoring::TDynamicCounterPtr counterGroup) : CounterGroup(counterGroup) {} @@ -522,7 +522,7 @@ private: } private: - NMonitoring::TDynamicCounterPtr CounterGroup; + ::NMonitoring::TDynamicCounterPtr CounterGroup; // monitoring counters holders, updated only during recalculation TVector<TCountersVector> PercentileCounters; // old style (ranges) @@ -645,7 +645,7 @@ public: private: // - NMonitoring::TDynamicCounterPtr CounterGroup; + ::NMonitoring::TDynamicCounterPtr CounterGroup; const ui8* AggrFunc; const char* const * Names; TString GroupNames; @@ -699,7 +699,7 @@ private: class TTabletMon { public: // - TTabletMon(NMonitoring::TDynamicCounterPtr counters, bool isFollower, TActorId dbWatcherActorId) + TTabletMon(::NMonitoring::TDynamicCounterPtr counters, bool isFollower, TActorId dbWatcherActorId) : Counters(GetServiceCounters(counters, isFollower ? "followers" : "tablets")) , AllTypes(Counters.Get(), "type", "all") , IsFollower(isFollower) @@ -932,7 +932,7 @@ private: class TTabletCountersForTabletType { public: // - TTabletCountersForTabletType(NMonitoring::TDynamicCounters* owner, const char* category, const char* name) + TTabletCountersForTabletType(::NMonitoring::TDynamicCounters* owner, const char* category, const char* name) : TabletCountersSection(owner->GetSubgroup(category, name)) , TabletExecutorCountersSection(TabletCountersSection->GetSubgroup("category", "executor")) , TabletAppCountersSection(TabletCountersSection->GetSubgroup("category", "app")) @@ -1030,7 +1030,7 @@ private: // bool IsInitialized; - TSolomonCounters(NMonitoring::TDynamicCounterPtr counterGroup) + TSolomonCounters(::NMonitoring::TDynamicCounterPtr counterGroup) : IsInitialized(false) , AggregatedSimpleCounters(counterGroup) , AggregatedCumulativeCounters(counterGroup) @@ -1286,14 +1286,14 @@ private: THashMap<ui64, TInstant> LastAggregateUpdateTime; - NMonitoring::TDynamicCounterPtr CounterGroup; + ::NMonitoring::TDynamicCounterPtr CounterGroup; }; // - NMonitoring::TDynamicCounterPtr TabletCountersSection; + ::NMonitoring::TDynamicCounterPtr TabletCountersSection; - NMonitoring::TDynamicCounterPtr TabletExecutorCountersSection; - NMonitoring::TDynamicCounterPtr TabletAppCountersSection; + ::NMonitoring::TDynamicCounterPtr TabletExecutorCountersSection; + ::NMonitoring::TDynamicCounterPtr TabletAppCountersSection; TSolomonCounters TabletExecutorCounters; TSolomonCounters TabletAppCounters; @@ -1315,7 +1315,7 @@ private: static TTabletCountersForTabletType* GetOrAddCountersByTabletType( TTabletTypes::EType tabletType, TCountersByTabletType& countersByTabletType, - NMonitoring::TDynamicCounterPtr counters) + ::NMonitoring::TDynamicCounterPtr counters) { auto* typeCounters = FindCountersByTabletType(tabletType, countersByTabletType); if (!typeCounters) { @@ -1336,7 +1336,7 @@ private: } class TYdbTabletCounters : public TThrRefBase { - using TCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; using THistogramPtr = NMonitoring::THistogramPtr; private: @@ -1390,7 +1390,7 @@ private: public: - explicit TYdbTabletCounters(const NMonitoring::TDynamicCounterPtr& ydbGroup) { + explicit TYdbTabletCounters(const ::NMonitoring::TDynamicCounterPtr& ydbGroup) { WriteRowCount = ydbGroup->GetNamedCounter("name", "table.datashard.write.rows", true); WriteBytes = ydbGroup->GetNamedCounter("name", @@ -1444,7 +1444,7 @@ private: }; void Initialize( - NMonitoring::TDynamicCounterPtr counters, + ::NMonitoring::TDynamicCounterPtr counters, TCountersByTabletType& countersByTabletType) { auto datashard = FindCountersByTabletType( @@ -1551,12 +1551,12 @@ public: class TTabletCountersForDb : public NSysView::IDbCounters { public: TTabletCountersForDb() - : SolomonCounters(new NMonitoring::TDynamicCounters) + : SolomonCounters(new ::NMonitoring::TDynamicCounters) , AllTypes(SolomonCounters.Get(), "type", "all") {} - TTabletCountersForDb(NMonitoring::TDynamicCounterPtr externalGroup, - NMonitoring::TDynamicCounterPtr internalGroup, + TTabletCountersForDb(::NMonitoring::TDynamicCounterPtr externalGroup, + ::NMonitoring::TDynamicCounterPtr internalGroup, THolder<TTabletCountersBase> executorCounters) : SolomonCounters(internalGroup) , ExecutorCounters(std::move(executorCounters)) @@ -1617,7 +1617,7 @@ public: } private: - NMonitoring::TDynamicCounterPtr SolomonCounters; + ::NMonitoring::TDynamicCounterPtr SolomonCounters; THolder<TTabletCountersBase> ExecutorCounters; TTabletCountersForTabletType AllTypes; @@ -1665,7 +1665,7 @@ private: private: // - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; TTabletCountersForTabletType AllTypes; bool IsFollower = false; @@ -1687,8 +1687,8 @@ private: TIntrusivePtr<NSysView::IDbCounters> CreateTabletDbCounters( - NMonitoring::TDynamicCounterPtr externalGroup, - NMonitoring::TDynamicCounterPtr internalGroup, + ::NMonitoring::TDynamicCounterPtr externalGroup, + ::NMonitoring::TDynamicCounterPtr internalGroup, THolder<TTabletCountersBase> executorCounters) { return MakeIntrusive<TTabletMon::TTabletCountersForDb>( @@ -1825,7 +1825,7 @@ TTabletCountersAggregatorActor::HandleWork(TEvTabletCounters::TEvTabletLabeledCo return; TString html; TStringOutput oss(html); - NMonitoring::TDynamicCounters counters; + ::NMonitoring::TDynamicCounters counters; const auto& params = it->second.second->Request.GetParams(); TString reqTabletType = params.Get("type"); diff --git a/ydb/core/tablet/tablet_counters_aggregator.h b/ydb/core/tablet/tablet_counters_aggregator.h index db350d41cb..692741481e 100644 --- a/ydb/core/tablet/tablet_counters_aggregator.h +++ b/ydb/core/tablet/tablet_counters_aggregator.h @@ -122,8 +122,8 @@ bool IsHistogramAggregateSimpleName(TStringBuf name); //////////////////////////////////////////// TIntrusivePtr<NSysView::IDbCounters> CreateTabletDbCounters( - NMonitoring::TDynamicCounterPtr externalGroup, - NMonitoring::TDynamicCounterPtr internalGroup, + ::NMonitoring::TDynamicCounterPtr externalGroup, + ::NMonitoring::TDynamicCounterPtr internalGroup, THolder<TTabletCountersBase> executorCounters); //////////////////////////////////////////// diff --git a/ydb/core/tablet/tablet_counters_aggregator_ut.cpp b/ydb/core/tablet/tablet_counters_aggregator_ut.cpp index b1c9026742..013d292c24 100644 --- a/ydb/core/tablet/tablet_counters_aggregator_ut.cpp +++ b/ydb/core/tablet/tablet_counters_aggregator_ut.cpp @@ -155,8 +155,8 @@ Y_UNIT_TEST_SUITE(TTabletCountersAggregator) { } public: - static NMonitoring::TDynamicCounterPtr GetAppCounters(TTestBasicRuntime& runtime) { - NMonitoring::TDynamicCounterPtr counters = runtime.GetAppData(0).Counters; + static ::NMonitoring::TDynamicCounterPtr GetAppCounters(TTestBasicRuntime& runtime) { + ::NMonitoring::TDynamicCounterPtr counters = runtime.GetAppData(0).Counters; UNIT_ASSERT(counters); TString tabletTypeStr = TTabletTypes::TypeToStr(TabletType); diff --git a/ydb/core/tablet/tablet_pipecache.cpp b/ydb/core/tablet/tablet_pipecache.cpp index 292571f661..53e7a83325 100644 --- a/ydb/core/tablet/tablet_pipecache.cpp +++ b/ydb/core/tablet/tablet_pipecache.cpp @@ -12,19 +12,19 @@ class TPipePeNodeCache : public TActor<TPipePeNodeCache> { NTabletPipe::TClientConfig PipeConfig; struct TCounters { - NMonitoring::TDynamicCounters::TCounterPtr Tablets; - NMonitoring::TDynamicCounters::TCounterPtr Subscribers; - NMonitoring::TDynamicCounters::TCounterPtr PipesActive; - NMonitoring::TDynamicCounters::TCounterPtr PipesInactive; - NMonitoring::TDynamicCounters::TCounterPtr PipesConnecting; - NMonitoring::TDynamicCounters::TCounterPtr EventCreate; - NMonitoring::TDynamicCounters::TCounterPtr EventConnectOk; - NMonitoring::TDynamicCounters::TCounterPtr EventConnectFailure; - NMonitoring::TDynamicCounters::TCounterPtr EventGracefulShutdown; - NMonitoring::TDynamicCounters::TCounterPtr EventDisconnect; + ::NMonitoring::TDynamicCounters::TCounterPtr Tablets; + ::NMonitoring::TDynamicCounters::TCounterPtr Subscribers; + ::NMonitoring::TDynamicCounters::TCounterPtr PipesActive; + ::NMonitoring::TDynamicCounters::TCounterPtr PipesInactive; + ::NMonitoring::TDynamicCounters::TCounterPtr PipesConnecting; + ::NMonitoring::TDynamicCounters::TCounterPtr EventCreate; + ::NMonitoring::TDynamicCounters::TCounterPtr EventConnectOk; + ::NMonitoring::TDynamicCounters::TCounterPtr EventConnectFailure; + ::NMonitoring::TDynamicCounters::TCounterPtr EventGracefulShutdown; + ::NMonitoring::TDynamicCounters::TCounterPtr EventDisconnect; bool HaveCounters = false; - explicit TCounters(NMonitoring::TDynamicCounterPtr counters) { + explicit TCounters(::NMonitoring::TDynamicCounterPtr counters) { if (counters) { Tablets = counters->GetCounter("PipeCache/Tablets"); Subscribers = counters->GetCounter("PipeCache/Subscribers"); diff --git a/ydb/core/tablet/tablet_resolver.cpp b/ydb/core/tablet/tablet_resolver.cpp index 4b1ee1a6fc..369af9138f 100644 --- a/ydb/core/tablet/tablet_resolver.cpp +++ b/ydb/core/tablet/tablet_resolver.cpp @@ -173,17 +173,17 @@ class TTabletResolver : public TActorBootstrapped<TTabletResolver> { ui64 LastCacheEpoch = 0; - NMonitoring::TDynamicCounters::TCounterPtr SelectedLeaderLocal; - NMonitoring::TDynamicCounters::TCounterPtr SelectedLeaderLocalDc; - NMonitoring::TDynamicCounters::TCounterPtr SelectedLeaderOtherDc; + ::NMonitoring::TDynamicCounters::TCounterPtr SelectedLeaderLocal; + ::NMonitoring::TDynamicCounters::TCounterPtr SelectedLeaderLocalDc; + ::NMonitoring::TDynamicCounters::TCounterPtr SelectedLeaderOtherDc; - NMonitoring::TDynamicCounters::TCounterPtr SelectedFollowerLocal; - NMonitoring::TDynamicCounters::TCounterPtr SelectedFollowerLocalDc; - NMonitoring::TDynamicCounters::TCounterPtr SelectedFollowerOtherDc; + ::NMonitoring::TDynamicCounters::TCounterPtr SelectedFollowerLocal; + ::NMonitoring::TDynamicCounters::TCounterPtr SelectedFollowerLocalDc; + ::NMonitoring::TDynamicCounters::TCounterPtr SelectedFollowerOtherDc; - NMonitoring::TDynamicCounters::TCounterPtr SelectedNone; + ::NMonitoring::TDynamicCounters::TCounterPtr SelectedNone; - NMonitoring::TDynamicCounters::TCounterPtr InFlyResolveCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr InFlyResolveCounter; std::optional<TString> FindNodeDc(ui32 nodeId) const { auto it = NodeToDcMapping.find(nodeId); diff --git a/ydb/core/tablet_flat/flat_load_blob_queue.h b/ydb/core/tablet_flat/flat_load_blob_queue.h index 8892e4f29f..5ee5afdb88 100644 --- a/ydb/core/tablet_flat/flat_load_blob_queue.h +++ b/ydb/core/tablet_flat/flat_load_blob_queue.h @@ -13,7 +13,7 @@ namespace NTabletFlatExecutor { ui64 TabletID = 0; ui32 Generation = 0; bool Follower = false; - NMonitoring::TDynamicCounters::TCounterPtr NoDataCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr NoDataCounter; ui64 MaxBytesInFly = 12 * 1024 * 1024; NKikimrBlobStorage::EGetHandleClass ReadPrio = NKikimrBlobStorage::FastRead; }; diff --git a/ydb/core/tablet_flat/shared_sausagecache.cpp b/ydb/core/tablet_flat/shared_sausagecache.cpp index c60c30202b..1ae796a0c1 100644 --- a/ydb/core/tablet_flat/shared_sausagecache.cpp +++ b/ydb/core/tablet_flat/shared_sausagecache.cpp @@ -12,7 +12,7 @@ namespace NKikimr { -TSharedPageCacheCounters::TSharedPageCacheCounters(const TIntrusivePtr<NMonitoring::TDynamicCounters> &group) +TSharedPageCacheCounters::TSharedPageCacheCounters(const TIntrusivePtr<::NMonitoring::TDynamicCounters> &group) : ActivePages(group->GetCounter("ActivePages")) , ActiveBytes(group->GetCounter("ActiveBytes")) , PassivePages(group->GetCounter("PassivePages")) diff --git a/ydb/core/tablet_flat/shared_sausagecache.h b/ydb/core/tablet_flat/shared_sausagecache.h index f7afb2ee99..51d0682e38 100644 --- a/ydb/core/tablet_flat/shared_sausagecache.h +++ b/ydb/core/tablet_flat/shared_sausagecache.h @@ -21,7 +21,7 @@ struct TEvSharedPageCache { }; struct TSharedPageCacheCounters final : public TAtomicRefCount<TSharedPageCacheCounters> { - using TCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; const TCounterPtr ActivePages; const TCounterPtr ActiveBytes; @@ -36,7 +36,7 @@ struct TSharedPageCacheCounters final : public TAtomicRefCount<TSharedPageCacheC const TCounterPtr LoadInFlyPages; const TCounterPtr LoadInFlyBytes; - explicit TSharedPageCacheCounters(const TIntrusivePtr<NMonitoring::TDynamicCounters> &group); + explicit TSharedPageCacheCounters(const TIntrusivePtr<::NMonitoring::TDynamicCounters> &group); }; struct TSharedPageCacheConfig final : public TAtomicRefCount<TSharedPageCacheConfig> { diff --git a/ydb/core/testlib/actors/test_runtime.cpp b/ydb/core/testlib/actors/test_runtime.cpp index 4ae04ce1f9..03688fa00d 100644 --- a/ydb/core/testlib/actors/test_runtime.cpp +++ b/ydb/core/testlib/actors/test_runtime.cpp @@ -102,7 +102,7 @@ namespace NActors { auto* node = GetNodeById(nodeId); const auto* app0 = App0.Get(); if (!SingleSysEnv) { - const TIntrusivePtr<NMonitoring::TDynamicCounters> profilerCounters = NKikimr::GetServiceCounters(node->DynamicCounters, "utils"); + const TIntrusivePtr<::NMonitoring::TDynamicCounters> profilerCounters = NKikimr::GetServiceCounters(node->DynamicCounters, "utils"); TActorSetupCmd profilerSetup(CreateProfilerActor(profilerCounters, "."), TMailboxType::Simple, 0); node->LocalServices.push_back(std::pair<TActorId, TActorSetupCmd>(MakeProfilerID(FirstNodeId + nodeIndex), profilerSetup)); } @@ -262,7 +262,7 @@ namespace NActors { fromNodeIndex, async); } - TIntrusivePtr<NMonitoring::TDynamicCounters> TTestActorRuntime::GetCountersForComponent(TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const char* component) { + TIntrusivePtr<::NMonitoring::TDynamicCounters> TTestActorRuntime::GetCountersForComponent(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const char* component) { return NKikimr::GetServiceCounters(counters, component); } diff --git a/ydb/core/testlib/actors/test_runtime.h b/ydb/core/testlib/actors/test_runtime.h index 2185c8d98b..c9bb99b006 100644 --- a/ydb/core/testlib/actors/test_runtime.h +++ b/ydb/core/testlib/actors/test_runtime.h @@ -74,7 +74,7 @@ namespace NActors { static bool DefaultScheduledFilterFunc(TTestActorRuntimeBase& runtime, TAutoPtr<IEventHandle>& event, TDuration delay, TInstant& deadline); private: void Initialize() override; - TIntrusivePtr<NMonitoring::TDynamicCounters> GetCountersForComponent(TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const char* component) override; + TIntrusivePtr<::NMonitoring::TDynamicCounters> GetCountersForComponent(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const char* component) override; void InitActorSystemSetup(TActorSystemSetup& setup) override; TNodeData* GetNodeById(size_t idx) override { diff --git a/ydb/core/testlib/basics/services.cpp b/ydb/core/testlib/basics/services.cpp index c67024a6cb..d6589d6b66 100644 --- a/ydb/core/testlib/basics/services.cpp +++ b/ydb/core/testlib/basics/services.cpp @@ -49,7 +49,7 @@ namespace NPDisk { { auto cacheConfig = MakeIntrusive<NSchemeCache::TSchemeCacheConfig>(); cacheConfig->Roots.emplace_back(1, TTestTxConfig::SchemeShard, root); - cacheConfig->Counters = new NMonitoring::TDynamicCounters(); + cacheConfig->Counters = new ::NMonitoring::TDynamicCounters(); runtime.AddLocalService(MakeSchemeCacheID(), TActorSetupCmd(CreateSchemeBoardSchemeCache(cacheConfig.Get()), TMailboxType::Revolving, 0), nodeIndex); diff --git a/ydb/core/testlib/test_client.cpp b/ydb/core/testlib/test_client.cpp index accd76b1b3..b0c65f1c0d 100644 --- a/ydb/core/testlib/test_client.cpp +++ b/ydb/core/testlib/test_client.cpp @@ -260,7 +260,7 @@ namespace Tests { auto grpcMon = system->Register(NGRpcService::CreateGrpcMonService(), TMailboxType::ReadAsFilled); system->RegisterLocalService(NGRpcService::GrpcMonServiceId(), grpcMon); - GRpcServerRootCounters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + GRpcServerRootCounters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); auto& counters = GRpcServerRootCounters; auto& appData = Runtime->GetAppData(); @@ -669,7 +669,7 @@ namespace Tests { { if (Settings->PQConfig.GetEnabled() == true) { IActor *pqMetaCache = NMsgBusProxy::NPqMetaCacheV2::CreatePQMetaCache( - new NMonitoring::TDynamicCounters(), TDuration::Seconds(1) + new ::NMonitoring::TDynamicCounters(), TDuration::Seconds(1) ); TActorId pqMetaCacheId = Runtime->Register(pqMetaCache, nodeIdx); @@ -807,7 +807,7 @@ namespace Tests { }; const auto ydbCredFactory = NKikimr::CreateYdbCredentialsProviderFactory; - auto counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + auto counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); YqSharedResources = NYq::CreateYqSharedResources(protoConfig, ydbCredFactory, counters); NYq::Init( protoConfig, diff --git a/ydb/core/testlib/test_client.h b/ydb/core/testlib/test_client.h index 37b6c3f202..1816a7ea90 100644 --- a/ydb/core/testlib/test_client.h +++ b/ydb/core/testlib/test_client.h @@ -235,7 +235,7 @@ namespace Tests { void SetupDefaultProfiles(); - TIntrusivePtr<NMonitoring::TDynamicCounters> GetGRpcServerRootCounters() const { + TIntrusivePtr<::NMonitoring::TDynamicCounters> GetGRpcServerRootCounters() const { return GRpcServerRootCounters; } @@ -271,7 +271,7 @@ namespace Tests { const NBus::TBusServerSessionConfig BusServerSessionConfig; //BusServer hold const & on config TAutoPtr<NMsgBusProxy::IMessageBusServer> BusServer; std::unique_ptr<NGrpc::TGRpcServer> GRpcServer; - TIntrusivePtr<NMonitoring::TDynamicCounters> GRpcServerRootCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> GRpcServerRootCounters; NYq::IYqSharedResources::TPtr YqSharedResources; }; diff --git a/ydb/core/tracing/trace_collection.cpp b/ydb/core/tracing/trace_collection.cpp index d9b1645070..dee92f0790 100644 --- a/ydb/core/tracing/trace_collection.cpp +++ b/ydb/core/tracing/trace_collection.cpp @@ -51,7 +51,7 @@ ui64 TTabletTraces::GetCount() const { return Traces.size(); } -TTraceCollection::TTraceCollection(TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { +TTraceCollection::TTraceCollection(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { if (counters) { Reporting = true; ReportedSize = counters->GetCounter("totalsize"); @@ -151,7 +151,7 @@ ITrace* TTraceCollection::GetTrace(ui64 tabletID, TTraceID& traceID) { return nullptr; } -ITraceCollection* CreateTraceCollection(TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { +ITraceCollection* CreateTraceCollection(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { return new TTraceCollection(counters); } diff --git a/ydb/core/tracing/trace_collection.h b/ydb/core/tracing/trace_collection.h index 6373475f8b..8843e8ec2c 100644 --- a/ydb/core/tracing/trace_collection.h +++ b/ydb/core/tracing/trace_collection.h @@ -32,7 +32,7 @@ public: using MainQueueType = TList<TTabletData>; using IndexType = THashMap<ui64, MainQueueType::iterator>; - TTraceCollection(TIntrusivePtr<NMonitoring::TDynamicCounters> counters); + TTraceCollection(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters); void AddTrace(ui64 tabletID, ITrace* trace) override; // Shows all tablet IDs for which it has data @@ -52,10 +52,10 @@ private: IndexType Indexes; ui64 TotalSize = 0; - NMonitoring::TDynamicCounters::TCounterPtr ReportedSize; - NMonitoring::TDynamicCounters::TCounterPtr ReportedCurrentCount; - NMonitoring::TDynamicCounters::TCounterPtr ReportedTotalCount; - NMonitoring::TDynamicCounters::TCounterPtr ReportedTabletCount; + ::NMonitoring::TDynamicCounters::TCounterPtr ReportedSize; + ::NMonitoring::TDynamicCounters::TCounterPtr ReportedCurrentCount; + ::NMonitoring::TDynamicCounters::TCounterPtr ReportedTotalCount; + ::NMonitoring::TDynamicCounters::TCounterPtr ReportedTabletCount; bool Reporting = false; }; diff --git a/ydb/core/tx/columnshard/blob_cache.cpp b/ydb/core/tx/columnshard/blob_cache.cpp index 1bf137e435..9585a32443 100644 --- a/ydb/core/tx/columnshard/blob_cache.cpp +++ b/ydb/core/tx/columnshard/blob_cache.cpp @@ -71,7 +71,7 @@ private: THashMap<ui64, TActorId> ShardPipes; // TabletId -> PipeClient for small blob read requests THashMap<ui64, THashSet<ui64>> InFlightTabletRequests; // TabletId -> list to read cookies - using TCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; const TCounterPtr SizeBytes; const TCounterPtr SizeBlobs; const TCounterPtr Hits; @@ -95,7 +95,7 @@ public: } public: - explicit TBlobCache(ui64 maxSize, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) + explicit TBlobCache(ui64 maxSize, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) : TActorBootstrapped<TBlobCache>() , Cache(SIZE_MAX) , MaxCacheDataSize(maxSize, 0, 1ull << 40) @@ -616,7 +616,7 @@ private: } }; -NActors::IActor* CreateBlobCache(ui64 maxBytes, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { +NActors::IActor* CreateBlobCache(ui64 maxBytes, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { return new TBlobCache(maxBytes, counters); } diff --git a/ydb/core/tx/columnshard/blob_cache.h b/ydb/core/tx/columnshard/blob_cache.h index 68ae86f5e0..afdcc14663 100644 --- a/ydb/core/tx/columnshard/blob_cache.h +++ b/ydb/core/tx/columnshard/blob_cache.h @@ -108,7 +108,7 @@ NActors::TActorId MakeBlobCacheServiceId() { return TActorId(0, TStringBuf(x, 12)); } -NActors::IActor* CreateBlobCache(ui64 maxBytes, TIntrusivePtr<NMonitoring::TDynamicCounters>); +NActors::IActor* CreateBlobCache(ui64 maxBytes, TIntrusivePtr<::NMonitoring::TDynamicCounters>); // Explicitly add and remove data from cache. This is usefull for newly written data that is likely to be read by // indexing, compaction and user queries and for the data that has been compacted and will not be read again. diff --git a/ydb/core/tx/coordinator/coordinator__plan_step.cpp b/ydb/core/tx/coordinator/coordinator__plan_step.cpp index d8f93bf32f..3e022a5965 100644 --- a/ydb/core/tx/coordinator/coordinator__plan_step.cpp +++ b/ydb/core/tx/coordinator/coordinator__plan_step.cpp @@ -6,8 +6,8 @@ namespace NKikimr { namespace NFlatTxCoordinator { struct TInFlyAccountant { - NMonitoring::TDynamicCounters::TCounterPtr Counter; - TInFlyAccountant(NMonitoring::TDynamicCounters::TCounterPtr counter) + ::NMonitoring::TDynamicCounters::TCounterPtr Counter; + TInFlyAccountant(::NMonitoring::TDynamicCounters::TCounterPtr counter) : Counter(counter) { Counter->Inc(); diff --git a/ydb/core/tx/coordinator/coordinator_impl.cpp b/ydb/core/tx/coordinator/coordinator_impl.cpp index 711b64d24e..64e01eeaf4 100644 --- a/ydb/core/tx/coordinator/coordinator_impl.cpp +++ b/ydb/core/tx/coordinator/coordinator_impl.cpp @@ -20,7 +20,7 @@ static void SendTransactionStatus(const TActorId &proxy, TEvTxProxy::TEvProposeT ctx.Send(proxy, new TEvTxProxy::TEvProposeTransactionStatus(status, txid, stepId)); } -static TAutoPtr<TTransactionProposal> MakeTransactionProposal(TEvTxProxy::TEvProposeTransaction::TPtr &ev, NMonitoring::TDynamicCounters::TCounterPtr &counter) { +static TAutoPtr<TTransactionProposal> MakeTransactionProposal(TEvTxProxy::TEvProposeTransaction::TPtr &ev, ::NMonitoring::TDynamicCounters::TCounterPtr &counter) { const TActorId &sender = ev->Sender; const NKikimrTx::TEvProposeTransaction &record = ev->Get()->Record; diff --git a/ydb/core/tx/coordinator/coordinator_impl.h b/ydb/core/tx/coordinator/coordinator_impl.h index 60c96ba299..075fd89e81 100644 --- a/ydb/core/tx/coordinator/coordinator_impl.h +++ b/ydb/core/tx/coordinator/coordinator_impl.h @@ -435,24 +435,24 @@ public: private: struct TCoordinatorMonCounters { - TIntrusivePtr<NMonitoring::TDynamicCounters> Coordinator; - - NMonitoring::TDynamicCounters::TCounterPtr TxIn; - NMonitoring::TDynamicCounters::TCounterPtr TxPlanned; - NMonitoring::TDynamicCounters::TCounterPtr TxDeclined; - NMonitoring::TDynamicCounters::TCounterPtr TxInFly; - NMonitoring::TDynamicCounters::TCounterPtr StepsUncommited; - NMonitoring::TDynamicCounters::TCounterPtr StepsInFly; - - NMonitoring::TDynamicCounters::TCounterPtr PlanTxCalls; - NMonitoring::TDynamicCounters::TCounterPtr PlanTxOutdated; - NMonitoring::TDynamicCounters::TCounterPtr PlanTxAccepted; - - NMonitoring::TDynamicCounters::TCounterPtr StepConsideredTx; - NMonitoring::TDynamicCounters::TCounterPtr StepOutdatedTx; - NMonitoring::TDynamicCounters::TCounterPtr StepPlannedDeclinedTx; - NMonitoring::TDynamicCounters::TCounterPtr StepPlannedTx; - NMonitoring::TDynamicCounters::TCounterPtr StepDeclinedNoSpaceTx; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Coordinator; + + ::NMonitoring::TDynamicCounters::TCounterPtr TxIn; + ::NMonitoring::TDynamicCounters::TCounterPtr TxPlanned; + ::NMonitoring::TDynamicCounters::TCounterPtr TxDeclined; + ::NMonitoring::TDynamicCounters::TCounterPtr TxInFly; + ::NMonitoring::TDynamicCounters::TCounterPtr StepsUncommited; + ::NMonitoring::TDynamicCounters::TCounterPtr StepsInFly; + + ::NMonitoring::TDynamicCounters::TCounterPtr PlanTxCalls; + ::NMonitoring::TDynamicCounters::TCounterPtr PlanTxOutdated; + ::NMonitoring::TDynamicCounters::TCounterPtr PlanTxAccepted; + + ::NMonitoring::TDynamicCounters::TCounterPtr StepConsideredTx; + ::NMonitoring::TDynamicCounters::TCounterPtr StepOutdatedTx; + ::NMonitoring::TDynamicCounters::TCounterPtr StepPlannedDeclinedTx; + ::NMonitoring::TDynamicCounters::TCounterPtr StepPlannedTx; + ::NMonitoring::TDynamicCounters::TCounterPtr StepDeclinedNoSpaceTx; NMonitoring::THistogramPtr TxFromReceiveToPlan; NMonitoring::THistogramPtr TxPlanLatency; diff --git a/ydb/core/tx/datashard/datashard__conditional_erase_rows.cpp b/ydb/core/tx/datashard/datashard__conditional_erase_rows.cpp index d03c8ef2e6..04135da214 100644 --- a/ydb/core/tx/datashard/datashard__conditional_erase_rows.cpp +++ b/ydb/core/tx/datashard/datashard__conditional_erase_rows.cpp @@ -129,8 +129,8 @@ class TCondEraseScan: public IActor, public IScan, public IEraserOps { private: ui64 RowsProcessed; ui64 RowsErased; - NMonitoring::TDynamicCounters::TCounterPtr MonProcessed; - NMonitoring::TDynamicCounters::TCounterPtr MonErased; + ::NMonitoring::TDynamicCounters::TCounterPtr MonProcessed; + ::NMonitoring::TDynamicCounters::TCounterPtr MonErased; }; static TVector<TCell> MakeKeyCells(const TVector<TKey>& keyOrder, const TRow& row) { diff --git a/ydb/core/tx/datashard/export_scan.cpp b/ydb/core/tx/datashard/export_scan.cpp index d1995c2f86..c0a5901aef 100644 --- a/ydb/core/tx/datashard/export_scan.cpp +++ b/ydb/core/tx/datashard/export_scan.cpp @@ -63,9 +63,9 @@ class TExportScan: private NActors::IActor, public NTable::IScan { } private: - NMonitoring::TDynamicCounters::TCounterPtr MonRows; - NMonitoring::TDynamicCounters::TCounterPtr MonBytesRead; - NMonitoring::TDynamicCounters::TCounterPtr MonBytesSent; + ::NMonitoring::TDynamicCounters::TCounterPtr MonRows; + ::NMonitoring::TDynamicCounters::TCounterPtr MonBytesRead; + ::NMonitoring::TDynamicCounters::TCounterPtr MonBytesSent; }; bool IsReady() const { diff --git a/ydb/core/tx/datashard/upload_stats.h b/ydb/core/tx/datashard/upload_stats.h index f06ce7a255..ad9bee490a 100644 --- a/ydb/core/tx/datashard/upload_stats.h +++ b/ydb/core/tx/datashard/upload_stats.h @@ -38,8 +38,8 @@ private: ui64 RowsSent = 0; ui64 BytesSent = 0; - NMonitoring::TDynamicCounters::TCounterPtr MonRows; - NMonitoring::TDynamicCounters::TCounterPtr MonBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr MonRows; + ::NMonitoring::TDynamicCounters::TCounterPtr MonBytes; }; }} diff --git a/ydb/core/tx/long_tx_service/long_tx_service_ut.cpp b/ydb/core/tx/long_tx_service/long_tx_service_ut.cpp index b8826fb8ae..6739187183 100644 --- a/ydb/core/tx/long_tx_service/long_tx_service_ut.cpp +++ b/ydb/core/tx/long_tx_service/long_tx_service_ut.cpp @@ -64,7 +64,7 @@ Y_UNIT_TEST_SUITE(LongTxService) { for (ui32 nodeIndex = 0; nodeIndex < runtime.GetNodeCount(); ++nodeIndex) { auto cacheConfig = MakeIntrusive<NSchemeCache::TSchemeCacheConfig>(); cacheConfig->Roots.emplace_back(1, SCHEME_SHARD1_ID, root); - cacheConfig->Counters = new NMonitoring::TDynamicCounters(); + cacheConfig->Counters = new ::NMonitoring::TDynamicCounters(); IActor* schemeCache = CreateSchemeBoardSchemeCache(cacheConfig.Get()); TActorId schemeCacheId = runtime.Register(schemeCache, nodeIndex); diff --git a/ydb/core/tx/mediator/tablet_queue.cpp b/ydb/core/tx/mediator/tablet_queue.cpp index 111518714a..3878119294 100644 --- a/ydb/core/tx/mediator/tablet_queue.cpp +++ b/ydb/core/tx/mediator/tablet_queue.cpp @@ -77,7 +77,7 @@ class TTxMediatorTabletQueue : public TActor<TTxMediatorTabletQueue> { TStepEntry *ActiveStep; THashSet<TActorId> TimecastWatches; - NMonitoring::TDynamicCounters::TCounterPtr TimecastLagCounter; + ::NMonitoring::TDynamicCounters::TCounterPtr TimecastLagCounter; void SendToTablet(TTabletEntry::TStep *tabletStep, ui64 tablet, const TActorContext &ctx) { auto evx = new TEvTxProcessing::TEvPlanStep(tabletStep->StepRef->Step, Mediator, tablet); diff --git a/ydb/core/tx/scheme_board/cache.cpp b/ydb/core/tx/scheme_board/cache.cpp index f2169e07b8..5eec5b9e11 100644 --- a/ydb/core/tx/scheme_board/cache.cpp +++ b/ydb/core/tx/scheme_board/cache.cpp @@ -542,7 +542,7 @@ namespace { class TSchemeCache: public TMonitorableActor<TSchemeCache> { class TCounters { - using TCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; using THistogramPtr = NMonitoring::THistogramPtr; TCounterPtr InFlight; @@ -557,7 +557,7 @@ class TSchemeCache: public TMonitorableActor<TSchemeCache> { TCounterPtr PerEntrySyncs; public: - explicit TCounters(NMonitoring::TDynamicCounterPtr counters) + explicit TCounters(::NMonitoring::TDynamicCounterPtr counters) : InFlight(counters->GetCounter("InFlight", false)) , Requests(counters->GetCounter("Requests", true)) , Hits(counters->GetCounter("Hits", true)) diff --git a/ydb/core/tx/scheme_board/cache_ut.cpp b/ydb/core/tx/scheme_board/cache_ut.cpp index 8630e45981..67bc8b04b2 100644 --- a/ydb/core/tx/scheme_board/cache_ut.cpp +++ b/ydb/core/tx/scheme_board/cache_ut.cpp @@ -26,7 +26,7 @@ public: TTestWithSchemeshard::SetUp(); TIntrusivePtr<TConfig> config = new TConfig(); - config->Counters = new NMonitoring::TDynamicCounters; + config->Counters = new ::NMonitoring::TDynamicCounters; config->Roots.push_back(TConfig::TTagEntry(0, TTestTxConfig::SchemeShard, "Root")); SchemeCache = Context->Register(CreateSchemeBoardSchemeCache(config.Get())); Context->EnableScheduleForActor(SchemeCache, true); diff --git a/ydb/core/tx/scheme_board/load_test.cpp b/ydb/core/tx/scheme_board/load_test.cpp index d993f1e5ed..5522df8506 100644 --- a/ydb/core/tx/scheme_board/load_test.cpp +++ b/ydb/core/tx/scheme_board/load_test.cpp @@ -309,11 +309,11 @@ public: private: const ui64 Owner; const TTestConfig Config; - NMonitoring::TDynamicCounters::TCounterPtr SyncDuration; - NMonitoring::TDynamicCounters::TCounterPtr TotalPaths; - NMonitoring::TDynamicCounters::TCounterPtr ModifiedPaths; - NMonitoring::TDynamicCounters::TCounterPtr CreatedPaths; - NMonitoring::TDynamicCounters::TCounterPtr DeletedPaths; + ::NMonitoring::TDynamicCounters::TCounterPtr SyncDuration; + ::NMonitoring::TDynamicCounters::TCounterPtr TotalPaths; + ::NMonitoring::TDynamicCounters::TCounterPtr ModifiedPaths; + ::NMonitoring::TDynamicCounters::TCounterPtr CreatedPaths; + ::NMonitoring::TDynamicCounters::TCounterPtr DeletedPaths; TDescriptions Descriptions; ui64 NextPathId; @@ -404,7 +404,7 @@ private: const TTestConfig Config; NMonitoring::THistogramPtr Latency; NMonitoring::THistogramPtr LatencyDir; - NMonitoring::TDynamicCounters::TCounterPtr SubscribersCount; + ::NMonitoring::TDynamicCounters::TCounterPtr SubscribersCount; ui64 MaxPathId; TVector<TActorId> Subscribers; diff --git a/ydb/core/tx/scheme_board/load_test.h b/ydb/core/tx/scheme_board/load_test.h index 271e96bf3f..c0bc15bdd1 100644 --- a/ydb/core/tx/scheme_board/load_test.h +++ b/ydb/core/tx/scheme_board/load_test.h @@ -8,7 +8,7 @@ namespace NKikimr { namespace NSchemeBoard { struct TTestConfig { - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; ui64 Dirs; ui64 ObjectsPerDir; @@ -18,7 +18,7 @@ struct TTestConfig { // creations/deletions ui32 InFlightChanges; - explicit TTestConfig(NMonitoring::TDynamicCounterPtr counters) + explicit TTestConfig(::NMonitoring::TDynamicCounterPtr counters) : Counters(counters) , Dirs(10) , ObjectsPerDir(10000) diff --git a/ydb/core/tx/scheme_cache/scheme_cache.cpp b/ydb/core/tx/scheme_cache/scheme_cache.cpp index 1024d73c19..cb861640d5 100644 --- a/ydb/core/tx/scheme_cache/scheme_cache.cpp +++ b/ydb/core/tx/scheme_cache/scheme_cache.cpp @@ -7,7 +7,7 @@ namespace NKikimr { namespace NSchemeCache { -TSchemeCacheConfig::TSchemeCacheConfig(const TAppData* appData, NMonitoring::TDynamicCounterPtr counters) +TSchemeCacheConfig::TSchemeCacheConfig(const TAppData* appData, ::NMonitoring::TDynamicCounterPtr counters) : Counters(counters) { Y_VERIFY(appData); diff --git a/ydb/core/tx/scheme_cache/scheme_cache.h b/ydb/core/tx/scheme_cache/scheme_cache.h index 47d64574d5..0e81ff9057 100644 --- a/ydb/core/tx/scheme_cache/scheme_cache.h +++ b/ydb/core/tx/scheme_cache/scheme_cache.h @@ -34,10 +34,10 @@ struct TSchemeCacheConfig : public TThrRefBase { }; TSchemeCacheConfig() = default; - explicit TSchemeCacheConfig(const TAppData* appData, NMonitoring::TDynamicCounterPtr counters); + explicit TSchemeCacheConfig(const TAppData* appData, ::NMonitoring::TDynamicCounterPtr counters); TVector<TTagEntry> Roots; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; }; struct TDomainInfo : public TAtomicRefCount<TDomainInfo> { diff --git a/ydb/core/tx/sequenceproxy/sequenceproxy_ut.cpp b/ydb/core/tx/sequenceproxy/sequenceproxy_ut.cpp index f08203fca0..5c163e2709 100644 --- a/ydb/core/tx/sequenceproxy/sequenceproxy_ut.cpp +++ b/ydb/core/tx/sequenceproxy/sequenceproxy_ut.cpp @@ -66,7 +66,7 @@ Y_UNIT_TEST_SUITE(SequenceProxy) { for (ui32 nodeIndex = 0; nodeIndex < runtime.GetNodeCount(); ++nodeIndex) { auto cacheConfig = MakeIntrusive<NSchemeCache::TSchemeCacheConfig>(); cacheConfig->Roots.emplace_back(1, SCHEME_SHARD1_ID, root); - cacheConfig->Counters = new NMonitoring::TDynamicCounters(); + cacheConfig->Counters = new ::NMonitoring::TDynamicCounters(); IActor* schemeCache = CreateSchemeBoardSchemeCache(cacheConfig.Get()); TActorId schemeCacheId = runtime.Register(schemeCache, nodeIndex); diff --git a/ydb/core/tx/tx_allocator/txallocator_impl.h b/ydb/core/tx/tx_allocator/txallocator_impl.h index 5a539f9b7b..d7508f590a 100644 --- a/ydb/core/tx/tx_allocator/txallocator_impl.h +++ b/ydb/core/tx/tx_allocator/txallocator_impl.h @@ -15,10 +15,10 @@ using NTabletFlatExecutor::ITransaction; namespace NTxAllocator { struct TTxAllocatorMonCounters { - TIntrusivePtr<NMonitoring::TDynamicCounters> AllocatorCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> AllocatorCounters; - NMonitoring::TDynamicCounters::TCounterPtr Allocated; - NMonitoring::TDynamicCounters::TCounterPtr AllocationsPresence; + ::NMonitoring::TDynamicCounters::TCounterPtr Allocated; + ::NMonitoring::TDynamicCounters::TCounterPtr AllocationsPresence; }; class TTxAllocator : public TActor<TTxAllocator>, public TTabletExecutedFlat { diff --git a/ydb/core/tx/tx_proxy/mon.cpp b/ydb/core/tx/tx_proxy/mon.cpp index 14f5d47064..518efa4706 100644 --- a/ydb/core/tx/tx_proxy/mon.cpp +++ b/ydb/core/tx/tx_proxy/mon.cpp @@ -5,7 +5,7 @@ namespace NKikimr { namespace NTxProxy { -TTxProxyMon::TTxProxyMon(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters) +TTxProxyMon::TTxProxyMon(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters) : Counters(counters) , TxGroup(GetServiceCounters(counters, "proxy")->GetSubgroup("subsystem", "tx")) , DataReqGroup(GetServiceCounters(counters, "proxy")->GetSubgroup("subsystem", "datareq")) diff --git a/ydb/core/tx/tx_proxy/mon.h b/ydb/core/tx/tx_proxy/mon.h index c0558f946b..94a55c5ed1 100644 --- a/ydb/core/tx/tx_proxy/mon.h +++ b/ydb/core/tx/tx_proxy/mon.h @@ -12,37 +12,37 @@ namespace NTxProxy { //////////////////////////////////////////////////////////////////////////// struct TTxProxyMon : public TThrRefBase { - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; // tx_proxy group - TIntrusivePtr<NMonitoring::TDynamicCounters> TxGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> TxGroup; NMonitoring::THistogramPtr CacheRequestLatency; - NMonitoring::TDynamicCounters::TCounterPtr Navigate; + ::NMonitoring::TDynamicCounters::TCounterPtr Navigate; NMonitoring::THistogramPtr NavigateLatency; - NMonitoring::TDynamicCounters::TCounterPtr SchemeRequest; + ::NMonitoring::TDynamicCounters::TCounterPtr SchemeRequest; NMonitoring::THistogramPtr SchemeRequestLatency; - NMonitoring::TDynamicCounters::TCounterPtr MakeRequest; + ::NMonitoring::TDynamicCounters::TCounterPtr MakeRequest; //NMonitoring::THistogramPtr MakeRequestLatency; - NMonitoring::TDynamicCounters::TCounterPtr SnapshotRequest; - NMonitoring::TDynamicCounters::TCounterPtr CommitWritesRequest; + ::NMonitoring::TDynamicCounters::TCounterPtr SnapshotRequest; + ::NMonitoring::TDynamicCounters::TCounterPtr CommitWritesRequest; - NMonitoring::TDynamicCounters::TCounterPtr SchemeRequestProxyNotReady; - NMonitoring::TDynamicCounters::TCounterPtr MakeRequestProxyNotReady; - NMonitoring::TDynamicCounters::TCounterPtr TxNotImplemented; - NMonitoring::TDynamicCounters::TCounterPtr KqpRequest; + ::NMonitoring::TDynamicCounters::TCounterPtr SchemeRequestProxyNotReady; + ::NMonitoring::TDynamicCounters::TCounterPtr MakeRequestProxyNotReady; + ::NMonitoring::TDynamicCounters::TCounterPtr TxNotImplemented; + ::NMonitoring::TDynamicCounters::TCounterPtr KqpRequest; - NMonitoring::TDynamicCounters::TCounterPtr DataReqInFly; - NMonitoring::TDynamicCounters::TCounterPtr SchemeReqInFly; - NMonitoring::TDynamicCounters::TCounterPtr NavigateReqInFly; + ::NMonitoring::TDynamicCounters::TCounterPtr DataReqInFly; + ::NMonitoring::TDynamicCounters::TCounterPtr SchemeReqInFly; + ::NMonitoring::TDynamicCounters::TCounterPtr NavigateReqInFly; // tx_proxy_datareq group - TIntrusivePtr<NMonitoring::TDynamicCounters> DataReqGroup; + TIntrusivePtr<::NMonitoring::TDynamicCounters> DataReqGroup; - NMonitoring::TDynamicCounters::TCounterPtr ReportStatusOK; - NMonitoring::TDynamicCounters::TCounterPtr ReportStatusNotOK; - NMonitoring::TDynamicCounters::TCounterPtr ReportStatusStreamData; + ::NMonitoring::TDynamicCounters::TCounterPtr ReportStatusOK; + ::NMonitoring::TDynamicCounters::TCounterPtr ReportStatusNotOK; + ::NMonitoring::TDynamicCounters::TCounterPtr ReportStatusStreamData; NMonitoring::THistogramPtr TxPrepareTimeHgram; NMonitoring::THistogramPtr TxExecuteTimeHgram; @@ -57,77 +57,77 @@ namespace NTxProxy { NMonitoring::THistogramPtr TxPrepareBuildShardProgramsHgram; NMonitoring::THistogramPtr TxPrepareSendShardProgramsHgram; - NMonitoring::TDynamicCounters::TCounterPtr MiniKQLResolveSentToShard; - NMonitoring::TDynamicCounters::TCounterPtr MiniKQLWrongRequest; - - NMonitoring::TDynamicCounters::TCounterPtr ReadTableResolveSentToShard; - NMonitoring::TDynamicCounters::TCounterPtr ReadTableWrongRequest; - - NMonitoring::TDynamicCounters::TCounterPtr MiniKQLProgramSize; - NMonitoring::TDynamicCounters::TCounterPtr MiniKQLParamsSize; - - NMonitoring::TDynamicCounters::TCounterPtr ExecTimeout; - NMonitoring::TDynamicCounters::TCounterPtr MarkShardError; - NMonitoring::TDynamicCounters::TCounterPtr PrepareErrorTimeout; - - NMonitoring::TDynamicCounters::TCounterPtr PlanClientDestroyed; - NMonitoring::TDynamicCounters::TCounterPtr PlanClientConnected; - NMonitoring::TDynamicCounters::TCounterPtr PlanCoordinatorDeclined; - - NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultComplete; - NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultAborted; - NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultResultUnavailable; - NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultCancelled; - NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultExecError; - - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusAccepted; - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusProcessed; - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusConfirmed; - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusPlanned; - NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusCoordinatorDeclined; - - NMonitoring::TDynamicCounters::TCounterPtr MakeRequestProxyAccepted; - NMonitoring::TDynamicCounters::TCounterPtr MakeRequestWrongRequest; - NMonitoring::TDynamicCounters::TCounterPtr MakeRequestEmptyAffectedSet; - - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetLegacySuccess; - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetMiniKQLSuccess; - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetReadTableSuccess; - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetFail; - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetWrongRequest; - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetDomainLocalityFail; - NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetRedirectUnavaible; - - NMonitoring::TDynamicCounters::TCounterPtr ClientConnectedOk; - NMonitoring::TDynamicCounters::TCounterPtr ClientConnectedError; - - NMonitoring::TDynamicCounters::TCounterPtr ClientDestroyedOk; - NMonitoring::TDynamicCounters::TCounterPtr ClientDestroyedError; - - NMonitoring::TDynamicCounters::TCounterPtr TxResultTabletPrepared; - NMonitoring::TDynamicCounters::TCounterPtr TxResultPrepared; - NMonitoring::TDynamicCounters::TCounterPtr TxResultComplete; - NMonitoring::TDynamicCounters::TCounterPtr TxResultError; - NMonitoring::TDynamicCounters::TCounterPtr TxResultAborted; - NMonitoring::TDynamicCounters::TCounterPtr TxResultFatal; - NMonitoring::TDynamicCounters::TCounterPtr TxResultShardOverloaded; - NMonitoring::TDynamicCounters::TCounterPtr TxResultShardTryLater; - NMonitoring::TDynamicCounters::TCounterPtr TxResultExecError; - NMonitoring::TDynamicCounters::TCounterPtr TxResultResultUnavailable; - NMonitoring::TDynamicCounters::TCounterPtr TxResultCancelled; - - NMonitoring::TDynamicCounters::TCounterPtr MergeResultRequestExecError; - NMonitoring::TDynamicCounters::TCounterPtr MergeResultRequestExecComplete; - NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLExecError; - NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLExecComplete; - NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLUnknownStatus; - - NMonitoring::TDynamicCounters::TCounterPtr ResultsReceivedCount; - NMonitoring::TDynamicCounters::TCounterPtr ResultsReceivedSize; + ::NMonitoring::TDynamicCounters::TCounterPtr MiniKQLResolveSentToShard; + ::NMonitoring::TDynamicCounters::TCounterPtr MiniKQLWrongRequest; + + ::NMonitoring::TDynamicCounters::TCounterPtr ReadTableResolveSentToShard; + ::NMonitoring::TDynamicCounters::TCounterPtr ReadTableWrongRequest; + + ::NMonitoring::TDynamicCounters::TCounterPtr MiniKQLProgramSize; + ::NMonitoring::TDynamicCounters::TCounterPtr MiniKQLParamsSize; + + ::NMonitoring::TDynamicCounters::TCounterPtr ExecTimeout; + ::NMonitoring::TDynamicCounters::TCounterPtr MarkShardError; + ::NMonitoring::TDynamicCounters::TCounterPtr PrepareErrorTimeout; + + ::NMonitoring::TDynamicCounters::TCounterPtr PlanClientDestroyed; + ::NMonitoring::TDynamicCounters::TCounterPtr PlanClientConnected; + ::NMonitoring::TDynamicCounters::TCounterPtr PlanCoordinatorDeclined; + + ::NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultComplete; + ::NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultAborted; + ::NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultResultUnavailable; + ::NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultCancelled; + ::NMonitoring::TDynamicCounters::TCounterPtr PlanClientTxResultExecError; + + ::NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusAccepted; + ::NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusProcessed; + ::NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusConfirmed; + ::NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusPlanned; + ::NMonitoring::TDynamicCounters::TCounterPtr ClientTxStatusCoordinatorDeclined; + + ::NMonitoring::TDynamicCounters::TCounterPtr MakeRequestProxyAccepted; + ::NMonitoring::TDynamicCounters::TCounterPtr MakeRequestWrongRequest; + ::NMonitoring::TDynamicCounters::TCounterPtr MakeRequestEmptyAffectedSet; + + ::NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetLegacySuccess; + ::NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetMiniKQLSuccess; + ::NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetReadTableSuccess; + ::NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetFail; + ::NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetWrongRequest; + ::NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetDomainLocalityFail; + ::NMonitoring::TDynamicCounters::TCounterPtr ResolveKeySetRedirectUnavaible; + + ::NMonitoring::TDynamicCounters::TCounterPtr ClientConnectedOk; + ::NMonitoring::TDynamicCounters::TCounterPtr ClientConnectedError; + + ::NMonitoring::TDynamicCounters::TCounterPtr ClientDestroyedOk; + ::NMonitoring::TDynamicCounters::TCounterPtr ClientDestroyedError; + + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultTabletPrepared; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultPrepared; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultComplete; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultError; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultAborted; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultFatal; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultShardOverloaded; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultShardTryLater; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultExecError; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultResultUnavailable; + ::NMonitoring::TDynamicCounters::TCounterPtr TxResultCancelled; + + ::NMonitoring::TDynamicCounters::TCounterPtr MergeResultRequestExecError; + ::NMonitoring::TDynamicCounters::TCounterPtr MergeResultRequestExecComplete; + ::NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLExecError; + ::NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLExecComplete; + ::NMonitoring::TDynamicCounters::TCounterPtr MergeResultMiniKQLUnknownStatus; + + ::NMonitoring::TDynamicCounters::TCounterPtr ResultsReceivedCount; + ::NMonitoring::TDynamicCounters::TCounterPtr ResultsReceivedSize; TAlignedPagePoolCounters AllocPoolCounters; - TTxProxyMon(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters); + TTxProxyMon(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters); }; } // NTxProxy diff --git a/ydb/core/tx/tx_proxy/proxy_impl.cpp b/ydb/core/tx/tx_proxy/proxy_impl.cpp index 20dc8cce17..0789be93e7 100644 --- a/ydb/core/tx/tx_proxy/proxy_impl.cpp +++ b/ydb/core/tx/tx_proxy/proxy_impl.cpp @@ -57,7 +57,7 @@ class TTxProxy : public TActorBootstrapped<TTxProxy> { typedef TDelayedQueue<TEvTxUserProxy::TEvAllocateTxId> TDelayedAllocateTxId; TDelayedAllocateTxId DelayedAllocateTxId; - TIntrusivePtr<NMonitoring::TDynamicCounters> CacheCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> CacheCounters; TIntrusivePtr<TTxProxyMon> TxProxyMon; TRequestControls RequestControls; diff --git a/ydb/core/util/cache_cache.h b/ydb/core/util/cache_cache.h index a8ab10977d..850b6b05f5 100644 --- a/ydb/core/util/cache_cache.h +++ b/ydb/core/util/cache_cache.h @@ -9,7 +9,7 @@ namespace NKikimr { struct TCacheCacheConfig : public TAtomicRefCount<TCacheCacheConfig> { - using TCounterPtr = NMonitoring::TDynamicCounters::TCounterPtr; + using TCounterPtr = ::NMonitoring::TDynamicCounters::TCounterPtr; enum ECacheGeneration { CacheGenNone, diff --git a/ydb/core/util/memory_tracker.cpp b/ydb/core/util/memory_tracker.cpp index 848b36e276..cbec61b07d 100644 --- a/ydb/core/util/memory_tracker.cpp +++ b/ydb/core/util/memory_tracker.cpp @@ -88,7 +88,7 @@ private: GatherDynamicMetrics(); } - void RegisterCounters(NMonitoring::TDynamicCounterPtr counters) { + void RegisterCounters(::NMonitoring::TDynamicCounterPtr counters) { auto componentGroup = counters->GetSubgroup("component", "memory_tracker"); auto count = TMemoryTracker::Instance()->GetCount(); diff --git a/ydb/core/util/memory_tracker.h b/ydb/core/util/memory_tracker.h index 1db4ee3e9e..f8adcaaf55 100644 --- a/ydb/core/util/memory_tracker.h +++ b/ydb/core/util/memory_tracker.h @@ -11,7 +11,7 @@ namespace NMemory { NActors::IActor* CreateMemoryTrackerActor( TDuration updateInterval, - NMonitoring::TDynamicCounterPtr counters); + ::NMonitoring::TDynamicCounterPtr counters); } } diff --git a/ydb/core/util/testactorsys.h b/ydb/core/util/testactorsys.h index 27a61b2042..bd3976c79e 100644 --- a/ydb/core/util/testactorsys.h +++ b/ydb/core/util/testactorsys.h @@ -169,7 +169,7 @@ public: , LoggerSettings_(MakeIntrusive<NLog::TSettings>(TActorId(0, "logger"), NKikimrServices::LOGGER, defaultPrio)) , InterconnectMock(0, Max<ui64>(), this) // burst capacity (bytes), bytes per second { - AppData.Counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + AppData.Counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); AppData.DomainsInfo = MakeIntrusive<TDomainsInfo>(); LoggerSettings_->Append( NActorsServices::EServiceCommon_MIN, diff --git a/ydb/core/util/throughput_meter.h b/ydb/core/util/throughput_meter.h index 935dae2178..00f9fd9f6b 100644 --- a/ydb/core/util/throughput_meter.h +++ b/ydb/core/util/throughput_meter.h @@ -9,7 +9,7 @@ namespace NKikimr { { const ui64 UpdateDivisionFactor; const ui64 WindowUpdateTimeoutNs; - TVector<std::pair<float, NMonitoring::TDynamicCounters::TCounterPtr>> Counters; + TVector<std::pair<float, ::NMonitoring::TDynamicCounters::TCounterPtr>> Counters; ui64 CumTimeNs = 0; ui64 CumBytes = 0; @@ -18,13 +18,13 @@ namespace NKikimr { TVector<ui64> Histogram; public: - TThroughputMeter(ui64 updateDivisionFactor, const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + TThroughputMeter(ui64 updateDivisionFactor, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TString& group, const TString& subgroup, const TString& name, const TVector<float>& thresholds, const TDuration& windowUpdateTimeout = TDuration::MilliSeconds(10)) : UpdateDivisionFactor(updateDivisionFactor) , WindowUpdateTimeoutNs(windowUpdateTimeout.NanoSeconds()) { - TIntrusivePtr<NMonitoring::TDynamicCounters> histGroup = + TIntrusivePtr<::NMonitoring::TDynamicCounters> histGroup = counters->GetSubgroup(group, subgroup)->GetSubgroup("sensor", name); for (float threshold : thresholds) { Counters.emplace_back(threshold, histGroup->GetNamedCounter("percentile", Sprintf("%.1f", threshold * 100))); diff --git a/ydb/core/ymq/actor/action.h b/ydb/core/ymq/actor/action.h index ee01dc2528..9327325096 100644 --- a/ydb/core/ymq/actor/action.h +++ b/ydb/core/ymq/actor/action.h @@ -763,8 +763,8 @@ protected: TMaybe<ui32> TablesFormat_; TInstant StartTs_; TInstant FinishTs_; - TIntrusivePtr<NMonitoring::TDynamicCounters> SqsCoreCounters_; // Raw counters interface. Is is not prefered to use them - TIntrusivePtr<NMonitoring::TDynamicCounters> YmqRootCounters_; // Raw counters interface. Is is not prefered to use them + TIntrusivePtr<::NMonitoring::TDynamicCounters> SqsCoreCounters_; // Raw counters interface. Is is not prefered to use them + TIntrusivePtr<::NMonitoring::TDynamicCounters> YmqRootCounters_; // Raw counters interface. Is is not prefered to use them TIntrusivePtr<TUserCounters> UserCounters_; TIntrusivePtr<TQueueCounters> QueueCounters_; TMaybe<TSqsEvents::TQueueAttributes> QueueAttributes_; diff --git a/ydb/core/ymq/actor/events.h b/ydb/core/ymq/actor/events.h index 1b3edbcd17..71bfaf13e7 100644 --- a/ydb/core/ymq/actor/events.h +++ b/ydb/core/ymq/actor/events.h @@ -194,7 +194,7 @@ struct TSqsEvents { TIntrusivePtr<TQuoterResourcesForActions> QuoterResources; // Counters - TIntrusivePtr<NMonitoring::TDynamicCounters> SqsCoreCounters; // Raw counters interface. Is is not prefered to use them + TIntrusivePtr<::NMonitoring::TDynamicCounters> SqsCoreCounters; // Raw counters interface. Is is not prefered to use them TIntrusivePtr<TUserCounters> UserCounters; TIntrusivePtr<TQueueCounters> QueueCounters; diff --git a/ydb/core/ymq/actor/proxy_service.h b/ydb/core/ymq/actor/proxy_service.h index a3c991105f..99232f6fca 100644 --- a/ydb/core/ymq/actor/proxy_service.h +++ b/ydb/core/ymq/actor/proxy_service.h @@ -85,8 +85,8 @@ private: void HandleGetLeaderNodeForQueueResponse(TSqsEvents::TEvGetLeaderNodeForQueueResponse::TPtr& ev); private: - TIntrusivePtr<NMonitoring::TDynamicCounters> SqsCounters_; - TIntrusivePtr<NMonitoring::TDynamicCounters> YmqPublicCounters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> SqsCounters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> YmqPublicCounters_; /// A map of node ids to TNodeIfno THashMap<ui32, TNodeInfoRef> NodesInfo_; diff --git a/ydb/core/ymq/actor/service.h b/ydb/core/ymq/actor/service.h index ac651c3501..32588a0750 100644 --- a/ydb/core/ymq/actor/service.h +++ b/ydb/core/ymq/actor/service.h @@ -133,8 +133,8 @@ private: private: TString RootUrl_; - TIntrusivePtr<NMonitoring::TDynamicCounters> SqsCoreCounters_; - TIntrusivePtr<NMonitoring::TDynamicCounters> YmqRootCounters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> SqsCoreCounters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> YmqRootCounters_; std::shared_ptr<TAlignedPagePoolCounters> AllocPoolCounters_; TIntrusivePtr<TUserCounters> AggregatedUserCounters_; TUsersMap Users_; diff --git a/ydb/core/ymq/base/counters.cpp b/ydb/core/ymq/base/counters.cpp index 36486efcca..e0c92702ae 100644 --- a/ydb/core/ymq/base/counters.cpp +++ b/ydb/core/ymq/base/counters.cpp @@ -298,10 +298,10 @@ static_assert(AbsDiffLessThanCounter(HttpUserCountersDescriptor.SizeOfCounters() sizeof(NKikimrConfig::TSqsConfig*) + sizeof(TIntrusivePtr<THttpUserCounters>), sizeof(THttpUserCounters))); -TIntrusivePtr<NMonitoring::TDynamicCounters> GetSqsServiceCounters(const TIntrusivePtr<NMonitoring::TDynamicCounters>& countersRoot, const TString& subgroup) { +TIntrusivePtr<::NMonitoring::TDynamicCounters> GetSqsServiceCounters(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& countersRoot, const TString& subgroup) { return GetServiceCounters(countersRoot, "sqs")->GetSubgroup("subsystem", subgroup); } -TIntrusivePtr<NMonitoring::TDynamicCounters> GetYmqPublicCounters(const TIntrusivePtr<NMonitoring::TDynamicCounters>& countersRoot) { +TIntrusivePtr<::NMonitoring::TDynamicCounters> GetYmqPublicCounters(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& countersRoot) { // Remove subgroup and don't have subsystem (is this correct - ?) return GetServiceCounters(countersRoot, "ymq_public"); } @@ -349,13 +349,13 @@ std::pair<TIntrusivePtrCntrCouple, TIntrusivePtrCntrCouple> GetUserAndQueueCount return { std::move(userCounters), std::move(queueCounters) }; } -TIntrusivePtr<NMonitoring::TDynamicCounters> GetAggregatedCountersFromSqsCoreCounters( +TIntrusivePtr<::NMonitoring::TDynamicCounters> GetAggregatedCountersFromSqsCoreCounters( const TIntrusivePtrCntrCouple& rootCounters, const NKikimrConfig::TSqsConfig& cfg ) { return GetAggregatedCountersFromUserCounters(GetUserCounters(rootCounters, TOTAL_COUNTER_LABEL), cfg); } -TIntrusivePtr<NMonitoring::TDynamicCounters> GetAggregatedCountersFromUserCounters( +TIntrusivePtr<::NMonitoring::TDynamicCounters> GetAggregatedCountersFromUserCounters( const TIntrusivePtrCntrCouple& userCounters, const NKikimrConfig::TSqsConfig& cfg ) { if (cfg.GetYandexCloudMode()) { @@ -406,7 +406,7 @@ ELaziness Lazy(const NKikimrConfig::TSqsConfig& cfg) { #define INIT_HISTOGRAM_COUNTER(rootCounters, variable, expiring, buckets, lazy) \ INIT_HISTOGRAM_COUNTER_WITH_NAME(rootCounters, variable, Y_STRINGIZE(variable), expiring, buckets, lazy) -void TActionCounters::Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, EAction action, ELifetime lifetime) { +void TActionCounters::Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, EAction action, ELifetime lifetime) { const ELaziness laziness = IsActionForMessage(action) ? Lazy(cfg) : ELaziness::OnDemand; const EAction nonBatch = GetNonBatchAction(action); INIT_COUNTER_WITH_NAME(rootCounters, Success, TStringBuilder() << nonBatch << "_Success", lifetime, EValueType::Derivative, laziness); @@ -421,7 +421,7 @@ void TActionCounters::Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusiv } void TYmqActionCounters::Init( - const NKikimrConfig::TSqsConfig&, const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, + const NKikimrConfig::TSqsConfig&, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, EAction action, const TString& labelName, const TString& namePrefix, ELifetime lifetime ) { const auto& methodName = ActionToCloudConvMethod(action); @@ -450,7 +450,7 @@ void TQueryTypeCounters::SetAggregatedParent(TQueryTypeCounters* parent) { QueryTypeCountersDescriptor.SetAggregatedParent(this, parent); } -void TTransactionCounters::Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, +void TTransactionCounters::Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, std::shared_ptr<TAlignedPagePoolCounters> poolCounters, bool forQueue) { AllocPoolCounters = std::move(poolCounters); @@ -482,7 +482,7 @@ void TTransactionCounters::SetAggregatedParent(const TIntrusivePtr<TTransactionC } } -void TAPIStatusesCounters::Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& root) { +void TAPIStatusesCounters::Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& root) { auto statusesByType = root->GetSubgroup(DEFAULT_COUNTER_NAME, "StatusesByType"); for (const TString& errorCode : TErrorClass::GetAvailableErrorCodes()) { ErrorToCounter[errorCode].Init(statusesByType, ELifetime::Persistent, EValueType::Derivative, STATUS_CODE, errorCode, ELaziness::OnDemand); @@ -523,7 +523,7 @@ TFolderCounters::TFolderCounters(const TUserCounters* userCounters, const TStrin if (insertCounters) { FolderCounters = GetFolderCounters(UserCounters, folderId); } else { - FolderCounters = {new NMonitoring::TDynamicCounters(), new NMonitoring::TDynamicCounters()}; + FolderCounters = {new ::NMonitoring::TDynamicCounters(), new ::NMonitoring::TDynamicCounters()}; } //InitCounters(); } @@ -578,7 +578,7 @@ TQueueCounters::TQueueCounters(const NKikimrConfig::TSqsConfig& cfg, if (insertCounters) { QueueCounters = GetQueueCounters(FolderCounters.Defined() ? FolderCounters : UserCounters, queueName); } else { - QueueCounters = {new NMonitoring::TDynamicCounters(), new NMonitoring::TDynamicCounters()}; + QueueCounters = {new ::NMonitoring::TDynamicCounters(), new ::NMonitoring::TDynamicCounters()}; } InitCounters(); } @@ -712,7 +712,7 @@ void TQueueCounters::InitCounters(bool forLeaderNode) { DetailedCounters.Init(QueueCounters.SqsCounters, AllocPoolCounters, forLeaderNode); } -void TQueueCounters::TDetailedCounters::Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& queueCounters, +void TQueueCounters::TDetailedCounters::Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& queueCounters, const std::shared_ptr<TAlignedPagePoolCounters>& allocPoolCounters, bool forLeaderNode) { if (!GetConfiguration_Duration) { INIT_HISTOGRAM_COUNTER(queueCounters, GetConfiguration_Duration, ELifetime::Expiring, DurationBucketsMs, ELaziness::OnDemand); @@ -922,7 +922,7 @@ void THttpUserCounters::SetAggregatedParent(const TIntrusivePtr<THttpUserCounter } } -void THttpActionCounters::Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, EAction action) { +void THttpActionCounters::Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, EAction action) { Cfg = &cfg; Requests.Init(rootCounters, ELifetime::Persistent, EValueType::Derivative, TStringBuilder() << action << "Request", Lazy(*Cfg)); } @@ -970,7 +970,7 @@ void TCloudAuthCounters::IncCounter(const NCloudAuth::EActionType actionType, co ++*CloudAuthCounters[actionType][credentialType][grpcStatus]; } -void TCloudAuthCounters::InitCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> cloudAuthCounters) { +void TCloudAuthCounters::InitCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> cloudAuthCounters) { for (size_t actionType = 0; actionType < NCloudAuth::EActionType::ActionTypesCount; ++actionType) { const auto actionTypeStr = ToString(static_cast<NCloudAuth::EActionType>(actionType)); const auto actionCounters = cloudAuthCounters->GetSubgroup("action_type", actionTypeStr); diff --git a/ydb/core/ymq/base/counters.h b/ydb/core/ymq/base/counters.h index 8851cdff71..c078e8472b 100644 --- a/ydb/core/ymq/base/counters.h +++ b/ydb/core/ymq/base/counters.h @@ -99,20 +99,20 @@ struct TCountersCouple { } }; -using TIntrusivePtrCntrCouple = TCountersCouple<TIntrusivePtr<NMonitoring::TDynamicCounters>>; +using TIntrusivePtrCntrCouple = TCountersCouple<TIntrusivePtr<::NMonitoring::TDynamicCounters>>; -TIntrusivePtr<NMonitoring::TDynamicCounters> GetSqsServiceCounters( - const TIntrusivePtr<NMonitoring::TDynamicCounters>& countersRoot, const TString& subgroup); -TIntrusivePtr<NMonitoring::TDynamicCounters> GetYmqPublicCounters( - const TIntrusivePtr<NMonitoring::TDynamicCounters>& countersRoot); +TIntrusivePtr<::NMonitoring::TDynamicCounters> GetSqsServiceCounters( + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& countersRoot, const TString& subgroup); +TIntrusivePtr<::NMonitoring::TDynamicCounters> GetYmqPublicCounters( + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& countersRoot); TIntrusivePtrCntrCouple GetFolderCounters(const TIntrusivePtrCntrCouple& userCounters, const TString& folderId); void RemoveFolderCounters(const TIntrusivePtrCntrCouple& userCounters, const TString& folderId); std::pair<TIntrusivePtrCntrCouple, TIntrusivePtrCntrCouple> GetUserAndQueueCounters( const TIntrusivePtrCntrCouple& sqsRootCounters, const TQueuePath& queuePath); -TIntrusivePtr<NMonitoring::TDynamicCounters> GetAggregatedCountersFromSqsCoreCounters( +TIntrusivePtr<::NMonitoring::TDynamicCounters> GetAggregatedCountersFromSqsCoreCounters( const TIntrusivePtrCntrCouple& sqsCoreCounters, const NKikimrConfig::TSqsConfig& cfg); -TIntrusivePtr<NMonitoring::TDynamicCounters> GetAggregatedCountersFromUserCounters( +TIntrusivePtr<::NMonitoring::TDynamicCounters> GetAggregatedCountersFromUserCounters( const TIntrusivePtrCntrCouple& sqsCoreCounters, const NKikimrConfig::TSqsConfig& cfg); extern const TString DEFAULT_COUNTER_NAME; @@ -226,11 +226,11 @@ struct TLazyCachedCounterBase { } } - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, const TString& value, ELaziness laziness) { + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, const TString& value, ELaziness laziness) { Init(rootCounters, lifetime, DEFAULT_COUNTER_NAME, value, laziness); } - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, const TString& name, const TString& value, ELaziness laziness) { + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, const TString& name, const TString& value, ELaziness laziness) { RootCounters = rootCounters; Name = name; Value = value; @@ -291,7 +291,7 @@ protected: protected: TLazyCachedCounterBase* AggregatedParent = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> RootCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> RootCounters; TString Name; TString Value; ELifetime Lifetime = ELifetime::Persistent; @@ -304,11 +304,11 @@ struct TLazyCachedCounter : public NDetails::TLazyCachedCounterBase<NMonitoring: TLazyCachedCounter() = default; TLazyCachedCounter(const TLazyCachedCounter&) = default; - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, EValueType valueType, const TString& value, ELaziness laziness) { + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, EValueType valueType, const TString& value, ELaziness laziness) { Init(rootCounters, lifetime, valueType, DEFAULT_COUNTER_NAME, value, laziness); } - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, EValueType valueType, const TString& name, const TString& value, ELaziness laziness) { + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, EValueType valueType, const TString& name, const TString& value, ELaziness laziness) { TLazyCachedCounterBase::Init(rootCounters, lifetime, name, value, ELaziness::OnDemand); ValueType = valueType; if (laziness == ELaziness::OnStart) { @@ -338,11 +338,11 @@ struct TLazyCachedHistogram : public NDetails::TLazyCachedCounterBase<NMonitorin TLazyCachedHistogram() = default; TLazyCachedHistogram(const TLazyCachedHistogram&) = default; - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, const NMonitoring::TBucketBounds& buckets, const TString& value, ELaziness laziness) { + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, const NMonitoring::TBucketBounds& buckets, const TString& value, ELaziness laziness) { Init(rootCounters, lifetime, buckets, DEFAULT_COUNTER_NAME, value, laziness); } - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, const NMonitoring::TBucketBounds& buckets, const TString& name, const TString& value, ELaziness laziness) { + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, ELifetime lifetime, const NMonitoring::TBucketBounds& buckets, const TString& name, const TString& value, ELaziness laziness) { Buckets = &buckets; TLazyCachedCounterBase::Init(rootCounters, lifetime, name, value, ELaziness::OnDemand); if (laziness == ELaziness::OnStart) { @@ -380,7 +380,7 @@ public: TLazyCachedHistogram WorkingDuration; // Special duration except wait time for ReceiveMessage action (== 18 counters). // User metric for cloud console (ReceiveMessage). public: - void Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, + void Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, EAction action, ELifetime lifetime = ELifetime::Persistent); virtual void SetAggregatedParent(TActionCounters* parent); @@ -388,7 +388,7 @@ public: }; struct TYmqActionCounters : public TActionCounters { - void Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, + void Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, EAction action, const TString& labelName, const TString& namePrefix, ELifetime lifetime = ELifetime::Persistent); public: @@ -398,7 +398,7 @@ public: } private: - NMonitoring::TDynamicCounterPtr SubGroup; + ::NMonitoring::TDynamicCounterPtr SubGroup; }; // Counters for typed queries (WRITE_MESSAGE_ID, PURGE_QUEUE_ID and etc). @@ -430,7 +430,7 @@ struct TTransactionCounters : public TAtomicRefCount<TTransactionCounters> { void SetAggregatedParent(const TIntrusivePtr<TTransactionCounters>& parent); public: - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, std::shared_ptr<TAlignedPagePoolCounters> poolCounters, bool forQueue); }; @@ -440,7 +440,7 @@ public: void AddError(const TString& errorCode, size_t count = 1); void AddOk(size_t count = 1); - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& root); + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& root); void SetAggregatedParent(TAPIStatusesCounters* parent); @@ -493,8 +493,8 @@ struct TUserCounters : public TAtomicRefCount<TUserCounters> { TIntrusivePtrCntrCouple UserCounters; // User tree in core subsystem TUserCounters( - const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<NMonitoring::TDynamicCounters>& sqsCoreCounters, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& ymqRootCounters, + const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& sqsCoreCounters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& ymqRootCounters, const std::shared_ptr<TAlignedPagePoolCounters>& allocPoolCounters, const TString& userName, const TIntrusivePtr<TUserCounters>& aggregatedParent, bool isAggregatedCounters = false @@ -630,7 +630,7 @@ struct TQueueCounters : public TAtomicRefCount<TQueueCounters> { TLazyCachedHistogram ReceiveMessageImmediate_Duration; // Time for receive message request that was processed with only one attempt (without wait or try many shards). Histogram with buckets for durations (== 18 counters). - void Init(const TIntrusivePtr<NMonitoring::TDynamicCounters>& queueCounters, + void Init(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& queueCounters, const std::shared_ptr<TAlignedPagePoolCounters>& allocPoolCounters, bool forLeaderNode); void SetAggregatedParent(TDetailedCounters* parent); }; @@ -716,7 +716,7 @@ private: struct THttpActionCounters { TLazyCachedCounter Requests; // Requests count of given type. - void Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<NMonitoring::TDynamicCounters>& rootCounters, EAction action); + void Init(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& rootCounters, EAction action); void SetAggregatedParent(THttpActionCounters* parent); private: @@ -731,10 +731,10 @@ struct THttpUserCounters : public TAtomicRefCount<THttpUserCounters> { // Raw counters interface // Don't use counters by name! - TIntrusivePtr<NMonitoring::TDynamicCounters> SqsHttpCounters; // Sqs http subsystem - TIntrusivePtr<NMonitoring::TDynamicCounters> UserCounters; // User tree in core subsystem + TIntrusivePtr<::NMonitoring::TDynamicCounters> SqsHttpCounters; // Sqs http subsystem + TIntrusivePtr<::NMonitoring::TDynamicCounters> UserCounters; // User tree in core subsystem - THttpUserCounters(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<NMonitoring::TDynamicCounters>& sqsHttpCounters, const TString& userName) + THttpUserCounters(const NKikimrConfig::TSqsConfig& cfg, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& sqsHttpCounters, const TString& userName) : SqsHttpCounters(sqsHttpCounters) , Cfg(&cfg) { @@ -758,9 +758,9 @@ struct THttpCounters : public TAtomicRefCount<THttpCounters> { // Raw counters interface // Don't use counters by name! - TIntrusivePtr<NMonitoring::TDynamicCounters> SqsHttpCounters; // Sqs http subsystem + TIntrusivePtr<::NMonitoring::TDynamicCounters> SqsHttpCounters; // Sqs http subsystem - THttpCounters(const NKikimrConfig::TSqsConfig& cfg, TIntrusivePtr<NMonitoring::TDynamicCounters> sqsHttpCounters) + THttpCounters(const NKikimrConfig::TSqsConfig& cfg, TIntrusivePtr<::NMonitoring::TDynamicCounters> sqsHttpCounters) : SqsHttpCounters(std::move(sqsHttpCounters)) , Cfg(&cfg) { @@ -787,7 +787,7 @@ struct TCloudAuthCounters { TLazyCachedHistogram AuthorizeDuration; // Histogram with buckets for durations (== 18 counters). TLazyCachedHistogram GetFolderIdDuration; // Histogram with buckets for durations (== 18 counters). - explicit TCloudAuthCounters(const NKikimrConfig::TSqsConfig& cfg, TIntrusivePtr<NMonitoring::TDynamicCounters> cloudAuthCountersRoot) + explicit TCloudAuthCounters(const NKikimrConfig::TSqsConfig& cfg, TIntrusivePtr<::NMonitoring::TDynamicCounters> cloudAuthCountersRoot) : Cfg(&cfg) { InitCounters(std::move(cloudAuthCountersRoot)); @@ -798,7 +798,7 @@ struct TCloudAuthCounters { static constexpr int GRPC_STATUSES_COUNT = 18; private: - void InitCounters(TIntrusivePtr<NMonitoring::TDynamicCounters> cloudAuthCounters); + void InitCounters(TIntrusivePtr<::NMonitoring::TDynamicCounters> cloudAuthCounters); private: const NKikimrConfig::TSqsConfig* Cfg = nullptr; @@ -812,7 +812,7 @@ struct TMeteringCounters : public TAtomicRefCount<TMeteringCounters> { THashMap<TString, TLazyCachedCounter> ClassifierRequestsResults; THashMap<TString, TLazyCachedCounter> IdleClassifierRequestsResults; - TMeteringCounters(const NKikimrConfig::TSqsConfig& config, const TIntrusivePtr<NMonitoring::TDynamicCounters>& sqsMeteringCounters, const TVector<TString>& classifierLabels) + TMeteringCounters(const NKikimrConfig::TSqsConfig& config, const TIntrusivePtr<::NMonitoring::TDynamicCounters>& sqsMeteringCounters, const TVector<TString>& classifierLabels) : SqsMeteringCounters(sqsMeteringCounters) , Config(config) { @@ -823,7 +823,7 @@ private: void InitCounters(const TVector<TString>& classifierLabels); private: - TIntrusivePtr<NMonitoring::TDynamicCounters> SqsMeteringCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> SqsMeteringCounters; const NKikimrConfig::TSqsConfig& Config; }; diff --git a/ydb/core/ymq/base/events_writer_iface.h b/ydb/core/ymq/base/events_writer_iface.h index 4fcd6ab50a..7bc7b7643a 100644 --- a/ydb/core/ymq/base/events_writer_iface.h +++ b/ydb/core/ymq/base/events_writer_iface.h @@ -26,7 +26,7 @@ private: class IEventsWriterFactory { public: - virtual IEventsWriterWrapper::TPtr CreateEventsWriter(const NKikimrConfig::TSqsConfig& config, const NMonitoring::TDynamicCounterPtr& counters) const = 0; + virtual IEventsWriterWrapper::TPtr CreateEventsWriter(const NKikimrConfig::TSqsConfig& config, const ::NMonitoring::TDynamicCounterPtr& counters) const = 0; virtual ~IEventsWriterFactory() {} }; diff --git a/ydb/core/ymq/base/ut/counters_ut.cpp b/ydb/core/ymq/base/ut/counters_ut.cpp index 5ff3d26e36..66df2d5741 100644 --- a/ydb/core/ymq/base/ut/counters_ut.cpp +++ b/ydb/core/ymq/base/ut/counters_ut.cpp @@ -9,7 +9,7 @@ namespace NKikimr::NSQS { -TString CountersString(const TIntrusivePtr<NMonitoring::TDynamicCounters>& root) { +TString CountersString(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& root) { TStringStream ss; root->OutputPlainText(ss); return ss.Str(); @@ -36,10 +36,10 @@ std::vector<std::pair<TString, TString>> ParseCounterPath(const TString& path) { // "counters" - simple counter. // "path/counter" - simple path. // "user=my_user/queue=my_queue/TransactionCount" - with nondefault names. -void AssertCounterValue(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, const TString& path, i64 expectedValue) { +void AssertCounterValue(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TString& path, i64 expectedValue) { const auto pathComponents = ParseCounterPath(path); UNIT_ASSERT_GT(pathComponents.size(), 0); - TIntrusivePtr<NMonitoring::TDynamicCounters> parent = counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> parent = counters; for (size_t i = 0; i < pathComponents.size() - 1; ++i) { parent = parent->FindSubgroup(pathComponents[i].first, pathComponents[i].second); UNIT_ASSERT_C(parent, "Subgroup \"" << pathComponents[i].first << "=" << pathComponents[i].second << "\" was not found. Level: " << i); @@ -52,7 +52,7 @@ void AssertCounterValue(const TIntrusivePtr<NMonitoring::TDynamicCounters>& coun << "\nCounters string:\n" << CountersString(counters)); } -void AssertCounterValues(const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, const std::vector<std::pair<TString, i64>>& expectedValues) { +void AssertCounterValues(const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const std::vector<std::pair<TString, i64>>& expectedValues) { for (const auto& [path, expectedValue] : expectedValues) { AssertCounterValue(counters, path, expectedValue); } @@ -60,7 +60,7 @@ void AssertCounterValues(const TIntrusivePtr<NMonitoring::TDynamicCounters>& cou Y_UNIT_TEST_SUITE(LazyCounterTest) { Y_UNIT_TEST(LazyCounterTest) { - TIntrusivePtr<NMonitoring::TDynamicCounters> root = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> root = new ::NMonitoring::TDynamicCounters(); TLazyCachedCounter counter, counter2, counter3; counter.Init(root, ELifetime::Persistent, EValueType::Absolute, "A", ELaziness::OnDemand); counter3.Init(root, ELifetime::Persistent, EValueType::Absolute, "B", ELaziness::OnStart); @@ -71,7 +71,7 @@ Y_UNIT_TEST_SUITE(LazyCounterTest) { } void AggregationTest(ELaziness lazy) { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters(); TLazyCachedCounter parent; parent.Init(counters, ELifetime::Persistent, EValueType::Absolute, "parent", lazy); @@ -164,7 +164,7 @@ Y_UNIT_TEST_SUITE(LazyCounterTest) { } Y_UNIT_TEST(HistogramAggregationTest) { - TIntrusivePtr<NMonitoring::TDynamicCounters> counters = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters = new ::NMonitoring::TDynamicCounters(); const NMonitoring::TBucketBounds buckets = { 1, 3, 5 }; TLazyCachedHistogram parent; parent.Init(counters, ELifetime::Persistent, buckets, "parent", ELaziness::OnStart); @@ -218,8 +218,8 @@ Y_UNIT_TEST_SUITE(UserCountersTest) { Y_UNIT_TEST(DisableCountersTest) { NKikimrConfig::TSqsConfig cfg; cfg.SetCreateLazyCounters(false); - TIntrusivePtr<NMonitoring::TDynamicCounters> core = new NMonitoring::TDynamicCounters(); - TIntrusivePtr<NMonitoring::TDynamicCounters> ymqCounters = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> core = new ::NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> ymqCounters = new ::NMonitoring::TDynamicCounters(); TIntrusivePtr<TUserCounters> user1 = new TUserCounters(cfg, core, ymqCounters, nullptr, "user1", nullptr); TIntrusivePtr<TUserCounters> user2 = new TUserCounters(cfg, core, ymqCounters, nullptr, "user2", nullptr); ASSERT_USER_PRESENT("user1"); @@ -270,8 +270,8 @@ Y_UNIT_TEST_SUITE(UserCountersTest) { Y_UNIT_TEST(RemoveUserCountersTest) { NKikimrConfig::TSqsConfig cfg; cfg.SetCreateLazyCounters(false); - TIntrusivePtr<NMonitoring::TDynamicCounters> core = new NMonitoring::TDynamicCounters(); - TIntrusivePtr<NMonitoring::TDynamicCounters> ymqCounters = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> core = new ::NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> ymqCounters = new ::NMonitoring::TDynamicCounters(); TIntrusivePtr<TUserCounters> user = new TUserCounters(cfg, core, ymqCounters, nullptr, "my_user", nullptr); ASSERT_USER_PRESENT("my_user"); @@ -283,8 +283,8 @@ Y_UNIT_TEST_SUITE(UserCountersTest) { Y_UNIT_TEST(CountersAggregationTest) { NKikimrConfig::TSqsConfig cfg; cfg.SetCreateLazyCounters(false); - TIntrusivePtr<NMonitoring::TDynamicCounters> core = new NMonitoring::TDynamicCounters(); - TIntrusivePtr<NMonitoring::TDynamicCounters> ymqCounters = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> core = new ::NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> ymqCounters = new ::NMonitoring::TDynamicCounters(); TIntrusivePtr<TUserCounters> total = new TUserCounters(cfg, core, ymqCounters, nullptr, TOTAL_COUNTER_LABEL, nullptr); total->ShowDetailedCounters(TInstant::Max()); TIntrusivePtr<TUserCounters> user = new TUserCounters(cfg, core, ymqCounters, nullptr, "my_user", total); @@ -346,8 +346,8 @@ Y_UNIT_TEST_SUITE(QueueCountersTest) { Y_UNIT_TEST(InsertCountersTest) { NKikimrConfig::TSqsConfig cfg; cfg.SetCreateLazyCounters(false); - TIntrusivePtr<NMonitoring::TDynamicCounters> core = new NMonitoring::TDynamicCounters(); - TIntrusivePtr<NMonitoring::TDynamicCounters> ymqCounters = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> core = new ::NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> ymqCounters = new ::NMonitoring::TDynamicCounters(); TIntrusivePtr<TUserCounters> user = new TUserCounters(cfg, core, ymqCounters, nullptr, "my_user", nullptr); ASSERT_USER_PRESENT("my_user"); @@ -375,8 +375,8 @@ Y_UNIT_TEST_SUITE(QueueCountersTest) { void RemoveQueueCountersTest(bool leader, const TString& folderId) { NKikimrConfig::TSqsConfig cfg; cfg.SetCreateLazyCounters(false); - TIntrusivePtr<NMonitoring::TDynamicCounters> core = new NMonitoring::TDynamicCounters(); - TIntrusivePtr<NMonitoring::TDynamicCounters> ymqCounters = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> core = new ::NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> ymqCounters = new ::NMonitoring::TDynamicCounters(); TIntrusivePtr<TUserCounters> user = new TUserCounters(cfg, core, ymqCounters, nullptr, "my_user", nullptr); TIntrusivePtr<TQueueCounters> queue = user->CreateQueueCounters("my_queue", folderId, true); if (leader) { @@ -407,8 +407,8 @@ Y_UNIT_TEST_SUITE(QueueCountersTest) { NKikimrConfig::TSqsConfig cfg; cfg.SetYandexCloudMode(cloudMode); cfg.SetCreateLazyCounters(false); - TIntrusivePtr<NMonitoring::TDynamicCounters> core = new NMonitoring::TDynamicCounters(); - TIntrusivePtr<NMonitoring::TDynamicCounters> ymqCounters = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> core = new ::NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> ymqCounters = new ::NMonitoring::TDynamicCounters(); TIntrusivePtr<TUserCounters> total = new TUserCounters(cfg, core, ymqCounters, nullptr, TOTAL_COUNTER_LABEL, nullptr); total->ShowDetailedCounters(TInstant::Max()); TIntrusivePtr<TUserCounters> user = new TUserCounters(cfg, core, ymqCounters, nullptr, "my_user", total); @@ -481,7 +481,7 @@ Y_UNIT_TEST_SUITE(HttpCountersTest) { Y_UNIT_TEST(CountersAggregationTest) { NKikimrConfig::TSqsConfig cfg; cfg.SetCreateLazyCounters(false); - TIntrusivePtr<NMonitoring::TDynamicCounters> root = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> root = new ::NMonitoring::TDynamicCounters(); TIntrusivePtr<THttpCounters> http = new THttpCounters(cfg, root); TIntrusivePtr<THttpUserCounters> user = http->GetUserCounters("my_user"); @@ -504,7 +504,7 @@ Y_UNIT_TEST_SUITE(MeteringCountersTest) { Y_UNIT_TEST(CountersAggregationTest) { NKikimrConfig::TSqsConfig config; config.SetCreateLazyCounters(false); - TIntrusivePtr<NMonitoring::TDynamicCounters> metering = new NMonitoring::TDynamicCounters(); + TIntrusivePtr<::NMonitoring::TDynamicCounters> metering = new ::NMonitoring::TDynamicCounters(); TIntrusivePtr<TMeteringCounters> counters = new TMeteringCounters(config, metering, {"inet", "yandex", "unknown", "cloud"}); *counters->ClassifierRequestsResults["inet"] = 33; *counters->ClassifierRequestsResults["yandex"] = 42; diff --git a/ydb/core/ymq/http/http.cpp b/ydb/core/ymq/http/http.cpp index 5d0963bfb2..d921377ded 100644 --- a/ydb/core/ymq/http/http.cpp +++ b/ydb/core/ymq/http/http.cpp @@ -997,8 +997,8 @@ TAsyncHttpServer::~TAsyncHttpServer() { } void TAsyncHttpServer::Initialize( - NActors::TActorSystem* as, TIntrusivePtr<NMonitoring::TDynamicCounters> sqsCounters, - TIntrusivePtr<NMonitoring::TDynamicCounters> ymqCounters, ui32 poolId + NActors::TActorSystem* as, TIntrusivePtr<::NMonitoring::TDynamicCounters> sqsCounters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> ymqCounters, ui32 poolId ) { ActorSystem_ = as; HttpCounters_ = new THttpCounters(Config, sqsCounters->GetSubgroup("subsystem", "http")); diff --git a/ydb/core/ymq/http/http.h b/ydb/core/ymq/http/http.h index 01a2b0edc4..64c3747f0f 100644 --- a/ydb/core/ymq/http/http.h +++ b/ydb/core/ymq/http/http.h @@ -147,8 +147,8 @@ public: void Initialize( NActors::TActorSystem* as, - TIntrusivePtr<NMonitoring::TDynamicCounters> sqsCounters, - TIntrusivePtr<NMonitoring::TDynamicCounters> ymqCounters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> sqsCounters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> ymqCounters, ui32 poolId); void Start(); diff --git a/ydb/core/yq/libs/actors/pending_fetcher.cpp b/ydb/core/yq/libs/actors/pending_fetcher.cpp index 387936ece0..9c56adf902 100644 --- a/ydb/core/yq/libs/actors/pending_fetcher.cpp +++ b/ydb/core/yq/libs/actors/pending_fetcher.cpp @@ -125,7 +125,7 @@ public: ISecuredServiceAccountCredentialsFactory::TPtr credentialsFactory, IHTTPGateway::TPtr s3Gateway, ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections, - const NMonitoring::TDynamicCounterPtr& clientCounters, + const ::NMonitoring::TDynamicCounterPtr& clientCounters, const TString& tenantName ) : YqSharedResources(yqSharedResources) @@ -372,13 +372,13 @@ private: const ::NPq::NConfigurationManager::IConnections::TPtr PqCmConnections; const TString Guid; //OwnerId - const NMonitoring::TDynamicCounterPtr ClientCounters; + const ::NMonitoring::TDynamicCounterPtr ClientCounters; TMaybe<NYql::NLog::TScopedBackend<NYql::NDq::TYqlLogScope>> LogScope; struct TQueryCountersInfo { - NMonitoring::TDynamicCounterPtr RootCountersParent; - NMonitoring::TDynamicCounterPtr PublicCountersParent; + ::NMonitoring::TDynamicCounterPtr RootCountersParent; + ::NMonitoring::TDynamicCounterPtr PublicCountersParent; TActorId RunActorId; }; @@ -405,7 +405,7 @@ NActors::IActor* CreatePendingFetcher( ISecuredServiceAccountCredentialsFactory::TPtr credentialsFactory, IHTTPGateway::TPtr s3Gateway, ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections, - const NMonitoring::TDynamicCounterPtr& clientCounters, + const ::NMonitoring::TDynamicCounterPtr& clientCounters, const TString& tenantName) { return new TPendingFetcher( diff --git a/ydb/core/yq/libs/actors/proxy.h b/ydb/core/yq/libs/actors/proxy.h index 6c441ff229..9b5f7fd467 100644 --- a/ydb/core/yq/libs/actors/proxy.h +++ b/ydb/core/yq/libs/actors/proxy.h @@ -49,7 +49,7 @@ NActors::IActor* CreatePendingFetcher( NYql::ISecuredServiceAccountCredentialsFactory::TPtr credentialsFactory, NYql::IHTTPGateway::TPtr s3Gateway, ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections, - const NMonitoring::TDynamicCounterPtr& clientCounters, + const ::NMonitoring::TDynamicCounterPtr& clientCounters, const TString& tenantName ); diff --git a/ydb/core/yq/libs/actors/proxy_private.cpp b/ydb/core/yq/libs/actors/proxy_private.cpp index 3067b4fb52..98c3a772aa 100644 --- a/ydb/core/yq/libs/actors/proxy_private.cpp +++ b/ydb/core/yq/libs/actors/proxy_private.cpp @@ -34,7 +34,7 @@ public: const NConfig::TPrivateProxyConfig& privateProxyConfig, TIntrusivePtr<ITimeProvider> timeProvider, TIntrusivePtr<IRandomProvider> randomProvider, - NMonitoring::TDynamicCounterPtr counters, + ::NMonitoring::TDynamicCounterPtr counters, const NConfig::TTokenAccessorConfig& tokenAccessorConfig) : PrivateProxyConfig(privateProxyConfig) , TokenAccessorConfig(tokenAccessorConfig) @@ -157,7 +157,7 @@ private: const NConfig::TTokenAccessorConfig TokenAccessorConfig; TIntrusivePtr<ITimeProvider> TimeProvider; TIntrusivePtr<IRandomProvider> RandomProvider; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; }; TActorId MakeYqPrivateProxyId() { @@ -169,7 +169,7 @@ IActor* CreateYqlAnalyticsPrivateProxy( const NConfig::TPrivateProxyConfig& privateProxyConfig, TIntrusivePtr<ITimeProvider> timeProvider, TIntrusivePtr<IRandomProvider> randomProvider, - NMonitoring::TDynamicCounterPtr counters, + ::NMonitoring::TDynamicCounterPtr counters, const NConfig::TTokenAccessorConfig& tokenAccessorConfig) { return new TYqlAnalyticsPrivateProxy(privateProxyConfig, timeProvider, randomProvider, counters, tokenAccessorConfig); } diff --git a/ydb/core/yq/libs/actors/proxy_private.h b/ydb/core/yq/libs/actors/proxy_private.h index 8b214c86cc..6620ba88e3 100644 --- a/ydb/core/yq/libs/actors/proxy_private.h +++ b/ydb/core/yq/libs/actors/proxy_private.h @@ -26,7 +26,7 @@ NActors::IActor* CreateYqlAnalyticsPrivateProxy( const NConfig::TPrivateProxyConfig& privateProxyConfig, TIntrusivePtr<ITimeProvider> timeProvider, TIntrusivePtr<IRandomProvider> randomProvider, - NMonitoring::TDynamicCounterPtr counters, + ::NMonitoring::TDynamicCounterPtr counters, const NConfig::TTokenAccessorConfig& tockenAccessorConfig ); @@ -34,7 +34,7 @@ NActors::IActor* CreatePingTaskRequestActor( const NActors::TActorId& sender, TIntrusivePtr<ITimeProvider> timeProvider, TAutoPtr<TEvents::TEvPingTaskRequest> ev, - NMonitoring::TDynamicCounterPtr counters + ::NMonitoring::TDynamicCounterPtr counters ); NActors::IActor* CreateGetTaskRequestActor( @@ -42,21 +42,21 @@ NActors::IActor* CreateGetTaskRequestActor( const NConfig::TTokenAccessorConfig& tockenAccessorConfig, TIntrusivePtr<ITimeProvider> timeProvider, TAutoPtr<TEvents::TEvGetTaskRequest> ev, - NMonitoring::TDynamicCounterPtr counters + ::NMonitoring::TDynamicCounterPtr counters ); NActors::IActor* CreateWriteTaskResultRequestActor( const NActors::TActorId& sender, TIntrusivePtr<ITimeProvider> timeProvider, TAutoPtr<TEvents::TEvWriteTaskResultRequest> ev, - NMonitoring::TDynamicCounterPtr counters + ::NMonitoring::TDynamicCounterPtr counters ); NActors::IActor* CreateNodesHealthCheckActor( const NActors::TActorId& sender, TIntrusivePtr<ITimeProvider> timeProvider, TAutoPtr<TEvents::TEvNodesHealthCheckRequest> ev, - NMonitoring::TDynamicCounterPtr counters + ::NMonitoring::TDynamicCounterPtr counters ); } /* NYq */ diff --git a/ydb/core/yq/libs/actors/run_actor.cpp b/ydb/core/yq/libs/actors/run_actor.cpp index 00f7acb578..1343273ce5 100644 --- a/ydb/core/yq/libs/actors/run_actor.cpp +++ b/ydb/core/yq/libs/actors/run_actor.cpp @@ -1631,7 +1631,7 @@ private: NActors::TActorId CheckpointCoordinatorId; TString SessionId; ::NYql::NCommon::TServiceCounters QueryCounters; - const NMonitoring::TDynamicCounters::TCounterPtr QueryUptime; + const ::NMonitoring::TDynamicCounters::TCounterPtr QueryUptime; bool EnableCheckpointCoordinator = false; Yq::Private::PingTaskRequest QueryStateUpdateRequest; diff --git a/ydb/core/yq/libs/actors/run_actor_params.cpp b/ydb/core/yq/libs/actors/run_actor_params.cpp index c00466ac4c..63c26bae03 100644 --- a/ydb/core/yq/libs/actors/run_actor_params.cpp +++ b/ydb/core/yq/libs/actors/run_actor_params.cpp @@ -45,7 +45,7 @@ TRunActorParams::TRunActorParams( bool automatic, const TString& queryName, const TInstant& deadline, - const NMonitoring::TDynamicCounterPtr& clientCounters, + const ::NMonitoring::TDynamicCounterPtr& clientCounters, TInstant createdAt, const TString& tenantName, uint64_t resultBytesLimit diff --git a/ydb/core/yq/libs/actors/run_actor_params.h b/ydb/core/yq/libs/actors/run_actor_params.h index facba0a16c..84bc7d07da 100644 --- a/ydb/core/yq/libs/actors/run_actor_params.h +++ b/ydb/core/yq/libs/actors/run_actor_params.h @@ -60,7 +60,7 @@ struct TRunActorParams { // TODO2 : Change name bool automatic, const TString& queryName, const TInstant& deadline, - const NMonitoring::TDynamicCounterPtr& clientCounters, + const ::NMonitoring::TDynamicCounterPtr& clientCounters, TInstant createdAt, const TString& tenantName, uint64_t resultBytesLimit @@ -112,7 +112,7 @@ struct TRunActorParams { // TODO2 : Change name TString QueryName; TInstant Deadline; - const NMonitoring::TDynamicCounterPtr ClientCounters; + const ::NMonitoring::TDynamicCounterPtr ClientCounters; const TInstant CreatedAt; const TString TenantName; uint64_t ResultBytesLimit; diff --git a/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.cpp b/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.cpp index f918101453..55c4482522 100644 --- a/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.cpp +++ b/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.cpp @@ -67,7 +67,7 @@ private: } }; -NActors::IActor* CreateMockYqAuditServiceActor(const NConfig::TAuditConfig& config, const NMonitoring::TDynamicCounterPtr& counters) { +NActors::IActor* CreateMockYqAuditServiceActor(const NConfig::TAuditConfig& config, const ::NMonitoring::TDynamicCounterPtr& counters) { Y_UNUSED(config); Y_UNUSED(counters); return new TYqMockAuditServiceActor(); diff --git a/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.h b/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.h index 2c4eadab2c..32013a725c 100644 --- a/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.h +++ b/ydb/core/yq/libs/audit/mock/yq_mock_audit_service.h @@ -10,6 +10,6 @@ namespace NYq { -NActors::IActor* CreateMockYqAuditServiceActor(const NConfig::TAuditConfig& config, const NMonitoring::TDynamicCounterPtr& counters); +NActors::IActor* CreateMockYqAuditServiceActor(const NConfig::TAuditConfig& config, const ::NMonitoring::TDynamicCounterPtr& counters); } // namespace NYq diff --git a/ydb/core/yq/libs/checkpointing/checkpoint_coordinator.cpp b/ydb/core/yq/libs/checkpointing/checkpoint_coordinator.cpp index 6b968d0b63..f1283ec947 100644 --- a/ydb/core/yq/libs/checkpointing/checkpoint_coordinator.cpp +++ b/ydb/core/yq/libs/checkpointing/checkpoint_coordinator.cpp @@ -32,7 +32,7 @@ TCheckpointCoordinator::TCheckpointCoordinator(TCoordinatorId coordinatorId, const TActorId& storageProxy, const TActorId& runActorId, const TCheckpointCoordinatorConfig& settings, - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, const NProto::TGraphParams& graphParams, const YandexQuery::StateLoadMode& stateLoadMode, const YandexQuery::StreamingDisposition& streamingDisposition) @@ -589,7 +589,7 @@ void TCheckpointCoordinator::HandleException(const std::exception& err) { Send(TaskControllerId, NYql::NDq::TEvDq::TEvAbortExecution::InternalError("Internal error in checkpoint coordinator", issues)); } -THolder<NActors::IActor> MakeCheckpointCoordinator(TCoordinatorId coordinatorId, const TActorId& taskControllerId, const TActorId& storageProxy, const TActorId& runActorId, const TCheckpointCoordinatorConfig& settings, const NMonitoring::TDynamicCounterPtr& counters, const NProto::TGraphParams& graphParams, const YandexQuery::StateLoadMode& stateLoadMode, const YandexQuery::StreamingDisposition& streamingDisposition) { +THolder<NActors::IActor> MakeCheckpointCoordinator(TCoordinatorId coordinatorId, const TActorId& taskControllerId, const TActorId& storageProxy, const TActorId& runActorId, const TCheckpointCoordinatorConfig& settings, const ::NMonitoring::TDynamicCounterPtr& counters, const NProto::TGraphParams& graphParams, const YandexQuery::StateLoadMode& stateLoadMode, const YandexQuery::StreamingDisposition& streamingDisposition) { return MakeHolder<TCheckpointCoordinator>(coordinatorId, taskControllerId, storageProxy, runActorId, settings, counters, graphParams, stateLoadMode, streamingDisposition); } diff --git a/ydb/core/yq/libs/checkpointing/checkpoint_coordinator.h b/ydb/core/yq/libs/checkpointing/checkpoint_coordinator.h index 512a8a5d61..38ab67f90e 100644 --- a/ydb/core/yq/libs/checkpointing/checkpoint_coordinator.h +++ b/ydb/core/yq/libs/checkpointing/checkpoint_coordinator.h @@ -28,7 +28,7 @@ public: const TActorId& storageProxy, const TActorId& runActorId, const TCheckpointCoordinatorConfig& settings, - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, const NProto::TGraphParams& graphParams, const YandexQuery::StateLoadMode& stateLoadMode, const YandexQuery::StreamingDisposition& streamingDisposition); @@ -97,7 +97,7 @@ private: } struct TCheckpointCoordinatorMetrics { - TCheckpointCoordinatorMetrics(const NMonitoring::TDynamicCounterPtr& counters) { + TCheckpointCoordinatorMetrics(const ::NMonitoring::TDynamicCounterPtr& counters) { auto subgroup = counters->GetSubgroup("subsystem", "checkpoint_coordinator"); InProgress = subgroup->GetCounter("InProgress"); Pending = subgroup->GetCounter("Pending"); @@ -119,21 +119,21 @@ private: RestoredStreamingOffsetsFromCheckpoint = subgroup->GetCounter("RestoredStreamingOffsetsFromCheckpoint", true); } - NMonitoring::TDynamicCounters::TCounterPtr InProgress; - NMonitoring::TDynamicCounters::TCounterPtr Pending; - NMonitoring::TDynamicCounters::TCounterPtr PendingCommit; - NMonitoring::TDynamicCounters::TCounterPtr Completed; - NMonitoring::TDynamicCounters::TCounterPtr Aborted; - NMonitoring::TDynamicCounters::TCounterPtr StorageError; - NMonitoring::TDynamicCounters::TCounterPtr FailedToCreate; - NMonitoring::TDynamicCounters::TCounterPtr Total; - NMonitoring::TDynamicCounters::TCounterPtr LastCheckpointBarrierDeliveryTimeMillis; - NMonitoring::TDynamicCounters::TCounterPtr LastCheckpointDurationMillis; - NMonitoring::TDynamicCounters::TCounterPtr LastCheckpointSizeBytes; - NMonitoring::TDynamicCounters::TCounterPtr SkippedDueToInFlightLimit; - NMonitoring::TDynamicCounters::TCounterPtr RestoredFromSavedCheckpoint; - NMonitoring::TDynamicCounters::TCounterPtr StartedFromEmptyCheckpoint; - NMonitoring::TDynamicCounters::TCounterPtr RestoredStreamingOffsetsFromCheckpoint; + ::NMonitoring::TDynamicCounters::TCounterPtr InProgress; + ::NMonitoring::TDynamicCounters::TCounterPtr Pending; + ::NMonitoring::TDynamicCounters::TCounterPtr PendingCommit; + ::NMonitoring::TDynamicCounters::TCounterPtr Completed; + ::NMonitoring::TDynamicCounters::TCounterPtr Aborted; + ::NMonitoring::TDynamicCounters::TCounterPtr StorageError; + ::NMonitoring::TDynamicCounters::TCounterPtr FailedToCreate; + ::NMonitoring::TDynamicCounters::TCounterPtr Total; + ::NMonitoring::TDynamicCounters::TCounterPtr LastCheckpointBarrierDeliveryTimeMillis; + ::NMonitoring::TDynamicCounters::TCounterPtr LastCheckpointDurationMillis; + ::NMonitoring::TDynamicCounters::TCounterPtr LastCheckpointSizeBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr SkippedDueToInFlightLimit; + ::NMonitoring::TDynamicCounters::TCounterPtr RestoredFromSavedCheckpoint; + ::NMonitoring::TDynamicCounters::TCounterPtr StartedFromEmptyCheckpoint; + ::NMonitoring::TDynamicCounters::TCounterPtr RestoredStreamingOffsetsFromCheckpoint; NMonitoring::THistogramPtr CheckpointBarrierDeliveryTimeMillis; NMonitoring::THistogramPtr CheckpointDurationMillis; NMonitoring::THistogramPtr CheckpointSizeBytes; @@ -177,6 +177,6 @@ private: YandexQuery::StreamingDisposition StreamingDisposition; }; -THolder<NActors::IActor> MakeCheckpointCoordinator(TCoordinatorId coordinatorId, const TActorId& executerId, const TActorId& storageProxy, const TActorId& runActorId, const TCheckpointCoordinatorConfig& settings, const NMonitoring::TDynamicCounterPtr& counters, const NProto::TGraphParams& graphParams, const YandexQuery::StateLoadMode& stateLoadMode = YandexQuery::StateLoadMode::FROM_LAST_CHECKPOINT, const YandexQuery::StreamingDisposition& streamingDisposition = {}); +THolder<NActors::IActor> MakeCheckpointCoordinator(TCoordinatorId coordinatorId, const TActorId& executerId, const TActorId& storageProxy, const TActorId& runActorId, const TCheckpointCoordinatorConfig& settings, const ::NMonitoring::TDynamicCounterPtr& counters, const NProto::TGraphParams& graphParams, const YandexQuery::StateLoadMode& stateLoadMode = YandexQuery::StateLoadMode::FROM_LAST_CHECKPOINT, const YandexQuery::StreamingDisposition& streamingDisposition = {}); } // namespace NYq diff --git a/ydb/core/yq/libs/checkpointing/ut/checkpoint_coordinator_ut.cpp b/ydb/core/yq/libs/checkpointing/ut/checkpoint_coordinator_ut.cpp index ceb0a9faf5..30affc4052 100644 --- a/ydb/core/yq/libs/checkpointing/ut/checkpoint_coordinator_ut.cpp +++ b/ydb/core/yq/libs/checkpointing/ut/checkpoint_coordinator_ut.cpp @@ -62,7 +62,7 @@ struct TTestBootstrap : public TTestActorRuntime { THashMap<TActorId, ui64> ActorToTask; - NMonitoring::TDynamicCounterPtr Counters = new NMonitoring::TDynamicCounters(); + ::NMonitoring::TDynamicCounterPtr Counters = new ::NMonitoring::TDynamicCounters(); explicit TTestBootstrap(ui64 graphFlags = 0) : TTestActorRuntime(true) diff --git a/ydb/core/yq/libs/control_plane_proxy/control_plane_proxy.cpp b/ydb/core/yq/libs/control_plane_proxy/control_plane_proxy.cpp index 73ed47736b..d0c8190729 100644 --- a/ydb/core/yq/libs/control_plane_proxy/control_plane_proxy.cpp +++ b/ydb/core/yq/libs/control_plane_proxy/control_plane_proxy.cpp @@ -52,18 +52,18 @@ LWTRACE_USING(YQ_CONTROL_PLANE_PROXY_PROVIDER); struct TRequestCounters: public virtual TThrRefBase { const TString Name; - NMonitoring::TDynamicCounters::TCounterPtr InFly; - NMonitoring::TDynamicCounters::TCounterPtr Ok; - NMonitoring::TDynamicCounters::TCounterPtr Error; - NMonitoring::TDynamicCounters::TCounterPtr Timeout; - NMonitoring::THistogramPtr LatencyMs; + ::NMonitoring::TDynamicCounters::TCounterPtr InFly; + ::NMonitoring::TDynamicCounters::TCounterPtr Ok; + ::NMonitoring::TDynamicCounters::TCounterPtr Error; + ::NMonitoring::TDynamicCounters::TCounterPtr Timeout; + ::NMonitoring::THistogramPtr LatencyMs; explicit TRequestCounters(const TString& name) : Name(name) { } - void Register(const NMonitoring::TDynamicCounterPtr& counters) { - NMonitoring::TDynamicCounterPtr subgroup = counters->GetSubgroup("request", Name); + void Register(const ::NMonitoring::TDynamicCounterPtr& counters) { + ::NMonitoring::TDynamicCounterPtr subgroup = counters->GetSubgroup("request", Name); InFly = subgroup->GetCounter("InFly", false); Ok = subgroup->GetCounter("Ok", true); Error = subgroup->GetCounter("Error", true); @@ -72,8 +72,8 @@ struct TRequestCounters: public virtual TThrRefBase { } private: - static NMonitoring::IHistogramCollectorPtr GetLatencyHistogramBuckets() { - return NMonitoring::ExplicitHistogram({0, 1, 2, 5, 10, 20, 50, 100, 500, 1000, 2000, 5000, 10000, 30000, 50000, 500000}); + static ::NMonitoring::IHistogramCollectorPtr GetLatencyHistogramBuckets() { + return ::NMonitoring::ExplicitHistogram({0, 1, 2, 5, 10, 20, 50, 100, 500, 1000, 2000, 5000, 10000, 30000, 50000, 500000}); } }; @@ -412,10 +412,10 @@ class TControlPlaneProxyActor : public NActors::TActorBootstrapped<TControlPlane }); TMap<TMetricsScope, TScopeCountersPtr> ScopeCounters; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; public: - explicit TCounters(const NMonitoring::TDynamicCounterPtr& counters) + explicit TCounters(const ::NMonitoring::TDynamicCounterPtr& counters) : Counters(counters) { for (auto& request: CommonRequests) { @@ -476,7 +476,7 @@ class TControlPlaneProxyActor : public NActors::TActorBootstrapped<TControlPlane bool GetQuotas; public: - TControlPlaneProxyActor(const NConfig::TControlPlaneProxyConfig& config, const NMonitoring::TDynamicCounterPtr& counters, bool getQuotas) + TControlPlaneProxyActor(const NConfig::TControlPlaneProxyConfig& config, const ::NMonitoring::TDynamicCounterPtr& counters, bool getQuotas) : Counters(counters) , Config(config) , GetQuotas(getQuotas) @@ -492,7 +492,7 @@ public: NActors::TMon* mon = AppData()->Mon; if (mon) { - NMonitoring::TIndexMonPage* actorsMonPage = mon->RegisterIndexPage("actors", "Actors"); + ::NMonitoring::TIndexMonPage* actorsMonPage = mon->RegisterIndexPage("actors", "Actors"); mon->RegisterActorPage(actorsMonPage, "yq_control_plane_proxy", "YQ Control Plane Proxy", false, TlsActivationContext->ExecutorThread.ActorSystem, SelfId()); } @@ -1769,7 +1769,7 @@ TActorId ControlPlaneProxyActorId() { return NActors::TActorId(0, name); } -IActor* CreateControlPlaneProxyActor(const NConfig::TControlPlaneProxyConfig& config, const NMonitoring::TDynamicCounterPtr& counters, bool getQuotas) { +IActor* CreateControlPlaneProxyActor(const NConfig::TControlPlaneProxyConfig& config, const ::NMonitoring::TDynamicCounterPtr& counters, bool getQuotas) { return new TControlPlaneProxyActor(config, counters, getQuotas); } diff --git a/ydb/core/yq/libs/control_plane_proxy/control_plane_proxy.h b/ydb/core/yq/libs/control_plane_proxy/control_plane_proxy.h index dfd831adbb..c202303c2a 100644 --- a/ydb/core/yq/libs/control_plane_proxy/control_plane_proxy.h +++ b/ydb/core/yq/libs/control_plane_proxy/control_plane_proxy.h @@ -22,6 +22,6 @@ namespace NYq { NActors::TActorId ControlPlaneProxyActorId(); -NActors::IActor* CreateControlPlaneProxyActor(const NConfig::TControlPlaneProxyConfig& config, const NMonitoring::TDynamicCounterPtr& counters, bool getQuotas); +NActors::IActor* CreateControlPlaneProxyActor(const NConfig::TControlPlaneProxyConfig& config, const ::NMonitoring::TDynamicCounterPtr& counters, bool getQuotas); } // namespace NYq diff --git a/ydb/core/yq/libs/control_plane_proxy/ut/control_plane_proxy_ut.cpp b/ydb/core/yq/libs/control_plane_proxy/ut/control_plane_proxy_ut.cpp index 7db7b4e6bc..84fd77aefb 100644 --- a/ydb/core/yq/libs/control_plane_proxy/ut/control_plane_proxy_ut.cpp +++ b/ydb/core/yq/libs/control_plane_proxy/ut/control_plane_proxy_ut.cpp @@ -351,7 +351,7 @@ private: TRuntimePtr runtime(new TTestBasicRuntime()); runtime->SetLogPriority(NKikimrServices::STREAMS_CONTROL_PLANE_SERVICE, NLog::PRI_DEBUG); - auto controlPlaneProxy = CreateControlPlaneProxyActor(Config, MakeIntrusive<NMonitoring::TDynamicCounters>(), false); + auto controlPlaneProxy = CreateControlPlaneProxyActor(Config, MakeIntrusive<::NMonitoring::TDynamicCounters>(), false); runtime->AddLocalService( ControlPlaneProxyActorId(), TActorSetupCmd(controlPlaneProxy, TMailboxType::Simple, 0)); diff --git a/ydb/core/yq/libs/control_plane_storage/control_plane_storage.h b/ydb/core/yq/libs/control_plane_storage/control_plane_storage.h index d91a661c6a..78937f6fe1 100644 --- a/ydb/core/yq/libs/control_plane_storage/control_plane_storage.h +++ b/ydb/core/yq/libs/control_plane_storage/control_plane_storage.h @@ -41,7 +41,7 @@ NActors::IActor* CreateInMemoryControlPlaneStorageServiceActor(const NConfig::TC NActors::IActor* CreateYdbControlPlaneStorageServiceActor( const NConfig::TControlPlaneStorageConfig& config, const NConfig::TCommonConfig& common, - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, const NYq::TYqSharedResources::TPtr& yqSharedResources, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, const TString& tenantName); diff --git a/ydb/core/yq/libs/control_plane_storage/control_plane_storage_counters.cpp b/ydb/core/yq/libs/control_plane_storage/control_plane_storage_counters.cpp index 89e31f372e..a1d2aac544 100644 --- a/ydb/core/yq/libs/control_plane_storage/control_plane_storage_counters.cpp +++ b/ydb/core/yq/libs/control_plane_storage/control_plane_storage_counters.cpp @@ -5,7 +5,7 @@ namespace NYq { TRequestCounters::TRequestCounters(const TString& name) : Name(name) {} -void TRequestCounters::Register(const NMonitoring::TDynamicCounterPtr& counters) { +void TRequestCounters::Register(const ::NMonitoring::TDynamicCounterPtr& counters) { auto requestCounters = counters->GetSubgroup("request", Name); InFly = requestCounters->GetCounter("InFly", false); Ok = requestCounters->GetCounter("Ok", true); @@ -22,7 +22,7 @@ NMonitoring::IHistogramCollectorPtr TRequestCounters::GetLatencyHistogramBuckets } -TFinalStatusCounters::TFinalStatusCounters(const NMonitoring::TDynamicCounterPtr& counters) { +TFinalStatusCounters::TFinalStatusCounters(const ::NMonitoring::TDynamicCounterPtr& counters) { auto subgroup = counters->GetSubgroup("subcomponent", "FinalStatus"); Completed = subgroup->GetCounter("COMPLETED", true); AbortedBySystem = subgroup->GetCounter("ABORTED_BY_SYSTEM", true); diff --git a/ydb/core/yq/libs/control_plane_storage/control_plane_storage_counters.h b/ydb/core/yq/libs/control_plane_storage/control_plane_storage_counters.h index f67d4b93f9..066dead268 100644 --- a/ydb/core/yq/libs/control_plane_storage/control_plane_storage_counters.h +++ b/ydb/core/yq/libs/control_plane_storage/control_plane_storage_counters.h @@ -9,32 +9,32 @@ class TRequestCounters: public virtual TThrRefBase { public: const TString Name; - NMonitoring::TDynamicCounters::TCounterPtr InFly; - NMonitoring::TDynamicCounters::TCounterPtr Ok; - NMonitoring::TDynamicCounters::TCounterPtr Error; - NMonitoring::TDynamicCounters::TCounterPtr Retry; - NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; - NMonitoring::TDynamicCounters::TCounterPtr ResponseBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr InFly; + ::NMonitoring::TDynamicCounters::TCounterPtr Ok; + ::NMonitoring::TDynamicCounters::TCounterPtr Error; + ::NMonitoring::TDynamicCounters::TCounterPtr Retry; + ::NMonitoring::TDynamicCounters::TCounterPtr RequestBytes; + ::NMonitoring::TDynamicCounters::TCounterPtr ResponseBytes; NMonitoring::THistogramPtr LatencyMs; - NMonitoring::TDynamicCounterPtr Issues; + ::NMonitoring::TDynamicCounterPtr Issues; explicit TRequestCounters(const TString& name); - void Register(const NMonitoring::TDynamicCounterPtr& counters); + void Register(const ::NMonitoring::TDynamicCounterPtr& counters); private: static NMonitoring::IHistogramCollectorPtr GetLatencyHistogramBuckets(); }; class TFinalStatusCounters: public virtual TThrRefBase { - NMonitoring::TDynamicCounters::TCounterPtr Completed; - NMonitoring::TDynamicCounters::TCounterPtr AbortedBySystem; - NMonitoring::TDynamicCounters::TCounterPtr AbortedByUser; - NMonitoring::TDynamicCounters::TCounterPtr Failed; - NMonitoring::TDynamicCounters::TCounterPtr Paused; + ::NMonitoring::TDynamicCounters::TCounterPtr Completed; + ::NMonitoring::TDynamicCounters::TCounterPtr AbortedBySystem; + ::NMonitoring::TDynamicCounters::TCounterPtr AbortedByUser; + ::NMonitoring::TDynamicCounters::TCounterPtr Failed; + ::NMonitoring::TDynamicCounters::TCounterPtr Paused; public: - TFinalStatusCounters(const NMonitoring::TDynamicCounterPtr& counters); + TFinalStatusCounters(const ::NMonitoring::TDynamicCounterPtr& counters); void IncByStatus(YandexQuery::QueryMeta::ComputeStatus finalStatus); }; diff --git a/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage.cpp b/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage.cpp index 72189f65f3..4c8dc0339d 100644 --- a/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage.cpp +++ b/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage.cpp @@ -584,7 +584,7 @@ TAsyncStatus TYdbControlPlaneStorageActor::ReadModifyWrite( NActors::IActor* CreateYdbControlPlaneStorageServiceActor( const NConfig::TControlPlaneStorageConfig& config, const NConfig::TCommonConfig& common, - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, const ::NYq::TYqSharedResources::TPtr& yqSharedResources, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, const TString& tenantName) { diff --git a/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage_impl.h b/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage_impl.h index e7ed209cba..d040b7439c 100644 --- a/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage_impl.h +++ b/ydb/core/yq/libs/control_plane_storage/ydb_control_plane_storage_impl.h @@ -219,10 +219,10 @@ class TYdbControlPlaneStorageActor : public NActors::TActorBootstrapped<TYdbCont TMap<TMetricsScope, TScopeCountersPtr> ScopeCounters; TMap<TMetricsScope, TFinalStatusCountersPtr> FinalStatusCounters; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; public: - explicit TCounters(const NMonitoring::TDynamicCounterPtr& counters) + explicit TCounters(const ::NMonitoring::TDynamicCounterPtr& counters) : Counters(counters) { for (auto& request: CommonRequests) { @@ -317,7 +317,7 @@ public: TYdbControlPlaneStorageActor( const NConfig::TControlPlaneStorageConfig& config, const NConfig::TCommonConfig& common, - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, const ::NYq::TYqSharedResources::TPtr& yqSharedResources, const NKikimr::TYdbCredentialsProviderFactory& credProviderFactory, const TString& tenantName) diff --git a/ydb/core/yq/libs/health/health.cpp b/ydb/core/yq/libs/health/health.cpp index 12c84fb398..aa8b2dca60 100644 --- a/ydb/core/yq/libs/health/health.cpp +++ b/ydb/core/yq/libs/health/health.cpp @@ -20,7 +20,7 @@ class THealthActor : public NActors::TActorBootstrapped<THealthActor> { NYq::TYqSharedResources::TPtr YqSharedResources; public: - THealthActor(const NConfig::THealthConfig& config, const NYq::TYqSharedResources::TPtr& yqSharedResources, const NMonitoring::TDynamicCounterPtr& ) + THealthActor(const NConfig::THealthConfig& config, const NYq::TYqSharedResources::TPtr& yqSharedResources, const ::NMonitoring::TDynamicCounterPtr& ) : Config(config) , Client(yqSharedResources->CoreYdbDriver, NYdb::TCommonClientSettings() @@ -82,7 +82,7 @@ TActorId HealthActorId() { return NActors::TActorId(0, name); } -IActor* CreateHealthActor(const NConfig::THealthConfig& config, const NYq::TYqSharedResources::TPtr& yqSharedResources, const NMonitoring::TDynamicCounterPtr& counters) { +IActor* CreateHealthActor(const NConfig::THealthConfig& config, const NYq::TYqSharedResources::TPtr& yqSharedResources, const ::NMonitoring::TDynamicCounterPtr& counters) { return new THealthActor(config, yqSharedResources, counters); } diff --git a/ydb/core/yq/libs/health/health.h b/ydb/core/yq/libs/health/health.h index c985efbee2..d0053fd1f5 100644 --- a/ydb/core/yq/libs/health/health.h +++ b/ydb/core/yq/libs/health/health.h @@ -26,6 +26,6 @@ NActors::TActorId HealthActorId(); NActors::IActor* CreateHealthActor( const NConfig::THealthConfig& config, const NYq::TYqSharedResources::TPtr& yqSharedResources, - const NMonitoring::TDynamicCounterPtr& counters); + const ::NMonitoring::TDynamicCounterPtr& counters); } // namespace NYq diff --git a/ydb/core/yq/libs/init/init.cpp b/ydb/core/yq/libs/init/init.cpp index 0f1431b575..58827f0e6c 100644 --- a/ydb/core/yq/libs/init/init.cpp +++ b/ydb/core/yq/libs/init/init.cpp @@ -56,7 +56,7 @@ void Init( ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections, const IYqSharedResources::TPtr& iyqSharedResources, const std::function<IActor*(const NKikimrProto::NFolderService::TFolderServiceConfig& authConfig)>& folderServiceFactory, - const std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig, const NMonitoring::TDynamicCounterPtr& counters)>& auditServiceFactory, + const std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig, const ::NMonitoring::TDynamicCounterPtr& counters)>& auditServiceFactory, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, ui32 icPort, const std::vector<NKikimr::NMiniKQL::TComputationNodeFactory>& additionalCompNodeFactories @@ -291,7 +291,7 @@ void Init( IYqSharedResources::TPtr CreateYqSharedResources( const NYq::NConfig::TConfig& config, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) { return CreateYqSharedResourcesImpl(config, credentialsProviderFactory, counters); } diff --git a/ydb/core/yq/libs/init/init.h b/ydb/core/yq/libs/init/init.h index 9d4059d211..8d20dd3c5a 100644 --- a/ydb/core/yq/libs/init/init.h +++ b/ydb/core/yq/libs/init/init.h @@ -24,7 +24,7 @@ using TActorRegistrator = std::function<void(NActors::TActorId, NActors::IActor* IYqSharedResources::TPtr CreateYqSharedResources( const NYq::NConfig::TConfig& config, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters); + const ::NMonitoring::TDynamicCounterPtr& counters); void Init( const NYq::NConfig::TConfig& config, @@ -35,7 +35,7 @@ void Init( ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections, const IYqSharedResources::TPtr& yqSharedResources, const std::function<IActor*(const NKikimrProto::NFolderService::TFolderServiceConfig& authConfig)>& folderServiceFactory, - const std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig, const NMonitoring::TDynamicCounterPtr& counters)>& auditServiceFactory, + const std::function<IActor*(const NYq::NConfig::TAuditConfig& auditConfig, const ::NMonitoring::TDynamicCounterPtr& counters)>& auditServiceFactory, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, ui32 icPort, const std::vector<NKikimr::NMiniKQL::TComputationNodeFactory>& additionalCompNodeFactories diff --git a/ydb/core/yq/libs/private_client/internal_service.cpp b/ydb/core/yq/libs/private_client/internal_service.cpp index e80c40fe90..ba013d5d86 100644 --- a/ydb/core/yq/libs/private_client/internal_service.cpp +++ b/ydb/core/yq/libs/private_client/internal_service.cpp @@ -29,7 +29,7 @@ public: const NYq::TYqSharedResources::TPtr& yqSharedResources, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, const ::NYq::NConfig::TPrivateApiConfig& privateApiConfig, - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) : ServiceCounters(counters->GetSubgroup("subsystem", "InternalService")) , EventLatency(ServiceCounters->GetSubgroup("subcomponent", "Latency")->GetHistogram("Latency", NMonitoring::ExponentialHistogram(10, 2, 50))) , PrivateClient( @@ -110,7 +110,7 @@ private: }); } - const NMonitoring::TDynamicCounterPtr ServiceCounters; + const ::NMonitoring::TDynamicCounterPtr ServiceCounters; const NMonitoring::THistogramPtr EventLatency; TPrivateClient PrivateClient; }; @@ -119,7 +119,7 @@ NActors::IActor* CreateInternalServiceActor( const NYq::TYqSharedResources::TPtr& yqSharedResources, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, const NYq::NConfig::TPrivateApiConfig& privateApiConfig, - const NMonitoring::TDynamicCounterPtr& counters) { + const ::NMonitoring::TDynamicCounterPtr& counters) { return new TInternalService(yqSharedResources, credentialsProviderFactory, privateApiConfig, counters); } diff --git a/ydb/core/yq/libs/private_client/internal_service.h b/ydb/core/yq/libs/private_client/internal_service.h index fc65c22abe..145838e95c 100644 --- a/ydb/core/yq/libs/private_client/internal_service.h +++ b/ydb/core/yq/libs/private_client/internal_service.h @@ -20,6 +20,6 @@ NActors::IActor* CreateInternalServiceActor( const NYq::TYqSharedResources::TPtr& yqSharedResources, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, const NYq::NConfig::TPrivateApiConfig& privateApiConfig, - const NMonitoring::TDynamicCounterPtr& counters); + const ::NMonitoring::TDynamicCounterPtr& counters); } /* NYq */ diff --git a/ydb/core/yq/libs/private_client/loopback_service.cpp b/ydb/core/yq/libs/private_client/loopback_service.cpp index e99ddd65f4..8a87d2cc40 100644 --- a/ydb/core/yq/libs/private_client/loopback_service.cpp +++ b/ydb/core/yq/libs/private_client/loopback_service.cpp @@ -23,7 +23,7 @@ namespace NYq { class TLoopbackService : public NActors::TActorBootstrapped<TLoopbackService> { public: TLoopbackService( - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) : ServiceCounters(counters->GetSubgroup("subsystem", "LoopbackService")) { } @@ -133,14 +133,14 @@ private: } } - const NMonitoring::TDynamicCounterPtr ServiceCounters; + const ::NMonitoring::TDynamicCounterPtr ServiceCounters; ui64 Cookie = 0; THashMap<ui64, NActors::TActorId> Senders; THashMap<ui64, ui64> OriginalCookies; }; NActors::IActor* CreateLoopbackServiceActor( - const NMonitoring::TDynamicCounterPtr& counters) { + const ::NMonitoring::TDynamicCounterPtr& counters) { return new TLoopbackService(counters); } diff --git a/ydb/core/yq/libs/private_client/loopback_service.h b/ydb/core/yq/libs/private_client/loopback_service.h index 7bf15de799..8a3819df7a 100644 --- a/ydb/core/yq/libs/private_client/loopback_service.h +++ b/ydb/core/yq/libs/private_client/loopback_service.h @@ -7,6 +7,6 @@ namespace NYq { NActors::IActor* CreateLoopbackServiceActor( - const NMonitoring::TDynamicCounterPtr& counters); + const ::NMonitoring::TDynamicCounterPtr& counters); } /* NYq */ diff --git a/ydb/core/yq/libs/private_client/private_client.cpp b/ydb/core/yq/libs/private_client/private_client.cpp index bccb8ddd1d..d9fb1562ee 100644 --- a/ydb/core/yq/libs/private_client/private_client.cpp +++ b/ydb/core/yq/libs/private_client/private_client.cpp @@ -12,7 +12,7 @@ public: TImpl( std::shared_ptr<TGRpcConnectionsImpl>&& connections, const TCommonClientSettings& settings, - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) : TClientImplCommon(std::move(connections), settings) , Counters(counters->GetSubgroup("subsystem", "private_api")->GetSubgroup("subcomponent", "ClientMetrics")) , PingTaskTime(Counters->GetHistogram("PingTaskMs", NMonitoring::ExponentialHistogram(10, 2, 50))) @@ -141,7 +141,7 @@ public: return future; } private: - const NMonitoring::TDynamicCounterPtr Counters; + const ::NMonitoring::TDynamicCounterPtr Counters; const NMonitoring::THistogramPtr PingTaskTime; const NMonitoring::THistogramPtr GetTaskTime; const NMonitoring::THistogramPtr WriteTaskResultTime; @@ -151,7 +151,7 @@ private: TPrivateClient::TPrivateClient( const TDriver& driver, const TCommonClientSettings& settings, - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) : Impl(new TImpl(CreateInternalInterface(driver), settings, counters)) {} diff --git a/ydb/core/yq/libs/private_client/private_client.h b/ydb/core/yq/libs/private_client/private_client.h index e63b67eddb..b932e8410a 100644 --- a/ydb/core/yq/libs/private_client/private_client.h +++ b/ydb/core/yq/libs/private_client/private_client.h @@ -56,7 +56,7 @@ public: TPrivateClient( const NYdb::TDriver& driver, const NYdb::TCommonClientSettings& settings = NYdb::TCommonClientSettings(), - const NMonitoring::TDynamicCounterPtr& counters = MakeIntrusive<NMonitoring::TDynamicCounters>()); + const ::NMonitoring::TDynamicCounterPtr& counters = MakeIntrusive<::NMonitoring::TDynamicCounters>()); TAsyncGetTaskResult GetTask( Yq::Private::GetTaskRequest&& request, diff --git a/ydb/core/yq/libs/quota_manager/quota_manager.cpp b/ydb/core/yq/libs/quota_manager/quota_manager.cpp index 2e3617f8ea..64f190ee86 100644 --- a/ydb/core/yq/libs/quota_manager/quota_manager.cpp +++ b/ydb/core/yq/libs/quota_manager/quota_manager.cpp @@ -48,7 +48,7 @@ public: TQuotaManagementService( const NConfig::TQuotasManagerConfig& config, /* const NYq::TYqSharedResources::TPtr& yqSharedResources, */ - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, std::vector<TQuotaDescription> quotaDescriptions) : Config(config) , ServiceCounters(counters->GetSubgroup("subsystem", "QuotaService")) @@ -186,7 +186,7 @@ private: } NConfig::TQuotasManagerConfig Config; - const NMonitoring::TDynamicCounterPtr ServiceCounters; + const ::NMonitoring::TDynamicCounterPtr ServiceCounters; THashMap<TString /* SubjectType */, THashMap<TString /* MetricName */, TQuotaInfo>> QuotaInfoMap; THashMap<TString /* SubjectType */, THashMap<TString /* SubjectId */, TQuotaCache>> QuotaCacheMap; TDuration UsageRefreshPeriod; @@ -195,7 +195,7 @@ private: NActors::IActor* CreateQuotaServiceActor( const NConfig::TQuotasManagerConfig& config, /* const NYq::TYqSharedResources::TPtr& yqSharedResources, */ - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, std::vector<TQuotaDescription> quotaDesc) { return new TQuotaManagementService(config, /* yqSharedResources, */ counters, quotaDesc); } diff --git a/ydb/core/yq/libs/quota_manager/quota_manager.h b/ydb/core/yq/libs/quota_manager/quota_manager.h index b28594fe69..6dd0ac56dd 100644 --- a/ydb/core/yq/libs/quota_manager/quota_manager.h +++ b/ydb/core/yq/libs/quota_manager/quota_manager.h @@ -38,7 +38,7 @@ NActors::TActorId MakeQuotaServiceActorId(); NActors::IActor* CreateQuotaServiceActor( const NConfig::TQuotasManagerConfig& config, /* const NYq::TYqSharedResources::TPtr& yqSharedResources, */ - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, std::vector<TQuotaDescription> quotaDesc); } /* NYq */ diff --git a/ydb/core/yq/libs/shared_resources/db_pool.cpp b/ydb/core/yq/libs/shared_resources/db_pool.cpp index 1e2abadd6d..5b1fff9913 100644 --- a/ydb/core/yq/libs/shared_resources/db_pool.cpp +++ b/ydb/core/yq/libs/shared_resources/db_pool.cpp @@ -30,7 +30,7 @@ class TDbPoolActor : public NActors::TActor<TDbPoolActor> { public: TDbPoolActor( const NYdb::NTable::TTableClient& tableClient, - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) : TActor(&TThis::WorkingState) , TableClient(tableClient) , QueueSize(counters->GetSubgroup("subcomponent", "DbPool")->GetHistogram("InFlight", NMonitoring::ExponentialHistogram(10, 2, 10))) @@ -193,14 +193,14 @@ private: TInstant RequestInProgressTimestamp = TInstant::Now(); std::shared_ptr<int> State = std::make_shared<int>(); const NMonitoring::THistogramPtr QueueSize; - const NMonitoring::TDynamicCounters::TCounterPtr TotalInFlight; + const ::NMonitoring::TDynamicCounters::TCounterPtr TotalInFlight; const NMonitoring::THistogramPtr RequestsTime; }; TDbPool::TDbPool( ui32 sessionsCount, const NYdb::NTable::TTableClient& tableClient, - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, const TString& tablePathPrefix) { TablePathPrefix = tablePathPrefix; @@ -246,7 +246,7 @@ TDbPoolMap::TDbPoolMap( const NYq::NConfig::TDbPoolConfig& config, NYdb::TDriver driver, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) : Config(config) , Driver(driver) , CredentialsProviderFactory(credentialsProviderFactory) @@ -259,7 +259,7 @@ TDbPoolHolder::TDbPoolHolder( const NYq::NConfig::TDbPoolConfig& config, const NYdb::TDriver& driver, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) : Driver(driver) , Pools(new TDbPoolMap(config, Driver, credentialsProviderFactory, counters)) { } diff --git a/ydb/core/yq/libs/shared_resources/db_pool.h b/ydb/core/yq/libs/shared_resources/db_pool.h index 0c7c1242c8..e7e28b81a2 100644 --- a/ydb/core/yq/libs/shared_resources/db_pool.h +++ b/ydb/core/yq/libs/shared_resources/db_pool.h @@ -26,12 +26,12 @@ public: private: friend class TDbPoolMap; - TDbPool(ui32 sessionsCount, const NYdb::NTable::TTableClient& tableClient, const NMonitoring::TDynamicCounterPtr& counters, const TString& tablePathPrefix); + TDbPool(ui32 sessionsCount, const NYdb::NTable::TTableClient& tableClient, const ::NMonitoring::TDynamicCounterPtr& counters, const TString& tablePathPrefix); TMutex Mutex; TVector<NActors::TActorId> Actors; ui32 Index = 0; - const NMonitoring::TDynamicCounterPtr Counters; + const ::NMonitoring::TDynamicCounterPtr Counters; }; enum class EDbPoolId { @@ -51,7 +51,7 @@ private: TDbPoolMap(const NYq::NConfig::TDbPoolConfig& config, NYdb::TDriver driver, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters); + const ::NMonitoring::TDynamicCounterPtr& counters); void Reset(const NYq::NConfig::TDbPoolConfig& config); TMutex Mutex; @@ -60,7 +60,7 @@ private: THashMap<EDbPoolId, TDbPool::TPtr> Pools; THolder<NYdb::NTable::TTableClient> TableClient; NKikimr::TYdbCredentialsProviderFactory CredentialsProviderFactory; - const NMonitoring::TDynamicCounterPtr Counters; + const ::NMonitoring::TDynamicCounterPtr Counters; }; class TDbPoolHolder: public TThrRefBase { @@ -70,7 +70,7 @@ public: const NYq::NConfig::TDbPoolConfig& config, const NYdb::TDriver& driver, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters); + const ::NMonitoring::TDynamicCounterPtr& counters); ~TDbPoolHolder(); diff --git a/ydb/core/yq/libs/shared_resources/shared_resources.cpp b/ydb/core/yq/libs/shared_resources/shared_resources.cpp index c1a44f8cf9..fe96bb3aba 100644 --- a/ydb/core/yq/libs/shared_resources/shared_resources.cpp +++ b/ydb/core/yq/libs/shared_resources/shared_resources.cpp @@ -29,7 +29,7 @@ struct TYqSharedResourcesImpl : public TActorSystemPtrMixin, public TYqSharedRes explicit TYqSharedResourcesImpl( const NYq::NConfig::TConfig& config, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) : TYqSharedResources(NYdb::TDriver(GetYdbDriverConfig(config.GetCommon().GetYdbDriverConfig()))) { CreateDbPoolHolder(config.GetDbPool(), credentialsProviderFactory, counters); @@ -64,7 +64,7 @@ struct TYqSharedResourcesImpl : public TActorSystemPtrMixin, public TYqSharedRes void CreateDbPoolHolder( const NYq::NConfig::TDbPoolConfig& config, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters) { + const ::NMonitoring::TDynamicCounterPtr& counters) { DbPoolHolder = MakeIntrusive<NYq::TDbPoolHolder>(config, CoreYdbDriver, credentialsProviderFactory, counters); } }; @@ -74,7 +74,7 @@ struct TYqSharedResourcesImpl : public TActorSystemPtrMixin, public TYqSharedRes TYqSharedResources::TPtr CreateYqSharedResourcesImpl( const NYq::NConfig::TConfig& config, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters) { + const ::NMonitoring::TDynamicCounterPtr& counters) { return MakeIntrusive<TYqSharedResourcesImpl>(config, credentialsProviderFactory, counters); } diff --git a/ydb/core/yq/libs/shared_resources/shared_resources.h b/ydb/core/yq/libs/shared_resources/shared_resources.h index bd8e5e3950..738396f5e3 100644 --- a/ydb/core/yq/libs/shared_resources/shared_resources.h +++ b/ydb/core/yq/libs/shared_resources/shared_resources.h @@ -30,6 +30,6 @@ protected: TYqSharedResources::TPtr CreateYqSharedResourcesImpl( const NYq::NConfig::TConfig& config, const NKikimr::TYdbCredentialsProviderFactory& credentialsProviderFactory, - const NMonitoring::TDynamicCounterPtr& counters); + const ::NMonitoring::TDynamicCounterPtr& counters); } // namespace NYq diff --git a/ydb/core/yq/libs/test_connection/counters.cpp b/ydb/core/yq/libs/test_connection/counters.cpp index 92bd0d77bd..440627c66f 100644 --- a/ydb/core/yq/libs/test_connection/counters.cpp +++ b/ydb/core/yq/libs/test_connection/counters.cpp @@ -6,7 +6,7 @@ TTestConnectionRequestCounters::TTestConnectionRequestCounters(const TString& na : Name(name) {} -void TTestConnectionRequestCounters::Register(const NMonitoring::TDynamicCounterPtr& counters) { +void TTestConnectionRequestCounters::Register(const ::NMonitoring::TDynamicCounterPtr& counters) { auto requestCounters = counters->GetSubgroup("request", Name); InFly = requestCounters->GetCounter("InFly", false); Ok = requestCounters->GetCounter("Ok", true); diff --git a/ydb/core/yq/libs/test_connection/counters.h b/ydb/core/yq/libs/test_connection/counters.h index 9d0dc4b38b..4108c956ee 100644 --- a/ydb/core/yq/libs/test_connection/counters.h +++ b/ydb/core/yq/libs/test_connection/counters.h @@ -7,14 +7,14 @@ namespace NYq { class TTestConnectionRequestCounters: public virtual TThrRefBase { public: const TString Name; - NMonitoring::TDynamicCounters::TCounterPtr InFly; - NMonitoring::TDynamicCounters::TCounterPtr Ok; - NMonitoring::TDynamicCounters::TCounterPtr Error; + ::NMonitoring::TDynamicCounters::TCounterPtr InFly; + ::NMonitoring::TDynamicCounters::TCounterPtr Ok; + ::NMonitoring::TDynamicCounters::TCounterPtr Error; NMonitoring::THistogramPtr LatencyMs; explicit TTestConnectionRequestCounters(const TString& name); - void Register(const NMonitoring::TDynamicCounterPtr& counters); + void Register(const ::NMonitoring::TDynamicCounterPtr& counters); private: static NMonitoring::IHistogramCollectorPtr GetLatencyHistogramBuckets(); diff --git a/ydb/core/yq/libs/test_connection/test_connection.cpp b/ydb/core/yq/libs/test_connection/test_connection.cpp index 318dd6552f..a024e66dbc 100644 --- a/ydb/core/yq/libs/test_connection/test_connection.cpp +++ b/ydb/core/yq/libs/test_connection/test_connection.cpp @@ -47,7 +47,7 @@ class TTestConnectionActor : public NActors::TActorBootstrapped<TTestConnectionA using TScopeCountersPtr = std::shared_ptr<TScopeCounters>; TMap<TMetricsScope, TScopeCountersPtr> ScopeCounters; - NMonitoring::TDynamicCounterPtr Counters; + ::NMonitoring::TDynamicCounterPtr Counters; ERequestTypeScope ToType(YandexQuery::ConnectionSetting::ConnectionCase connectionCase) { switch (connectionCase) { @@ -63,7 +63,7 @@ class TTestConnectionActor : public NActors::TActorBootstrapped<TTestConnectionA } public: - explicit TCounters(const NMonitoring::TDynamicCounterPtr& counters) + explicit TCounters(const ::NMonitoring::TDynamicCounterPtr& counters) : Counters(counters) {} @@ -118,7 +118,7 @@ public: const NPq::NConfigurationManager::IConnections::TPtr& cmConnections, const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry, const NYql::IHTTPGateway::TPtr& httpGateway, - const NMonitoring::TDynamicCounterPtr& counters) + const ::NMonitoring::TDynamicCounterPtr& counters) : Config(config) , ControlPlaneStorageConfig(controlPlaneStorageConfig, commonConfig) , CommonConfig(commonConfig) @@ -236,7 +236,7 @@ NActors::IActor* CreateTestConnectionActor( const NPq::NConfigurationManager::IConnections::TPtr& cmConnections, const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry, const NYql::IHTTPGateway::TPtr& httpGateway, - const NMonitoring::TDynamicCounterPtr& counters) { + const ::NMonitoring::TDynamicCounterPtr& counters) { return new TTestConnectionActor(config, controlPlaneStorageConfig, commonConfig, tokenAccessorConfig, sharedResources, credentialsFactory, cmConnections, diff --git a/ydb/core/yq/libs/test_connection/test_connection.h b/ydb/core/yq/libs/test_connection/test_connection.h index c273ef6027..fd31c9333e 100644 --- a/ydb/core/yq/libs/test_connection/test_connection.h +++ b/ydb/core/yq/libs/test_connection/test_connection.h @@ -50,7 +50,7 @@ NActors::IActor* CreateTestConnectionActor( const NPq::NConfigurationManager::IConnections::TPtr& cmConnections, const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry, const NYql::IHTTPGateway::TPtr& httpGateway, - const NMonitoring::TDynamicCounterPtr& counters); + const ::NMonitoring::TDynamicCounterPtr& counters); NActors::IActor* CreateTestDataStreamsConnectionActor( const YandexQuery::DataStreams& ds, diff --git a/ydb/library/pdisk_io/buffer_pool.h b/ydb/library/pdisk_io/buffer_pool.h index 0caffbf7de..88402094be 100644 --- a/ydb/library/pdisk_io/buffer_pool.h +++ b/ydb/library/pdisk_io/buffer_pool.h @@ -15,9 +15,9 @@ template<typename TObject, ui32 Size> class TPool { TVector<TObject> Objects; NThreading::TObstructiveConsumerAuxQueue<TObject> InPoolObjects; - NMonitoring::TDynamicCounters::TCounterPtr TotalAllocatedObjects; + ::NMonitoring::TDynamicCounters::TCounterPtr TotalAllocatedObjects; TAtomic FreeObjects; - NMonitoring::TDynamicCounters::TCounterPtr FreeObjectsMin; + ::NMonitoring::TDynamicCounters::TCounterPtr FreeObjectsMin; public: TPool() @@ -57,8 +57,8 @@ class TPool { } } - void InitializeMonitoring(NMonitoring::TDynamicCounters::TCounterPtr totalAllocatedObjects, - NMonitoring::TDynamicCounters::TCounterPtr freeObjectsMin) { + void InitializeMonitoring(::NMonitoring::TDynamicCounters::TCounterPtr totalAllocatedObjects, + ::NMonitoring::TDynamicCounters::TCounterPtr freeObjectsMin) { TotalAllocatedObjects = totalAllocatedObjects; FreeObjectsMin = freeObjectsMin; *FreeObjectsMin = AtomicGet(FreeObjects); diff --git a/ydb/library/pdisk_io/buffers.h b/ydb/library/pdisk_io/buffers.h index a7b7867151..ce778d55d1 100644 --- a/ydb/library/pdisk_io/buffers.h +++ b/ydb/library/pdisk_io/buffers.h @@ -114,13 +114,13 @@ public: class TBufferPool { public: struct TPDiskParams { - NMonitoring::TDynamicCounters::TCounterPtr FailedAllocations = nullptr; + ::NMonitoring::TDynamicCounters::TCounterPtr FailedAllocations = nullptr; TActorSystem *ActorSystem = nullptr; ui32 PDiskId = 0; TPDiskParams() = default; - TPDiskParams(NMonitoring::TDynamicCounters::TCounterPtr failedAllocations, TActorSystem *actorSystem, + TPDiskParams(::NMonitoring::TDynamicCounters::TCounterPtr failedAllocations, TActorSystem *actorSystem, ui32 pDiskId) : FailedAllocations(failedAllocations) , ActorSystem(actorSystem) diff --git a/ydb/library/persqueue/topic_parser/counters.cpp b/ydb/library/persqueue/topic_parser/counters.cpp index 2d80eef499..baf401d165 100644 --- a/ydb/library/persqueue/topic_parser/counters.cpp +++ b/ydb/library/persqueue/topic_parser/counters.cpp @@ -2,7 +2,7 @@ namespace NPersQueue { -NMonitoring::TDynamicCounterPtr GetCounters(NMonitoring::TDynamicCounterPtr counters, +::NMonitoring::TDynamicCounterPtr GetCounters(::NMonitoring::TDynamicCounterPtr counters, const TString& subsystem, const TTopicConverterPtr& topic) { TString cluster = topic->GetCluster(); @@ -15,7 +15,7 @@ NMonitoring::TDynamicCounterPtr GetCounters(NMonitoring::TDynamicCounterPtr coun ->GetSubgroup("Topic", topic->GetShortClientsideName()); } -NMonitoring::TDynamicCounterPtr GetCountersForStream(NMonitoring::TDynamicCounterPtr counters) +::NMonitoring::TDynamicCounterPtr GetCountersForStream(::NMonitoring::TDynamicCounterPtr counters) { return counters->GetSubgroup("counters", "datastreams"); } diff --git a/ydb/library/persqueue/topic_parser/counters.h b/ydb/library/persqueue/topic_parser/counters.h index e18a5b6483..32af523141 100644 --- a/ydb/library/persqueue/topic_parser/counters.h +++ b/ydb/library/persqueue/topic_parser/counters.h @@ -12,8 +12,8 @@ TVector<NPersQueue::TPQLabelsInfo> GetLabelsForCustomCluster(const TTopicConvert TVector<NPersQueue::TPQLabelsInfo> GetLabelsForStream(const TTopicConverterPtr& topic, const TString& cloudId, const TString& dbId, const TString& folderId); -NMonitoring::TDynamicCounterPtr GetCounters(NMonitoring::TDynamicCounterPtr counters, +::NMonitoring::TDynamicCounterPtr GetCounters(::NMonitoring::TDynamicCounterPtr counters, const TString& subsystem, const TTopicConverterPtr& topic); -NMonitoring::TDynamicCounterPtr GetCountersForStream(NMonitoring::TDynamicCounterPtr counters); +::NMonitoring::TDynamicCounterPtr GetCountersForStream(::NMonitoring::TDynamicCounterPtr counters); } // namespace NPersQueue diff --git a/ydb/library/yql/minikql/aligned_page_pool.cpp b/ydb/library/yql/minikql/aligned_page_pool.cpp index 563c0b5803..d63d6a693b 100644 --- a/ydb/library/yql/minikql/aligned_page_pool.cpp +++ b/ydb/library/yql/minikql/aligned_page_pool.cpp @@ -109,10 +109,10 @@ private: } // unnamed -TAlignedPagePoolCounters::TAlignedPagePoolCounters(NMonitoring::TDynamicCounterPtr countersRoot, const TString& name) { +TAlignedPagePoolCounters::TAlignedPagePoolCounters(::NMonitoring::TDynamicCounterPtr countersRoot, const TString& name) { if (!countersRoot || name.empty()) return; - NMonitoring::TDynamicCounterPtr subGroup = countersRoot->GetSubgroup("counters", "utils")->GetSubgroup("subsystem", "mkqlalloc"); + ::NMonitoring::TDynamicCounterPtr subGroup = countersRoot->GetSubgroup("counters", "utils")->GetSubgroup("subsystem", "mkqlalloc"); TotalBytesAllocatedCntr = subGroup->GetCounter(name + "/TotalBytesAllocated"); AllocationsCntr = subGroup->GetCounter(name + "/Allocations", true); PoolsCntr = subGroup->GetCounter(name + "/Pools", true); diff --git a/ydb/library/yql/minikql/aligned_page_pool.h b/ydb/library/yql/minikql/aligned_page_pool.h index 2ef2878655..ffef6f9408 100644 --- a/ydb/library/yql/minikql/aligned_page_pool.h +++ b/ydb/library/yql/minikql/aligned_page_pool.h @@ -16,12 +16,12 @@ namespace NKikimr { struct TAlignedPagePoolCounters { - explicit TAlignedPagePoolCounters(NMonitoring::TDynamicCounterPtr countersRoot = nullptr, const TString& name = TString()); + explicit TAlignedPagePoolCounters(::NMonitoring::TDynamicCounterPtr countersRoot = nullptr, const TString& name = TString()); - NMonitoring::TDynamicCounters::TCounterPtr TotalBytesAllocatedCntr; - NMonitoring::TDynamicCounters::TCounterPtr AllocationsCntr; - NMonitoring::TDynamicCounters::TCounterPtr PoolsCntr; - NMonitoring::TDynamicCounters::TCounterPtr LostPagesBytesFreeCntr; + ::NMonitoring::TDynamicCounters::TCounterPtr TotalBytesAllocatedCntr; + ::NMonitoring::TDynamicCounters::TCounterPtr AllocationsCntr; + ::NMonitoring::TDynamicCounters::TCounterPtr PoolsCntr; + ::NMonitoring::TDynamicCounters::TCounterPtr LostPagesBytesFreeCntr; void Swap(TAlignedPagePoolCounters& other) { DoSwap(TotalBytesAllocatedCntr, other.TotalBytesAllocatedCntr); diff --git a/ydb/library/yql/providers/common/http_gateway/yql_http_gateway.cpp b/ydb/library/yql/providers/common/http_gateway/yql_http_gateway.cpp index aa0c973e23..eac4d35d4b 100644 --- a/ydb/library/yql/providers/common/http_gateway/yql_http_gateway.cpp +++ b/ydb/library/yql/providers/common/http_gateway/yql_http_gateway.cpp @@ -24,7 +24,7 @@ public: PUT }; - TEasyCurl(const NMonitoring::TDynamicCounters::TCounterPtr& counter, const NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const NMonitoring::TDynamicCounters::TCounterPtr& uploadedBytes, TString url, IHTTPGateway::THeaders headers, EMethod method, size_t offset = 0ULL, bool withBody = false) + TEasyCurl(const ::NMonitoring::TDynamicCounters::TCounterPtr& counter, const ::NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const ::NMonitoring::TDynamicCounters::TCounterPtr& uploadedBytes, TString url, IHTTPGateway::THeaders headers, EMethod method, size_t offset = 0ULL, bool withBody = false) : Offset(offset), Handle(curl_easy_init()), Counter(counter), DownloadedBytes(downloadedBytes), UploadedBytes(uploadedBytes) { switch (method) { @@ -103,9 +103,9 @@ private: const size_t Offset; CURL *const Handle; curl_slist* Headers = nullptr; - const NMonitoring::TDynamicCounters::TCounterPtr Counter; - const NMonitoring::TDynamicCounters::TCounterPtr DownloadedBytes; - const NMonitoring::TDynamicCounters::TCounterPtr UploadedBytes; + const ::NMonitoring::TDynamicCounters::TCounterPtr Counter; + const ::NMonitoring::TDynamicCounters::TCounterPtr DownloadedBytes; + const ::NMonitoring::TDynamicCounters::TCounterPtr UploadedBytes; }; class TEasyCurlBuffer : public TEasyCurl { @@ -113,14 +113,14 @@ public: using TPtr = std::shared_ptr<TEasyCurlBuffer>; using TWeakPtr = std::weak_ptr<TEasyCurlBuffer>; - TEasyCurlBuffer(const NMonitoring::TDynamicCounters::TCounterPtr& counter, const NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const NMonitoring::TDynamicCounters::TCounterPtr& uploadededBytes, TString url, EMethod method, TString data, IHTTPGateway::THeaders headers, size_t offset, size_t expectedSize, IHTTPGateway::TOnResult callback) + TEasyCurlBuffer(const ::NMonitoring::TDynamicCounters::TCounterPtr& counter, const ::NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const ::NMonitoring::TDynamicCounters::TCounterPtr& uploadededBytes, TString url, EMethod method, TString data, IHTTPGateway::THeaders headers, size_t offset, size_t expectedSize, IHTTPGateway::TOnResult callback) : TEasyCurl(counter, downloadedBytes, uploadededBytes, url, headers, method, offset, !data.empty()), ExpectedSize(expectedSize), Data(std::move(data)), Input(Data), Output(Buffer) { Output.Reserve(ExpectedSize); Callbacks.emplace(std::move(callback)); } - static TPtr Make(const NMonitoring::TDynamicCounters::TCounterPtr& counter, const NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const NMonitoring::TDynamicCounters::TCounterPtr& uploadededBytes, TString url, EMethod method, TString data, IHTTPGateway::THeaders headers, size_t offset, size_t expectedSize, IHTTPGateway::TOnResult callback) { + static TPtr Make(const ::NMonitoring::TDynamicCounters::TCounterPtr& counter, const ::NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const ::NMonitoring::TDynamicCounters::TCounterPtr& uploadededBytes, TString url, EMethod method, TString data, IHTTPGateway::THeaders headers, size_t offset, size_t expectedSize, IHTTPGateway::TOnResult callback) { return std::make_shared<TEasyCurlBuffer>(counter, downloadedBytes, uploadededBytes, std::move(url), method, std::move(data), std::move(headers), offset, expectedSize, std::move(callback)); } @@ -188,11 +188,11 @@ public: using TPtr = std::shared_ptr<TEasyCurlStream>; using TWeakPtr = std::weak_ptr<TEasyCurlStream>; - TEasyCurlStream(const NMonitoring::TDynamicCounters::TCounterPtr& counter, const NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const NMonitoring::TDynamicCounters::TCounterPtr& uploadededBytes, TString url, IHTTPGateway::THeaders headers, size_t offset, IHTTPGateway::TOnNewDataPart onNewData, IHTTPGateway::TOnDownloadFinish onFinish) + TEasyCurlStream(const ::NMonitoring::TDynamicCounters::TCounterPtr& counter, const ::NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const ::NMonitoring::TDynamicCounters::TCounterPtr& uploadededBytes, TString url, IHTTPGateway::THeaders headers, size_t offset, IHTTPGateway::TOnNewDataPart onNewData, IHTTPGateway::TOnDownloadFinish onFinish) : TEasyCurl(counter, downloadedBytes, uploadededBytes, url, headers, EMethod::GET, offset), OnNewData(std::move(onNewData)), OnFinish(std::move(onFinish)), Counter(std::make_shared<std::atomic_size_t>(0ULL)) {} - static TPtr Make(const NMonitoring::TDynamicCounters::TCounterPtr& counter, const NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const NMonitoring::TDynamicCounters::TCounterPtr& uploadededBytes, TString url, IHTTPGateway::THeaders headers, size_t offset, IHTTPGateway::TOnNewDataPart onNewData, IHTTPGateway::TOnDownloadFinish onFinish) { + static TPtr Make(const ::NMonitoring::TDynamicCounters::TCounterPtr& counter, const ::NMonitoring::TDynamicCounters::TCounterPtr& downloadedBytes, const ::NMonitoring::TDynamicCounters::TCounterPtr& uploadededBytes, TString url, IHTTPGateway::THeaders headers, size_t offset, IHTTPGateway::TOnNewDataPart onNewData, IHTTPGateway::TOnDownloadFinish onFinish) { return std::make_shared<TEasyCurlStream>(counter, downloadedBytes, uploadededBytes, std::move(url), std::move(headers), offset, std::move(onNewData), std::move(onFinish)); } @@ -267,7 +267,7 @@ public: explicit THTTPMultiGateway( const THttpGatewayConfig* httpGatewaysCfg, - NMonitoring::TDynamicCounterPtr counters) + ::NMonitoring::TDynamicCounterPtr counters) : Counters(std::move(counters)) , Rps(Counters->GetCounter("Requests", true)) , InFlight(Counters->GetCounter("InFlight")) @@ -577,19 +577,19 @@ private: static std::mutex CreateSync; static TWeakPtr Singleton; - const NMonitoring::TDynamicCounterPtr Counters; - const NMonitoring::TDynamicCounters::TCounterPtr Rps; - const NMonitoring::TDynamicCounters::TCounterPtr InFlight; - const NMonitoring::TDynamicCounters::TCounterPtr InFlightStreams; - const NMonitoring::TDynamicCounters::TCounterPtr MaxInFlight; - const NMonitoring::TDynamicCounters::TCounterPtr AllocatedMemory; - const NMonitoring::TDynamicCounters::TCounterPtr MaxAllocatedMemory; - const NMonitoring::TDynamicCounters::TCounterPtr OutputMemory; - const NMonitoring::TDynamicCounters::TCounterPtr PerformCycles; - const NMonitoring::TDynamicCounters::TCounterPtr AwaitQueue; - const NMonitoring::TDynamicCounters::TCounterPtr AwaitQueueTopExpectedSize; - const NMonitoring::TDynamicCounters::TCounterPtr DownloadedBytes; - const NMonitoring::TDynamicCounters::TCounterPtr UploadedBytes; + const ::NMonitoring::TDynamicCounterPtr Counters; + const ::NMonitoring::TDynamicCounters::TCounterPtr Rps; + const ::NMonitoring::TDynamicCounters::TCounterPtr InFlight; + const ::NMonitoring::TDynamicCounters::TCounterPtr InFlightStreams; + const ::NMonitoring::TDynamicCounters::TCounterPtr MaxInFlight; + const ::NMonitoring::TDynamicCounters::TCounterPtr AllocatedMemory; + const ::NMonitoring::TDynamicCounters::TCounterPtr MaxAllocatedMemory; + const ::NMonitoring::TDynamicCounters::TCounterPtr OutputMemory; + const ::NMonitoring::TDynamicCounters::TCounterPtr PerformCycles; + const ::NMonitoring::TDynamicCounters::TCounterPtr AwaitQueue; + const ::NMonitoring::TDynamicCounters::TCounterPtr AwaitQueueTopExpectedSize; + const ::NMonitoring::TDynamicCounters::TCounterPtr DownloadedBytes; + const ::NMonitoring::TDynamicCounters::TCounterPtr UploadedBytes; TTaskScheduler TaskScheduler; }; @@ -658,7 +658,7 @@ TString IHTTPGateway::TCountedContent::Extract() { } IHTTPGateway::TPtr -IHTTPGateway::Make(const THttpGatewayConfig* httpGatewaysCfg, NMonitoring::TDynamicCounterPtr counters) { +IHTTPGateway::Make(const THttpGatewayConfig* httpGatewaysCfg, ::NMonitoring::TDynamicCounterPtr counters) { const std::unique_lock lock(THTTPMultiGateway::CreateSync); if (const auto g = THTTPMultiGateway::Singleton.lock()) return g; diff --git a/ydb/library/yql/providers/common/http_gateway/yql_http_gateway.h b/ydb/library/yql/providers/common/http_gateway/yql_http_gateway.h index 926c4f790b..67d2421218 100644 --- a/ydb/library/yql/providers/common/http_gateway/yql_http_gateway.h +++ b/ydb/library/yql/providers/common/http_gateway/yql_http_gateway.h @@ -25,7 +25,7 @@ public: // Throws on error. static TPtr Make( const THttpGatewayConfig* httpGatewaysCfg = nullptr, - NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<NMonitoring::TDynamicCounters>()); + ::NMonitoring::TDynamicCounterPtr counters = MakeIntrusive<::NMonitoring::TDynamicCounters>()); class TContentBase : protected TString { protected: diff --git a/ydb/library/yql/providers/common/metrics/sensors_group.h b/ydb/library/yql/providers/common/metrics/sensors_group.h index 956a0c6fe2..1155fe3840 100644 --- a/ydb/library/yql/providers/common/metrics/sensors_group.h +++ b/ydb/library/yql/providers/common/metrics/sensors_group.h @@ -13,7 +13,7 @@ namespace NSensorComponent { } // namspace NSensorComponent -using TSensorsGroup = NMonitoring::TDynamicCounters; +using TSensorsGroup = ::NMonitoring::TDynamicCounters; using TSensorsGroupPtr = TIntrusivePtr<TSensorsGroup>; using TSensorCounter = NMonitoring::TCounterForPtr; diff --git a/ydb/library/yql/providers/common/metrics/service_counters.cpp b/ydb/library/yql/providers/common/metrics/service_counters.cpp index b7cba1c4b3..631c6e140a 100644 --- a/ydb/library/yql/providers/common/metrics/service_counters.cpp +++ b/ydb/library/yql/providers/common/metrics/service_counters.cpp @@ -4,8 +4,8 @@ namespace NYql { namespace NCommon { TServiceCounters::TServiceCounters( - const NMonitoring::TDynamicCounterPtr& rootCounters, - const NMonitoring::TDynamicCounterPtr& publicCounters, + const ::NMonitoring::TDynamicCounterPtr& rootCounters, + const ::NMonitoring::TDynamicCounterPtr& publicCounters, const TString& subsystemName) : RootCounters(rootCounters) , PublicCounters(publicCounters) @@ -14,7 +14,7 @@ TServiceCounters::TServiceCounters( } TServiceCounters::TServiceCounters( - const NMonitoring::TDynamicCounterPtr& baseCounters, + const ::NMonitoring::TDynamicCounterPtr& baseCounters, const TString& subsystemName) : RootCounters(baseCounters->GetSubgroup("counters", "yq")) , PublicCounters(baseCounters->GetSubgroup("counters", "yq_public")) diff --git a/ydb/library/yql/providers/common/metrics/service_counters.h b/ydb/library/yql/providers/common/metrics/service_counters.h index 05685daf85..3257711d66 100644 --- a/ydb/library/yql/providers/common/metrics/service_counters.h +++ b/ydb/library/yql/providers/common/metrics/service_counters.h @@ -7,20 +7,20 @@ namespace NYql { namespace NCommon { struct TServiceCounters { - NMonitoring::TDynamicCounterPtr RootCounters; // "counters/counters=yq" - root counters for service metrics - NMonitoring::TDynamicCounterPtr PublicCounters; // "counters/counters=public" - root counters for cloud user metrics - NMonitoring::TDynamicCounterPtr Counters; // "counters/counters=yq/subsystem=smth" - subsystem part, may match to RootCounters if subsystem name is empty + ::NMonitoring::TDynamicCounterPtr RootCounters; // "counters/counters=yq" - root counters for service metrics + ::NMonitoring::TDynamicCounterPtr PublicCounters; // "counters/counters=public" - root counters for cloud user metrics + ::NMonitoring::TDynamicCounterPtr Counters; // "counters/counters=yq/subsystem=smth" - subsystem part, may match to RootCounters if subsystem name is empty - NMonitoring::TDynamicCounters::TCounterPtr UptimeRootCounter; // yq/uptime_seconds - NMonitoring::TDynamicCounters::TCounterPtr UptimePublicCounter; // yq_public/query.uptime_seconds + ::NMonitoring::TDynamicCounters::TCounterPtr UptimeRootCounter; // yq/uptime_seconds + ::NMonitoring::TDynamicCounters::TCounterPtr UptimePublicCounter; // yq_public/query.uptime_seconds explicit TServiceCounters( - const NMonitoring::TDynamicCounterPtr& rootCounters, - const NMonitoring::TDynamicCounterPtr& publicCounters, + const ::NMonitoring::TDynamicCounterPtr& rootCounters, + const ::NMonitoring::TDynamicCounterPtr& publicCounters, const TString& subsystemName = ""); explicit TServiceCounters( - const NMonitoring::TDynamicCounterPtr& baseCounters, + const ::NMonitoring::TDynamicCounterPtr& baseCounters, const TString& subsystemName = ""); explicit TServiceCounters( diff --git a/ydb/library/yql/providers/dq/actors/executer_actor.cpp b/ydb/library/yql/providers/dq/actors/executer_actor.cpp index c58cc24487..9caf03e4ff 100644 --- a/ydb/library/yql/providers/dq/actors/executer_actor.cpp +++ b/ydb/library/yql/providers/dq/actors/executer_actor.cpp @@ -42,7 +42,7 @@ public: const NActors::TActorId& printerId, const TString& traceId, const TString& username, const TDqConfiguration::TPtr& settings, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, TInstant requestStartTime, bool createTaskSuspended) : TRichActor<TDqExecuter>(&TDqExecuter::Handler) @@ -457,7 +457,7 @@ private: ui64 ResourceId = 0; const TString TraceId; const TString Username; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TDynamicCounters::TCounterPtr LongWorkersAllocationCounter; TDynamicCounters::TCounterPtr ExecutionTimeoutCounter; @@ -484,7 +484,7 @@ NActors::IActor* MakeDqExecuter( const NActors::TActorId& printerId, const TString& traceId, const TString& username, const TDqConfiguration::TPtr& settings, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, TInstant requestStartTime, bool createTaskSuspended ) { diff --git a/ydb/library/yql/providers/dq/actors/executer_actor.h b/ydb/library/yql/providers/dq/actors/executer_actor.h index fae7d1cdbf..c4652142c1 100644 --- a/ydb/library/yql/providers/dq/actors/executer_actor.h +++ b/ydb/library/yql/providers/dq/actors/executer_actor.h @@ -13,7 +13,7 @@ NActors::IActor* MakeDqExecuter( const NActors::TActorId& printerId, const TString& traceId, const TString& username, const TDqConfiguration::TPtr& settings, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, TInstant requestStartTime = TInstant::Now(), bool createTaskSuspended = false ); diff --git a/ydb/library/yql/providers/dq/actors/resource_allocator.cpp b/ydb/library/yql/providers/dq/actors/resource_allocator.cpp index c8c786f6a3..8087a4d66d 100644 --- a/ydb/library/yql/providers/dq/actors/resource_allocator.cpp +++ b/ydb/library/yql/providers/dq/actors/resource_allocator.cpp @@ -48,7 +48,7 @@ public: ui32 workerCount, const TString& traceId, const TDqConfiguration::TPtr settings, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TVector<NYql::NDqProto::TDqTask>& tasks, const TString& computeActorType) : TRichActor<TResourceAllocator>(&TResourceAllocator::Handle) @@ -320,7 +320,7 @@ private: const TDqConfiguration::TPtr Settings; int NetworkRetries; TDuration Timeout; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TDynamicCounters::TCounterPtr RetryCounter; TCounters QueryStat; @@ -336,7 +336,7 @@ NActors::IActor* CreateResourceAllocator( ui32 size, const TString& traceId, const TDqConfiguration::TPtr& settings, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TVector<NYql::NDqProto::TDqTask>& tasks, const TString& computeActorType) { diff --git a/ydb/library/yql/providers/dq/actors/resource_allocator.h b/ydb/library/yql/providers/dq/actors/resource_allocator.h index ab5db2df0e..af9002663c 100644 --- a/ydb/library/yql/providers/dq/actors/resource_allocator.h +++ b/ydb/library/yql/providers/dq/actors/resource_allocator.h @@ -14,7 +14,7 @@ namespace NYql { ui32 workerCount, const TString& traceId, const TDqConfiguration::TPtr& settings, - const TIntrusivePtr<NMonitoring::TDynamicCounters>& counters, + const TIntrusivePtr<::NMonitoring::TDynamicCounters>& counters, const TVector<NYql::NDqProto::TDqTask>& tasks = {}, const TString& computeActorType = "old"); } // namespace NYql diff --git a/ydb/library/yql/providers/dq/actors/task_controller.cpp b/ydb/library/yql/providers/dq/actors/task_controller.cpp index 4becd9b1d4..d173cb6d74 100644 --- a/ydb/library/yql/providers/dq/actors/task_controller.cpp +++ b/ydb/library/yql/providers/dq/actors/task_controller.cpp @@ -190,7 +190,7 @@ private: } }; - NMonitoring::TDynamicCounterPtr GroupForExport(const TCounters& stat, const TString& counterName, ui64 taskId, TString& name, std::map<TString, TString>& labels) { + ::NMonitoring::TDynamicCounterPtr GroupForExport(const TCounters& stat, const TString& counterName, ui64 taskId, TString& name, std::map<TString, TString>& labels) { Y_UNUSED(stat); TString prefix; if (NCommon::ParseCounterName(&prefix, &labels, &name, counterName)) { diff --git a/ydb/library/yql/providers/dq/worker_manager/interface/counters.cpp b/ydb/library/yql/providers/dq/worker_manager/interface/counters.cpp index a38bcccdf8..cf150e270c 100644 --- a/ydb/library/yql/providers/dq/worker_manager/interface/counters.cpp +++ b/ydb/library/yql/providers/dq/worker_manager/interface/counters.cpp @@ -2,7 +2,7 @@ namespace NYql::NDqs { -TWorkerManagerCounters::TWorkerManagerCounters(NMonitoring::TDynamicCounterPtr root) { +TWorkerManagerCounters::TWorkerManagerCounters(::NMonitoring::TDynamicCounterPtr root) { ActiveWorkers = root->GetCounter("ActiveWorkers"); MkqlMemoryLimit = root->GetCounter("MkqlMemoryLimit"); MkqlMemoryAllocated = root->GetCounter("MkqlMemoryAllocated"); @@ -10,7 +10,7 @@ TWorkerManagerCounters::TWorkerManagerCounters(NMonitoring::TDynamicCounterPtr r } TWorkerManagerCounters::TWorkerManagerCounters() - : TWorkerManagerCounters(new NMonitoring::TDynamicCounters) + : TWorkerManagerCounters(new ::NMonitoring::TDynamicCounters) { } } // namespace NYql::NDqs diff --git a/ydb/library/yql/providers/dq/worker_manager/interface/counters.h b/ydb/library/yql/providers/dq/worker_manager/interface/counters.h index ee0613022c..16f206e769 100644 --- a/ydb/library/yql/providers/dq/worker_manager/interface/counters.h +++ b/ydb/library/yql/providers/dq/worker_manager/interface/counters.h @@ -4,12 +4,12 @@ namespace NYql::NDqs { struct TWorkerManagerCounters { - NMonitoring::TDynamicCounters::TCounterPtr ActiveWorkers; - NMonitoring::TDynamicCounters::TCounterPtr MkqlMemoryLimit; - NMonitoring::TDynamicCounters::TCounterPtr MkqlMemoryAllocated; - NMonitoring::TDynamicCounters::TCounterPtr FreeGroupError; + ::NMonitoring::TDynamicCounters::TCounterPtr ActiveWorkers; + ::NMonitoring::TDynamicCounters::TCounterPtr MkqlMemoryLimit; + ::NMonitoring::TDynamicCounters::TCounterPtr MkqlMemoryAllocated; + ::NMonitoring::TDynamicCounters::TCounterPtr FreeGroupError; - explicit TWorkerManagerCounters(NMonitoring::TDynamicCounterPtr root); + explicit TWorkerManagerCounters(::NMonitoring::TDynamicCounterPtr root); TWorkerManagerCounters(); }; diff --git a/ydb/library/yql/providers/dq/worker_manager/interface/worker_info.h b/ydb/library/yql/providers/dq/worker_manager/interface/worker_info.h index 5281a844f4..e82a1ce32a 100644 --- a/ydb/library/yql/providers/dq/worker_manager/interface/worker_info.h +++ b/ydb/library/yql/providers/dq/worker_manager/interface/worker_info.h @@ -89,8 +89,8 @@ public: private: TGlobalResources& Resources; - NMonitoring::TDynamicCounters::TCounterPtr Capacity; - NMonitoring::TDynamicCounters::TCounterPtr RunningRequests; + ::NMonitoring::TDynamicCounters::TCounterPtr Capacity; + ::NMonitoring::TDynamicCounters::TCounterPtr RunningRequests; }; struct TWorkerInfo: public TThrRefBase { diff --git a/ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.cpp b/ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.cpp index f2a24eaab0..dc0825146c 100644 --- a/ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.cpp +++ b/ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.cpp @@ -125,7 +125,7 @@ public: const TTxId& txId, TDqSolomonWriteParams&& writeParams, NYql::NDq::IDqComputeActorAsyncOutput::ICallbacks* callbacks, - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, std::shared_ptr<NYdb::ICredentialsProvider> credentialsProvider, i64 freeSpace) : TActor<TDqSolomonWriteActor>(&TDqSolomonWriteActor::StateFunc) @@ -204,7 +204,7 @@ public: private: struct TDqSolomonWriteActorMetrics { - explicit TDqSolomonWriteActorMetrics(const NMonitoring::TDynamicCounterPtr& counters) { + explicit TDqSolomonWriteActorMetrics(const ::NMonitoring::TDynamicCounterPtr& counters) { auto subgroup = counters->GetSubgroup("subsystem", "dq_solomon_write_actor"); SendingBufferSize = subgroup->GetCounter("SendingBufferSize"); WindowMinSendingBufferSize = subgroup->GetCounter("WindowMinSendingBufferSize"); @@ -214,12 +214,12 @@ private: СonfirmedMetrics = subgroup->GetCounter("СonfirmedMetrics", true); } - NMonitoring::TDynamicCounters::TCounterPtr SendingBufferSize; - NMonitoring::TDynamicCounters::TCounterPtr WindowMinSendingBufferSize; - NMonitoring::TDynamicCounters::TCounterPtr InflightRequests; - NMonitoring::TDynamicCounters::TCounterPtr WindowMinInflightRequests; - NMonitoring::TDynamicCounters::TCounterPtr SentMetrics; - NMonitoring::TDynamicCounters::TCounterPtr СonfirmedMetrics; + ::NMonitoring::TDynamicCounters::TCounterPtr SendingBufferSize; + ::NMonitoring::TDynamicCounters::TCounterPtr WindowMinSendingBufferSize; + ::NMonitoring::TDynamicCounters::TCounterPtr InflightRequests; + ::NMonitoring::TDynamicCounters::TCounterPtr WindowMinInflightRequests; + ::NMonitoring::TDynamicCounters::TCounterPtr SentMetrics; + ::NMonitoring::TDynamicCounters::TCounterPtr СonfirmedMetrics; public: void ReportSendingBufferSize(size_t size) { @@ -495,7 +495,7 @@ std::pair<NYql::NDq::IDqComputeActorAsyncOutput*, NActors::IActor*> CreateDqSolo const TTxId& txId, const THashMap<TString, TString>& secureParams, NYql::NDq::IDqComputeActorAsyncOutput::ICallbacks* callbacks, - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, ISecuredServiceAccountCredentialsFactory::TPtr credentialsFactory, i64 freeSpace) { @@ -526,7 +526,7 @@ void RegisterDQSolomonWriteActorFactory(TDqAsyncIoFactory& factory, ISecuredServ NYql::NSo::NProto::TDqSolomonShard&& settings, IDqAsyncIoFactory::TSinkArguments&& args) { - auto counters = MakeIntrusive<NMonitoring::TDynamicCounters>(); + auto counters = MakeIntrusive<::NMonitoring::TDynamicCounters>(); return CreateDqSolomonWriteActor( std::move(settings), diff --git a/ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.h b/ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.h index 5314129a05..3d422e333c 100644 --- a/ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.h +++ b/ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.h @@ -24,7 +24,7 @@ std::pair<NYql::NDq::IDqComputeActorAsyncOutput*, NActors::IActor*> CreateDqSolo const TTxId& txId, const THashMap<TString, TString>& secureParams, NYql::NDq::IDqComputeActorAsyncOutput::ICallbacks* callbacks, - const NMonitoring::TDynamicCounterPtr& counters, + const ::NMonitoring::TDynamicCounterPtr& counters, ISecuredServiceAccountCredentialsFactory::TPtr credentialsFactory, i64 freeSpace = DqSolomonDefaultFreeSpace); diff --git a/ydb/services/auth/grpc_service.cpp b/ydb/services/auth/grpc_service.cpp index 2729530449..996cd50168 100644 --- a/ydb/services/auth/grpc_service.cpp +++ b/ydb/services/auth/grpc_service.cpp @@ -15,7 +15,7 @@ static TString GetSdkBuildInfo(NGrpc::IRequestContextBase* reqCtx) { } TGRpcAuthService::TGRpcAuthService(NActors::TActorSystem* system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) diff --git a/ydb/services/auth/grpc_service.h b/ydb/services/auth/grpc_service.h index 706621df6d..61e2e884c9 100644 --- a/ydb/services/auth/grpc_service.h +++ b/ydb/services/auth/grpc_service.h @@ -12,7 +12,7 @@ namespace NGRpcService { { public: TGRpcAuthService(NActors::TActorSystem* system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -27,7 +27,7 @@ namespace NGRpcService { NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/cms/grpc_service.cpp b/ydb/services/cms/grpc_service.cpp index 737ae3e81d..5905ab3385 100644 --- a/ydb/services/cms/grpc_service.cpp +++ b/ydb/services/cms/grpc_service.cpp @@ -8,7 +8,7 @@ namespace NKikimr { namespace NGRpcService { TGRpcCmsService::TGRpcCmsService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) diff --git a/ydb/services/cms/grpc_service.h b/ydb/services/cms/grpc_service.h index 80f3bbe928..8367051cce 100644 --- a/ydb/services/cms/grpc_service.h +++ b/ydb/services/cms/grpc_service.h @@ -13,7 +13,7 @@ class TGRpcCmsService { public: TGRpcCmsService(NActors::TActorSystem* system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -28,7 +28,7 @@ public: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/datastreams/grpc_service.cpp b/ydb/services/datastreams/grpc_service.cpp index 564796ff94..5337821d74 100644 --- a/ydb/services/datastreams/grpc_service.cpp +++ b/ydb/services/datastreams/grpc_service.cpp @@ -38,7 +38,7 @@ void YdsProcessAttr(const TSchemeBoardEvents::TDescribeSchemeResult& schemeData, namespace NKikimr::NGRpcService { TGRpcDataStreamsService::TGRpcDataStreamsService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) diff --git a/ydb/services/datastreams/grpc_service.h b/ydb/services/datastreams/grpc_service.h index 044aacb8a1..0c80b53ee8 100644 --- a/ydb/services/datastreams/grpc_service.h +++ b/ydb/services/datastreams/grpc_service.h @@ -10,7 +10,7 @@ namespace NKikimr::NGRpcService { { public: TGRpcDataStreamsService(NActors::TActorSystem* system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -25,7 +25,7 @@ namespace NKikimr::NGRpcService { NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/discovery/grpc_service.cpp b/ydb/services/discovery/grpc_service.cpp index fdc95d95ce..2df0e98629 100644 --- a/ydb/services/discovery/grpc_service.cpp +++ b/ydb/services/discovery/grpc_service.cpp @@ -17,7 +17,7 @@ static TString GetSdkBuildInfo(NGrpc::IRequestContextBase* reqCtx) { } TGRpcDiscoveryService::TGRpcDiscoveryService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) diff --git a/ydb/services/discovery/grpc_service.h b/ydb/services/discovery/grpc_service.h index c6cb25f0fd..4b36484577 100644 --- a/ydb/services/discovery/grpc_service.h +++ b/ydb/services/discovery/grpc_service.h @@ -14,7 +14,7 @@ namespace NGRpcService { { public: TGRpcDiscoveryService(NActors::TActorSystem* system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -29,7 +29,7 @@ namespace NGRpcService { NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/kesus/grpc_service.cpp b/ydb/services/kesus/grpc_service.cpp index e297e00fe0..7d991c5002 100644 --- a/ydb/services/kesus/grpc_service.cpp +++ b/ydb/services/kesus/grpc_service.cpp @@ -609,7 +609,7 @@ private: TKesusGRpcService::TKesusGRpcService( NActors::TActorSystem* actorSystem, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem(actorSystem) , Counters(counters) diff --git a/ydb/services/kesus/grpc_service.h b/ydb/services/kesus/grpc_service.h index b5f597b7d9..6317fdf1da 100644 --- a/ydb/services/kesus/grpc_service.h +++ b/ydb/services/kesus/grpc_service.h @@ -20,7 +20,7 @@ class TKesusGRpcService public: TKesusGRpcService( NActors::TActorSystem* actorSystem, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); ~TKesusGRpcService(); @@ -35,7 +35,7 @@ private: private: NActors::TActorSystem* ActorSystem; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; NActors::TActorId GRpcRequestProxyId; grpc::ServerCompletionQueue* CQ = nullptr; diff --git a/ydb/services/local_discovery/grpc_service.cpp b/ydb/services/local_discovery/grpc_service.cpp index 9bb1257547..d2c091c330 100644 --- a/ydb/services/local_discovery/grpc_service.cpp +++ b/ydb/services/local_discovery/grpc_service.cpp @@ -49,7 +49,7 @@ static TString GetSdkBuildInfo(NGrpc::IRequestContextBase* reqCtx) { TGRpcLocalDiscoveryService::TGRpcLocalDiscoveryService(const NKikimrConfig::TGRpcConfig& grpcConfig, NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : GrpcConfig(grpcConfig) , ActorSystem_(system) diff --git a/ydb/services/local_discovery/grpc_service.h b/ydb/services/local_discovery/grpc_service.h index 7dd7add0bc..02b5232174 100644 --- a/ydb/services/local_discovery/grpc_service.h +++ b/ydb/services/local_discovery/grpc_service.h @@ -19,7 +19,7 @@ class TGRpcLocalDiscoveryService public: TGRpcLocalDiscoveryService(const NKikimrConfig::TGRpcConfig& grpcConfig, NActors::TActorSystem* system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -36,7 +36,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/monitoring/grpc_service.cpp b/ydb/services/monitoring/grpc_service.cpp index 0c92b9f0fb..6106b26087 100644 --- a/ydb/services/monitoring/grpc_service.cpp +++ b/ydb/services/monitoring/grpc_service.cpp @@ -18,7 +18,7 @@ static TString GetSdkBuildInfo(NGrpc::IRequestContextBase* reqCtx) { } TGRpcMonitoringService::TGRpcMonitoringService(NActors::TActorSystem* system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) diff --git a/ydb/services/monitoring/grpc_service.h b/ydb/services/monitoring/grpc_service.h index 3c324424fd..f9d2c7e6a5 100644 --- a/ydb/services/monitoring/grpc_service.h +++ b/ydb/services/monitoring/grpc_service.h @@ -13,7 +13,7 @@ namespace NGRpcService { { public: TGRpcMonitoringService(NActors::TActorSystem* system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -28,7 +28,7 @@ namespace NGRpcService { NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/persqueue_cluster_discovery/cluster_discovery_service.cpp b/ydb/services/persqueue_cluster_discovery/cluster_discovery_service.cpp index aabd11d4ca..23bf9636db 100644 --- a/ydb/services/persqueue_cluster_discovery/cluster_discovery_service.cpp +++ b/ydb/services/persqueue_cluster_discovery/cluster_discovery_service.cpp @@ -25,7 +25,7 @@ inline auto& Ctx() { class TClusterDiscoveryServiceActor: public TActorBootstrapped<TClusterDiscoveryServiceActor> { public: - TClusterDiscoveryServiceActor(TIntrusivePtr<NMonitoring::TDynamicCounters> counters) + TClusterDiscoveryServiceActor(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) : RawCounters(counters) , Counters(BuildCounters()) { @@ -290,11 +290,11 @@ private: size_t NetClassifierUpdatesCount = 0; size_t ClustersListUpdatesCount = 0; - TIntrusivePtr<NMonitoring::TDynamicCounters> RawCounters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> RawCounters; TClusterDiscoveryCounters::TPtr Counters; }; -NActors::IActor* CreateClusterDiscoveryService(TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { +NActors::IActor* CreateClusterDiscoveryService(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { return new TClusterDiscoveryServiceActor(counters); } diff --git a/ydb/services/persqueue_cluster_discovery/cluster_discovery_service.h b/ydb/services/persqueue_cluster_discovery/cluster_discovery_service.h index fec5708c15..97441fd88b 100644 --- a/ydb/services/persqueue_cluster_discovery/cluster_discovery_service.h +++ b/ydb/services/persqueue_cluster_discovery/cluster_discovery_service.h @@ -17,6 +17,6 @@ namespace NKikimr::NPQ::NClusterDiscovery { return TActorId(0, TStringBuf(x, TActorId::MaxServiceIDLength)); } - NActors::IActor* CreateClusterDiscoveryService(TIntrusivePtr<NMonitoring::TDynamicCounters> counters); + NActors::IActor* CreateClusterDiscoveryService(TIntrusivePtr<::NMonitoring::TDynamicCounters> counters); } // namespace NKikimr::NPQ::NClusterDiscovery diff --git a/ydb/services/persqueue_cluster_discovery/grpc_service.cpp b/ydb/services/persqueue_cluster_discovery/grpc_service.cpp index 086d162443..19f59e7d0b 100644 --- a/ydb/services/persqueue_cluster_discovery/grpc_service.cpp +++ b/ydb/services/persqueue_cluster_discovery/grpc_service.cpp @@ -14,7 +14,7 @@ namespace NKikimr::NGRpcService { TGRpcPQClusterDiscoveryService::TGRpcPQClusterDiscoveryService( - NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id, + NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id, const TMaybe<ui64>& requestsInflightLimit ) : ActorSystem_(system) diff --git a/ydb/services/persqueue_cluster_discovery/grpc_service.h b/ydb/services/persqueue_cluster_discovery/grpc_service.h index 7bc17ba2f5..421f5c0494 100644 --- a/ydb/services/persqueue_cluster_discovery/grpc_service.h +++ b/ydb/services/persqueue_cluster_discovery/grpc_service.h @@ -9,7 +9,7 @@ namespace NKikimr::NGRpcService { class TGRpcPQClusterDiscoveryService : public NGrpc::TGrpcServiceBase<Ydb::PersQueue::V1::ClusterDiscoveryService> { public: - TGRpcPQClusterDiscoveryService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcPQClusterDiscoveryService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id, const TMaybe<ui64>& requestsInflightLimit = Nothing()); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -25,7 +25,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; THolder<NGrpc::TGlobalLimiter> Limiter; }; diff --git a/ydb/services/persqueue_v1/actors/read_info_actor.cpp b/ydb/services/persqueue_v1/actors/read_info_actor.cpp index 12c63873f0..1147c9f989 100644 --- a/ydb/services/persqueue_v1/actors/read_info_actor.cpp +++ b/ydb/services/persqueue_v1/actors/read_info_actor.cpp @@ -16,7 +16,7 @@ using namespace PersQueue::V1; TReadInfoActor::TReadInfoActor( TEvPQReadInfoRequest* request, const NPersQueue::TTopicsListController& topicsHandler, const TActorId& schemeCache, const TActorId& newSchemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters ) : TBase(request) , SchemeCache(schemeCache) diff --git a/ydb/services/persqueue_v1/actors/read_info_actor.h b/ydb/services/persqueue_v1/actors/read_info_actor.h index 3ea8360d48..d2b94d6f28 100644 --- a/ydb/services/persqueue_v1/actors/read_info_actor.h +++ b/ydb/services/persqueue_v1/actors/read_info_actor.h @@ -17,7 +17,7 @@ public: TReadInfoActor( NKikimr::NGRpcService::TEvPQReadInfoRequest* request, const NPersQueue::TTopicsListController& topicsHandler, const NActors::TActorId& schemeCache, const NActors::TActorId& newSchemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters ); ~TReadInfoActor(); @@ -62,7 +62,7 @@ private: TTopicInitInfoMap TopicAndTablets; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TString ClientId; NPersQueue::TTopicsListController TopicsHandler; diff --git a/ydb/services/persqueue_v1/actors/read_init_auth_actor.cpp b/ydb/services/persqueue_v1/actors/read_init_auth_actor.cpp index fb746602cd..79bed09031 100644 --- a/ydb/services/persqueue_v1/actors/read_init_auth_actor.cpp +++ b/ydb/services/persqueue_v1/actors/read_init_auth_actor.cpp @@ -12,7 +12,7 @@ namespace NKikimr::NGRpcProxy::V1 { TReadInitAndAuthActor::TReadInitAndAuthActor( const TActorContext& ctx, const TActorId& parentId, const TString& clientId, const ui64 cookie, const TString& session, const NActors::TActorId& metaCache, const NActors::TActorId& newSchemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, TIntrusivePtr<NACLib::TUserToken> token, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, TIntrusivePtr<NACLib::TUserToken> token, const NPersQueue::TTopicsToConverter& topics, const TString& localCluster ) : ParentId(parentId) diff --git a/ydb/services/persqueue_v1/actors/read_init_auth_actor.h b/ydb/services/persqueue_v1/actors/read_init_auth_actor.h index 4e21ae8b2c..2891c8ff1f 100644 --- a/ydb/services/persqueue_v1/actors/read_init_auth_actor.h +++ b/ydb/services/persqueue_v1/actors/read_init_auth_actor.h @@ -21,7 +21,7 @@ class TReadInitAndAuthActor : public NActors::TActorBootstrapped<TReadInitAndAut public: TReadInitAndAuthActor(const TActorContext& ctx, const TActorId& parentId, const TString& clientId, const ui64 cookie, const TString& session, const NActors::TActorId& schemeCache, const NActors::TActorId& newSchemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, TIntrusivePtr<NACLib::TUserToken> token, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, TIntrusivePtr<NACLib::TUserToken> token, const NPersQueue::TTopicsToConverter& topics, const TString& localCluster); ~TReadInitAndAuthActor(); @@ -76,7 +76,7 @@ private: THashMap<TString, TTopicHolder> Topics; // topic -> info - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; bool DoCheckACL; TString LocalCluster; diff --git a/ydb/services/persqueue_v1/actors/read_session_actor.h b/ydb/services/persqueue_v1/actors/read_session_actor.h index 7d9b50dc8a..6013112419 100644 --- a/ydb/services/persqueue_v1/actors/read_session_actor.h +++ b/ydb/services/persqueue_v1/actors/read_session_actor.h @@ -138,7 +138,7 @@ private: public: TReadSessionActor(TEvStreamPQReadRequest* request, const ui64 cookie, const NActors::TActorId& schemeCache, const NActors::TActorId& newSchemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const TMaybe<TString> clientDC, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const TMaybe<TString> clientDC, const NPersQueue::TTopicsListController& topicsHandler); ~TReadSessionActor(); @@ -335,14 +335,14 @@ private: TMap<ui64, TCommitInfo> Commits; //readid->TCommitInfo - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; - NMonitoring::TDynamicCounters::TCounterPtr SessionsCreated; - NMonitoring::TDynamicCounters::TCounterPtr SessionsActive; + ::NMonitoring::TDynamicCounters::TCounterPtr SessionsCreated; + ::NMonitoring::TDynamicCounters::TCounterPtr SessionsActive; - NMonitoring::TDynamicCounters::TCounterPtr Errors; - NMonitoring::TDynamicCounters::TCounterPtr PipeReconnects; - NMonitoring::TDynamicCounters::TCounterPtr BytesInflight; + ::NMonitoring::TDynamicCounters::TCounterPtr Errors; + ::NMonitoring::TDynamicCounters::TCounterPtr PipeReconnects; + ::NMonitoring::TDynamicCounters::TCounterPtr BytesInflight; ui64 BytesInflight_; ui64 RequestedBytes; ui32 ReadsInfly; diff --git a/ydb/services/persqueue_v1/actors/write_session_actor.cpp b/ydb/services/persqueue_v1/actors/write_session_actor.cpp index badfbdcd3e..35e39983a7 100644 --- a/ydb/services/persqueue_v1/actors/write_session_actor.cpp +++ b/ydb/services/persqueue_v1/actors/write_session_actor.cpp @@ -91,7 +91,7 @@ static const TDuration SOURCEID_UPDATE_PERIOD = TDuration::Hours(1); TWriteSessionActor::TWriteSessionActor( NKikimr::NGRpcService::TEvStreamPQWriteRequest* request, const ui64 cookie, const NActors::TActorId& schemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const TMaybe<TString> clientDC, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const TMaybe<TString> clientDC, const NPersQueue::TTopicsListController& topicsController ) : Request(request) diff --git a/ydb/services/persqueue_v1/actors/write_session_actor.h b/ydb/services/persqueue_v1/actors/write_session_actor.h index a7bae1f74e..5a7312f3b0 100644 --- a/ydb/services/persqueue_v1/actors/write_session_actor.h +++ b/ydb/services/persqueue_v1/actors/write_session_actor.h @@ -34,7 +34,7 @@ static constexpr ui32 CODEC_ID_SIZE = 1; public: TWriteSessionActor(NKikimr::NGRpcService::TEvStreamPQWriteRequest* request, const ui64 cookie, const NActors::TActorId& schemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const TMaybe<TString> clientDC, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const TMaybe<TString> clientDC, const NPersQueue::TTopicsListController& topicsController); ~TWriteSessionActor(); @@ -199,7 +199,7 @@ private: THashMap<ui32, ui64> PartitionToTablet; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; NKikimr::NPQ::TMultiCounter BytesInflight; NKikimr::NPQ::TMultiCounter BytesInflightTotal; diff --git a/ydb/services/persqueue_v1/grpc_pq_read.cpp b/ydb/services/persqueue_v1/grpc_pq_read.cpp index bac9b05463..33b0723c30 100644 --- a/ydb/services/persqueue_v1/grpc_pq_read.cpp +++ b/ydb/services/persqueue_v1/grpc_pq_read.cpp @@ -23,14 +23,14 @@ using namespace PersQueue::V1; IActor* CreatePQReadService(const TActorId& schemeCache, const TActorId& newSchemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const ui32 maxSessions) { + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const ui32 maxSessions) { return new TPQReadService(schemeCache, newSchemeCache, counters, maxSessions); } TPQReadService::TPQReadService(const TActorId& schemeCache, const TActorId& newSchemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const ui32 maxSessions) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const ui32 maxSessions) : SchemeCache(schemeCache) , NewSchemeCache(newSchemeCache) , Counters(counters) diff --git a/ydb/services/persqueue_v1/grpc_pq_read.h b/ydb/services/persqueue_v1/grpc_pq_read.h index 812f8a774d..9ab9c57d92 100644 --- a/ydb/services/persqueue_v1/grpc_pq_read.h +++ b/ydb/services/persqueue_v1/grpc_pq_read.h @@ -21,12 +21,12 @@ namespace V1 { IActor* CreatePQReadService(const NActors::TActorId& schemeCache, const NActors::TActorId& newSchemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const ui32 maxSessions); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const ui32 maxSessions); class TPQReadService : public NActors::TActorBootstrapped<TPQReadService> { public: TPQReadService(const NActors::TActorId& schemeCache, const NActors::TActorId& newSchemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const ui32 maxSessions); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const ui32 maxSessions); ~TPQReadService() {} @@ -70,7 +70,7 @@ private: THashMap<ui64, TActorId> Sessions; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; ui32 MaxSessions; TVector<TString> Clusters; diff --git a/ydb/services/persqueue_v1/grpc_pq_schema.cpp b/ydb/services/persqueue_v1/grpc_pq_schema.cpp index 026620baf6..1c52b7149b 100644 --- a/ydb/services/persqueue_v1/grpc_pq_schema.cpp +++ b/ydb/services/persqueue_v1/grpc_pq_schema.cpp @@ -23,14 +23,14 @@ namespace NKikimr::NGRpcProxy::V1 { using namespace PersQueue::V1; -IActor* CreatePQSchemaService(const TActorId& schemeCache, TIntrusivePtr<NMonitoring::TDynamicCounters> counters) { +IActor* CreatePQSchemaService(const TActorId& schemeCache, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) { return new TPQSchemaService(schemeCache, counters); } TPQSchemaService::TPQSchemaService(const TActorId& schemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters) : SchemeCache(schemeCache) , Counters(counters) , LocalCluster("") diff --git a/ydb/services/persqueue_v1/grpc_pq_schema.h b/ydb/services/persqueue_v1/grpc_pq_schema.h index 107e3e44eb..899cef430e 100644 --- a/ydb/services/persqueue_v1/grpc_pq_schema.h +++ b/ydb/services/persqueue_v1/grpc_pq_schema.h @@ -18,11 +18,11 @@ inline TActorId GetPQSchemaServiceActorID() { return TActorId(0, "PQSchmSvc"); } -IActor* CreatePQSchemaService(const NActors::TActorId& schemeCache, TIntrusivePtr<NMonitoring::TDynamicCounters> counters); +IActor* CreatePQSchemaService(const NActors::TActorId& schemeCache, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters); class TPQSchemaService : public NActors::TActorBootstrapped<TPQSchemaService> { public: - TPQSchemaService(const NActors::TActorId& schemeCache, TIntrusivePtr<NMonitoring::TDynamicCounters> counters); + TPQSchemaService(const NActors::TActorId& schemeCache, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters); void Bootstrap(const TActorContext& ctx); @@ -62,7 +62,7 @@ private: NActors::TActorId SchemeCache; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; TVector<TString> Clusters; TString LocalCluster; diff --git a/ydb/services/persqueue_v1/grpc_pq_write.cpp b/ydb/services/persqueue_v1/grpc_pq_write.cpp index 506db61873..06f8e5e479 100644 --- a/ydb/services/persqueue_v1/grpc_pq_write.cpp +++ b/ydb/services/persqueue_v1/grpc_pq_write.cpp @@ -18,14 +18,14 @@ using namespace PersQueue::V1; /////////////////////////////////////////////////////////////////////////////// IActor* CreatePQWriteService(const TActorId& schemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const ui32 maxSessions) { + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const ui32 maxSessions) { return new TPQWriteService(schemeCache, counters, maxSessions); } TPQWriteService::TPQWriteService(const TActorId& schemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const ui32 maxSessions) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const ui32 maxSessions) : SchemeCache(schemeCache) , Counters(counters) , MaxSessions(maxSessions) diff --git a/ydb/services/persqueue_v1/grpc_pq_write.h b/ydb/services/persqueue_v1/grpc_pq_write.h index 4107cdae13..3420f7b0f9 100644 --- a/ydb/services/persqueue_v1/grpc_pq_write.h +++ b/ydb/services/persqueue_v1/grpc_pq_write.h @@ -17,12 +17,12 @@ namespace NGRpcProxy { namespace V1 { IActor* CreatePQWriteService(const NActors::TActorId& schemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const ui32 maxSessions); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const ui32 maxSessions); class TPQWriteService : public NActors::TActorBootstrapped<TPQWriteService> { public: TPQWriteService(const NActors::TActorId& schemeCache, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const ui32 maxSessions); + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const ui32 maxSessions); ~TPQWriteService() {} @@ -65,7 +65,7 @@ private: // Cluster enabled at time if cluster is currently enabled THashMap<TString, TInstant> ClustersEnabledAt; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; ui32 MaxSessions; TMaybe<TString> LocalCluster; diff --git a/ydb/services/persqueue_v1/persqueue.cpp b/ydb/services/persqueue_v1/persqueue.cpp index 4dbb06ae67..74ea2f42d4 100644 --- a/ydb/services/persqueue_v1/persqueue.cpp +++ b/ydb/services/persqueue_v1/persqueue.cpp @@ -17,7 +17,7 @@ namespace V1 { static const ui32 PersQueueWriteSessionsMaxCount = 1000000; static const ui32 PersQueueReadSessionsMaxCount = 100000; -TGRpcPersQueueService::TGRpcPersQueueService(NActors::TActorSystem *system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const NActors::TActorId& schemeCache,const NActors::TActorId& grpcRequestProxy) +TGRpcPersQueueService::TGRpcPersQueueService(NActors::TActorSystem *system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const NActors::TActorId& schemeCache,const NActors::TActorId& grpcRequestProxy) : ActorSystem(system) , Counters(counters) , SchemeCache(schemeCache) diff --git a/ydb/services/persqueue_v1/persqueue.h b/ydb/services/persqueue_v1/persqueue.h index df06fd133f..73305b344d 100644 --- a/ydb/services/persqueue_v1/persqueue.h +++ b/ydb/services/persqueue_v1/persqueue.h @@ -18,7 +18,7 @@ class TGRpcPersQueueService : public NGrpc::TGrpcServiceBase<Ydb::PersQueue::V1::PersQueueService> { public: - TGRpcPersQueueService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const NActors::TActorId& schemeCache, const NActors::TActorId& grpcRequestProxy); + TGRpcPersQueueService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const NActors::TActorId& schemeCache, const NActors::TActorId& grpcRequestProxy); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; void SetGlobalLimiterHandle(NGrpc::TGlobalLimiter* limiter) override; @@ -37,7 +37,7 @@ private: NActors::TActorSystem* ActorSystem; grpc::ServerCompletionQueue* CQ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; NGrpc::TGlobalLimiter* Limiter = nullptr; NActors::TActorId SchemeCache; NActors::TActorId NewSchemeCache; diff --git a/ydb/services/persqueue_v1/topic.cpp b/ydb/services/persqueue_v1/topic.cpp index 1b9d954467..9d01f2686a 100644 --- a/ydb/services/persqueue_v1/topic.cpp +++ b/ydb/services/persqueue_v1/topic.cpp @@ -17,7 +17,7 @@ namespace V1 { static const ui32 TopicWriteSessionsMaxCount = 1000000; static const ui32 TopicReadSessionsMaxCount = 100000; -TGRpcTopicService::TGRpcTopicService(NActors::TActorSystem *system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const NActors::TActorId& schemeCache,const NActors::TActorId& grpcRequestProxy) +TGRpcTopicService::TGRpcTopicService(NActors::TActorSystem *system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const NActors::TActorId& schemeCache,const NActors::TActorId& grpcRequestProxy) : ActorSystem(system) , Counters(counters) , SchemeCache(schemeCache) diff --git a/ydb/services/persqueue_v1/topic.h b/ydb/services/persqueue_v1/topic.h index 7f516844b2..55d2dda88b 100644 --- a/ydb/services/persqueue_v1/topic.h +++ b/ydb/services/persqueue_v1/topic.h @@ -16,7 +16,7 @@ class TGRpcTopicService : public NGrpc::TGrpcServiceBase<Ydb::Topic::V1::TopicService> { public: - TGRpcTopicService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, const NActors::TActorId& schemeCache, const NActors::TActorId& grpcRequestProxy); + TGRpcTopicService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, const NActors::TActorId& schemeCache, const NActors::TActorId& grpcRequestProxy); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; void SetGlobalLimiterHandle(NGrpc::TGlobalLimiter* limiter) override; @@ -35,7 +35,7 @@ private: NActors::TActorSystem* ActorSystem; grpc::ServerCompletionQueue* CQ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; NGrpc::TGlobalLimiter* Limiter = nullptr; NActors::TActorId SchemeCache; NActors::TActorId NewSchemeCache; diff --git a/ydb/services/rate_limiter/grpc_service.cpp b/ydb/services/rate_limiter/grpc_service.cpp index 2040c78463..9293510f9c 100644 --- a/ydb/services/rate_limiter/grpc_service.cpp +++ b/ydb/services/rate_limiter/grpc_service.cpp @@ -6,7 +6,7 @@ namespace NKikimr::NQuoter { -TRateLimiterGRpcService::TRateLimiterGRpcService(NActors::TActorSystem* actorSystem, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId grpcRequestProxyId) +TRateLimiterGRpcService::TRateLimiterGRpcService(NActors::TActorSystem* actorSystem, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId grpcRequestProxyId) : ActorSystem(actorSystem) , Counters(std::move(counters)) , GRpcRequestProxyId(grpcRequestProxyId) diff --git a/ydb/services/rate_limiter/grpc_service.h b/ydb/services/rate_limiter/grpc_service.h index 82ab6f91f5..b741e7473d 100644 --- a/ydb/services/rate_limiter/grpc_service.h +++ b/ydb/services/rate_limiter/grpc_service.h @@ -10,7 +10,7 @@ class TRateLimiterGRpcService : public NGrpc::TGrpcServiceBase<Ydb::RateLimiter::V1::RateLimiterService> { public: - TRateLimiterGRpcService(NActors::TActorSystem* actorSystem, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId grpcRequestProxyId); + TRateLimiterGRpcService(NActors::TActorSystem* actorSystem, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId grpcRequestProxyId); ~TRateLimiterGRpcService(); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -24,7 +24,7 @@ private: private: NActors::TActorSystem* ActorSystem = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters; NActors::TActorId GRpcRequestProxyId; grpc::ServerCompletionQueue* CQ = nullptr; diff --git a/ydb/services/ydb/ydb_clickhouse_internal.cpp b/ydb/services/ydb/ydb_clickhouse_internal.cpp index d0836fc7d8..a2f0208cf7 100644 --- a/ydb/services/ydb/ydb_clickhouse_internal.cpp +++ b/ydb/services/ydb/ydb_clickhouse_internal.cpp @@ -8,7 +8,7 @@ namespace NKikimr { namespace NGRpcService { TGRpcYdbClickhouseInternalService::TGRpcYdbClickhouseInternalService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, TIntrusivePtr<TInFlightLimiterRegistry> inFlightLimiterRegistry, NActors::TActorId id) : ActorSystem_(system) diff --git a/ydb/services/ydb/ydb_clickhouse_internal.h b/ydb/services/ydb/ydb_clickhouse_internal.h index a0ff8863d1..87c889d182 100644 --- a/ydb/services/ydb/ydb_clickhouse_internal.h +++ b/ydb/services/ydb/ydb_clickhouse_internal.h @@ -17,7 +17,7 @@ private: constexpr static i64 DEFAULT_MAX_IN_FLIGHT = 200; public: - TGRpcYdbClickhouseInternalService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcYdbClickhouseInternalService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, TIntrusivePtr<NGRpcService::TInFlightLimiterRegistry> inFlightLimiterRegistry, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -31,7 +31,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; TIntrusivePtr<NGRpcService::TInFlightLimiterRegistry> LimiterRegistry_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; diff --git a/ydb/services/ydb/ydb_dummy.cpp b/ydb/services/ydb/ydb_dummy.cpp index c628b0b3e4..72cd7638f2 100644 --- a/ydb/services/ydb/ydb_dummy.cpp +++ b/ydb/services/ydb/ydb_dummy.cpp @@ -112,7 +112,7 @@ private: TEvBiStreamPingRequest::TResponse Resp_; }; -TGRpcYdbDummyService::TGRpcYdbDummyService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId proxyActorId) +TGRpcYdbDummyService::TGRpcYdbDummyService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId proxyActorId) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(proxyActorId) diff --git a/ydb/services/ydb/ydb_dummy.h b/ydb/services/ydb/ydb_dummy.h index 7e3e74c506..fd80f86849 100644 --- a/ydb/services/ydb/ydb_dummy.h +++ b/ydb/services/ydb/ydb_dummy.h @@ -12,7 +12,7 @@ class TGRpcYdbDummyService : public NGrpc::TGrpcServiceBase<Draft::Dummy::DummyService> { public: - TGRpcYdbDummyService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId proxyActorId); + TGRpcYdbDummyService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId proxyActorId); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; void SetGlobalLimiterHandle(NGrpc::TGlobalLimiter* limiter) override; @@ -26,7 +26,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_experimental.cpp b/ydb/services/ydb/ydb_experimental.cpp index 1ca0009770..3b40907b18 100644 --- a/ydb/services/ydb/ydb_experimental.cpp +++ b/ydb/services/ydb/ydb_experimental.cpp @@ -8,7 +8,7 @@ namespace NKikimr { namespace NGRpcService { TGRpcYdbExperimentalService::TGRpcYdbExperimentalService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) {} diff --git a/ydb/services/ydb/ydb_experimental.h b/ydb/services/ydb/ydb_experimental.h index c312a18cac..206e0f9c85 100644 --- a/ydb/services/ydb/ydb_experimental.h +++ b/ydb/services/ydb/ydb_experimental.h @@ -13,7 +13,7 @@ class TGRpcYdbExperimentalService : public NGrpc::TGrpcServiceBase<Ydb::Experimental::V1::ExperimentalService> { public: - TGRpcYdbExperimentalService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcYdbExperimentalService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -27,7 +27,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_export.cpp b/ydb/services/ydb/ydb_export.cpp index 4a180db6be..cd56a41885 100644 --- a/ydb/services/ydb/ydb_export.cpp +++ b/ydb/services/ydb/ydb_export.cpp @@ -7,7 +7,7 @@ namespace NKikimr { namespace NGRpcService { -TGRpcYdbExportService::TGRpcYdbExportService(NActors::TActorSystem *system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) +TGRpcYdbExportService::TGRpcYdbExportService(NActors::TActorSystem *system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) diff --git a/ydb/services/ydb/ydb_export.h b/ydb/services/ydb/ydb_export.h index 6049462ca2..1e16f4d825 100644 --- a/ydb/services/ydb/ydb_export.h +++ b/ydb/services/ydb/ydb_export.h @@ -11,7 +11,7 @@ class TGRpcYdbExportService : public NGrpc::TGrpcServiceBase<Ydb::Export::V1::ExportService> { public: - TGRpcYdbExportService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id); + TGRpcYdbExportService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; void SetGlobalLimiterHandle(NGrpc::TGlobalLimiter* limiter) override; @@ -24,7 +24,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_import.cpp b/ydb/services/ydb/ydb_import.cpp index ba7f928915..029fcbba4a 100644 --- a/ydb/services/ydb/ydb_import.cpp +++ b/ydb/services/ydb/ydb_import.cpp @@ -7,7 +7,7 @@ namespace NKikimr { namespace NGRpcService { -TGRpcYdbImportService::TGRpcYdbImportService(NActors::TActorSystem *system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) +TGRpcYdbImportService::TGRpcYdbImportService(NActors::TActorSystem *system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) diff --git a/ydb/services/ydb/ydb_import.h b/ydb/services/ydb/ydb_import.h index a7db52853a..13e74d5903 100644 --- a/ydb/services/ydb/ydb_import.h +++ b/ydb/services/ydb/ydb_import.h @@ -11,7 +11,7 @@ class TGRpcYdbImportService : public NGrpc::TGrpcServiceBase<Ydb::Import::V1::ImportService> { public: - TGRpcYdbImportService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id); + TGRpcYdbImportService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; void SetGlobalLimiterHandle(NGrpc::TGlobalLimiter* limiter) override; @@ -24,7 +24,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_logstore.cpp b/ydb/services/ydb/ydb_logstore.cpp index a036a6ee34..0e151a9ac4 100644 --- a/ydb/services/ydb/ydb_logstore.cpp +++ b/ydb/services/ydb/ydb_logstore.cpp @@ -8,7 +8,7 @@ namespace NKikimr::NGRpcService { TGRpcYdbLogStoreService::TGRpcYdbLogStoreService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) diff --git a/ydb/services/ydb/ydb_logstore.h b/ydb/services/ydb/ydb_logstore.h index 17b954463a..289bd296bf 100644 --- a/ydb/services/ydb/ydb_logstore.h +++ b/ydb/services/ydb/ydb_logstore.h @@ -11,7 +11,7 @@ class TGRpcYdbLogStoreService : public NGrpc::TGrpcServiceBase<Ydb::LogStore::V1::LogStoreService> { public: - TGRpcYdbLogStoreService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcYdbLogStoreService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -25,7 +25,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_long_tx.cpp b/ydb/services/ydb/ydb_long_tx.cpp index 0ae6bcfb74..4c7aadceda 100644 --- a/ydb/services/ydb/ydb_long_tx.cpp +++ b/ydb/services/ydb/ydb_long_tx.cpp @@ -9,7 +9,7 @@ namespace NGRpcService { TGRpcYdbLongTxService::TGRpcYdbLongTxService(NActors::TActorSystem* system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) diff --git a/ydb/services/ydb/ydb_long_tx.h b/ydb/services/ydb/ydb_long_tx.h index 1788da91c5..53d50b3c35 100644 --- a/ydb/services/ydb/ydb_long_tx.h +++ b/ydb/services/ydb/ydb_long_tx.h @@ -11,7 +11,7 @@ class TGRpcYdbLongTxService : public NGrpc::TGrpcServiceBase<Ydb::LongTx::V1::LongTxService> { public: - TGRpcYdbLongTxService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcYdbLongTxService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -25,7 +25,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_operation.cpp b/ydb/services/ydb/ydb_operation.cpp index 4d7d63a433..c611f13ac1 100644 --- a/ydb/services/ydb/ydb_operation.cpp +++ b/ydb/services/ydb/ydb_operation.cpp @@ -8,7 +8,7 @@ namespace NKikimr { namespace NGRpcService { -TGRpcOperationService::TGRpcOperationService(NActors::TActorSystem *system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) +TGRpcOperationService::TGRpcOperationService(NActors::TActorSystem *system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) diff --git a/ydb/services/ydb/ydb_operation.h b/ydb/services/ydb/ydb_operation.h index 9f7e8646b1..fc2ea409eb 100644 --- a/ydb/services/ydb/ydb_operation.h +++ b/ydb/services/ydb/ydb_operation.h @@ -11,7 +11,7 @@ class TGRpcOperationService : public NGrpc::TGrpcServiceBase<Ydb::Operation::V1::OperationService> { public: - TGRpcOperationService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id); + TGRpcOperationService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; void SetGlobalLimiterHandle(NGrpc::TGlobalLimiter* limiter) override; @@ -24,7 +24,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_s3_internal.cpp b/ydb/services/ydb/ydb_s3_internal.cpp index 5dca2c2fd9..326097b872 100644 --- a/ydb/services/ydb/ydb_s3_internal.cpp +++ b/ydb/services/ydb/ydb_s3_internal.cpp @@ -8,7 +8,7 @@ namespace NKikimr { namespace NGRpcService { TGRpcYdbS3InternalService::TGRpcYdbS3InternalService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) {} diff --git a/ydb/services/ydb/ydb_s3_internal.h b/ydb/services/ydb/ydb_s3_internal.h index e947a9b131..58c2559eb7 100644 --- a/ydb/services/ydb/ydb_s3_internal.h +++ b/ydb/services/ydb/ydb_s3_internal.h @@ -11,7 +11,7 @@ class TGRpcYdbS3InternalService : public NGrpc::TGrpcServiceBase<Ydb::S3Internal::V1::S3InternalService> { public: - TGRpcYdbS3InternalService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcYdbS3InternalService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -25,7 +25,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_scheme.cpp b/ydb/services/ydb/ydb_scheme.cpp index ac339f54ab..1c9195ee85 100644 --- a/ydb/services/ydb/ydb_scheme.cpp +++ b/ydb/services/ydb/ydb_scheme.cpp @@ -8,7 +8,7 @@ namespace NKikimr { namespace NGRpcService { -TGRpcYdbSchemeService::TGRpcYdbSchemeService(NActors::TActorSystem *system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) +TGRpcYdbSchemeService::TGRpcYdbSchemeService(NActors::TActorSystem *system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) diff --git a/ydb/services/ydb/ydb_scheme.h b/ydb/services/ydb/ydb_scheme.h index a510e5f592..f35823e365 100644 --- a/ydb/services/ydb/ydb_scheme.h +++ b/ydb/services/ydb/ydb_scheme.h @@ -11,7 +11,7 @@ class TGRpcYdbSchemeService : public NGrpc::TGrpcServiceBase<Ydb::Scheme::V1::SchemeService> { public: - TGRpcYdbSchemeService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id); + TGRpcYdbSchemeService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; void SetGlobalLimiterHandle(NGrpc::TGlobalLimiter* limiter) override; @@ -24,7 +24,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_scripting.cpp b/ydb/services/ydb/ydb_scripting.cpp index 3596b17fd9..e5164beb9c 100644 --- a/ydb/services/ydb/ydb_scripting.cpp +++ b/ydb/services/ydb/ydb_scripting.cpp @@ -9,7 +9,7 @@ namespace NKikimr { namespace NGRpcService { TGRpcYdbScriptingService::TGRpcYdbScriptingService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) {} diff --git a/ydb/services/ydb/ydb_scripting.h b/ydb/services/ydb/ydb_scripting.h index 9566cadeee..c68839abb2 100644 --- a/ydb/services/ydb/ydb_scripting.h +++ b/ydb/services/ydb/ydb_scripting.h @@ -11,7 +11,7 @@ class TGRpcYdbScriptingService : public NGrpc::TGrpcServiceBase<Ydb::Scripting::V1::ScriptingService> { public: - TGRpcYdbScriptingService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcYdbScriptingService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -25,7 +25,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/ydb/ydb_table.cpp b/ydb/services/ydb/ydb_table.cpp index cf136b19bc..2ffbe329f3 100644 --- a/ydb/services/ydb/ydb_table.cpp +++ b/ydb/services/ydb/ydb_table.cpp @@ -7,7 +7,7 @@ namespace NKikimr { namespace NGRpcService { -TGRpcYdbTableService::TGRpcYdbTableService(NActors::TActorSystem *system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) +TGRpcYdbTableService::TGRpcYdbTableService(NActors::TActorSystem *system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) diff --git a/ydb/services/ydb/ydb_table.h b/ydb/services/ydb/ydb_table.h index 77756bf023..083496f129 100644 --- a/ydb/services/ydb/ydb_table.h +++ b/ydb/services/ydb/ydb_table.h @@ -12,7 +12,7 @@ class TGRpcYdbTableService : public NGrpc::TGrpcServiceBase<Ydb::Table::V1::TableService> { public: - TGRpcYdbTableService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcYdbTableService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -26,7 +26,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/yq/grpc_service.cpp b/ydb/services/yq/grpc_service.cpp index 188e39d13b..a7505e18d0 100644 --- a/ydb/services/yq/grpc_service.cpp +++ b/ydb/services/yq/grpc_service.cpp @@ -9,7 +9,7 @@ namespace NKikimr::NGRpcService { TGRpcYandexQueryService::TGRpcYandexQueryService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) {} diff --git a/ydb/services/yq/grpc_service.h b/ydb/services/yq/grpc_service.h index 6cb8d70c64..33a99190a6 100644 --- a/ydb/services/yq/grpc_service.h +++ b/ydb/services/yq/grpc_service.h @@ -13,7 +13,7 @@ class TGRpcYandexQueryService : public NGrpc::TGrpcServiceBase<YandexQuery::V1::YandexQueryService> { public: - TGRpcYandexQueryService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcYandexQueryService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -27,7 +27,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; diff --git a/ydb/services/yq/private_grpc.cpp b/ydb/services/yq/private_grpc.cpp index c4c076b482..da64eddbbb 100644 --- a/ydb/services/yq/private_grpc.cpp +++ b/ydb/services/yq/private_grpc.cpp @@ -9,7 +9,7 @@ namespace NKikimr { namespace NGRpcService { TGRpcYqPrivateTaskService::TGRpcYqPrivateTaskService(NActors::TActorSystem *system, - TIntrusivePtr<NMonitoring::TDynamicCounters> counters, NActors::TActorId id) + TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id) : ActorSystem_(system) , Counters_(counters) , GRpcRequestProxyId_(id) {} diff --git a/ydb/services/yq/private_grpc.h b/ydb/services/yq/private_grpc.h index f5107a7c10..7b81550660 100644 --- a/ydb/services/yq/private_grpc.h +++ b/ydb/services/yq/private_grpc.h @@ -11,7 +11,7 @@ class TGRpcYqPrivateTaskService : public NGrpc::TGrpcServiceBase<Yq::Private::V1::YqPrivateTaskService> { public: - TGRpcYqPrivateTaskService(NActors::TActorSystem* system, TIntrusivePtr<NMonitoring::TDynamicCounters> counters, + TGRpcYqPrivateTaskService(NActors::TActorSystem* system, TIntrusivePtr<::NMonitoring::TDynamicCounters> counters, NActors::TActorId id); void InitService(grpc::ServerCompletionQueue* cq, NGrpc::TLoggerPtr logger) override; @@ -25,7 +25,7 @@ private: NActors::TActorSystem* ActorSystem_; grpc::ServerCompletionQueue* CQ_ = nullptr; - TIntrusivePtr<NMonitoring::TDynamicCounters> Counters_; + TIntrusivePtr<::NMonitoring::TDynamicCounters> Counters_; NActors::TActorId GRpcRequestProxyId_; NGrpc::TGlobalLimiter* Limiter_ = nullptr; }; |