Refactoring: NYq::NCommon::TServiceCounters -> NYql::NCommon::TServiceCounters

::NYq::NCommon::TServiceCounters -> ::NYql::NCommon::TServiceCounters

ref:a0834e5ccd4139183520676615bdbf45b30f0bc0

12 files changed, 25 insertions, 25 deletions

diff --git a/ydb/core/yq/libs/actors/nodes_manager.cpp b/ydb/core/yq/libs/actors/nodes_manager.cpp
index ee885ab18d9..30c1a013434 100644
--- a/ydb/core/yq/libs/actors/nodes_manager.cpp
+++ b/ydb/core/yq/libs/actors/nodes_manager.cpp
@@ -57,7 +57,7 @@ public:
         const NDqs::TWorkerManagerCounters& workerManagerCounters,
         TIntrusivePtr<ITimeProvider> timeProvider,
         TIntrusivePtr<IRandomProvider> randomProvider,
-        const ::NYq::NCommon::TServiceCounters& serviceCounters,
+        const ::NYql::NCommon::TServiceCounters& serviceCounters,
         const NConfig::TPrivateApiConfig& privateApiConfig,
         const ui32& icPort,
         const TString& tenant,
@@ -255,7 +255,7 @@ private:
     NDqs::TWorkerManagerCounters WorkerManagerCounters;
     TIntrusivePtr<ITimeProvider> TimeProvider;
     TIntrusivePtr<IRandomProvider> RandomProvider;
-    ::NYq::NCommon::TServiceCounters ServiceCounters;
+    ::NYql::NCommon::TServiceCounters ServiceCounters;
     NConfig::TPrivateApiConfig PrivateApiConfig;
     TString Tenant;
     ui64 MkqlInitialMemoryLimit;
@@ -293,7 +293,7 @@ IActor* CreateYqlNodesManager(
     const NDqs::TWorkerManagerCounters& workerManagerCounters,
     TIntrusivePtr<ITimeProvider> timeProvider,
     TIntrusivePtr<IRandomProvider> randomProvider,
-    const ::NYq::NCommon::TServiceCounters& serviceCounters,
+    const ::NYql::NCommon::TServiceCounters& serviceCounters,
     const NConfig::TPrivateApiConfig& privateApiConfig,
     const NYq::TYqSharedResources::TPtr& yqSharedResources,
     const ui32& icPort,
diff --git a/ydb/core/yq/libs/actors/nodes_manager.h b/ydb/core/yq/libs/actors/nodes_manager.h
index 55a1d2300fe..9cb78fe1220 100644
--- a/ydb/core/yq/libs/actors/nodes_manager.h
+++ b/ydb/core/yq/libs/actors/nodes_manager.h
@@ -25,7 +25,7 @@ IActor* CreateYqlNodesManager(
     const NYql::NDqs::TWorkerManagerCounters& workerManagerCounters,
     TIntrusivePtr<ITimeProvider> timeProvider,
     TIntrusivePtr<IRandomProvider> randomProvider,
-    const ::NYq::NCommon::TServiceCounters& serviceCounters,
+    const ::NYql::NCommon::TServiceCounters& serviceCounters,
     const NConfig::TPrivateApiConfig& privateApiConfig,
     const NYq::TYqSharedResources::TPtr& yqSharedResources,
     const ui32& icPort,
diff --git a/ydb/core/yq/libs/actors/pending_fetcher.cpp b/ydb/core/yq/libs/actors/pending_fetcher.cpp
index e1d10e47107..9c40cd890f1 100644
--- a/ydb/core/yq/libs/actors/pending_fetcher.cpp
+++ b/ydb/core/yq/libs/actors/pending_fetcher.cpp
@@ -136,7 +136,7 @@ public:
         TIntrusivePtr<ITimeProvider> timeProvider,
         TIntrusivePtr<IRandomProvider> randomProvider,
         NKikimr::NMiniKQL::TComputationNodeFactory dqCompFactory,
-        const ::NYq::NCommon::TServiceCounters& serviceCounters,
+        const ::NYql::NCommon::TServiceCounters& serviceCounters,
         ISecuredServiceAccountCredentialsFactory::TPtr credentialsFactory,
         IHTTPGateway::TPtr s3Gateway,
         ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections,
@@ -318,7 +318,7 @@ private:
         const TString cloudId = task.sensor_labels().at("cloud_id");
         const TString queryId = task.query_id().value();
 
-        ::NYq::NCommon::TServiceCounters queryCounters(ServiceCounters);
+        ::NYql::NCommon::TServiceCounters queryCounters(ServiceCounters);
         auto publicCountersParent = ServiceCounters.PublicCounters;
 
         if (cloudId && folderId) {
@@ -395,7 +395,7 @@ private:
     TIntrusivePtr<IRandomProvider> RandomProvider;
     NKikimr::NMiniKQL::TComputationNodeFactory DqCompFactory;
     TIntrusivePtr<IDqGateway> DqGateway;
-    ::NYq::NCommon::TServiceCounters ServiceCounters;
+    ::NYql::NCommon::TServiceCounters ServiceCounters;
 
     IModuleResolver::TPtr ModuleResolver;
 
@@ -437,7 +437,7 @@ NActors::IActor* CreatePendingFetcher(
     TIntrusivePtr<ITimeProvider> timeProvider,
     TIntrusivePtr<IRandomProvider> randomProvider,
     NKikimr::NMiniKQL::TComputationNodeFactory dqCompFactory,
-    const ::NYq::NCommon::TServiceCounters& serviceCounters,
+    const ::NYql::NCommon::TServiceCounters& serviceCounters,
     ISecuredServiceAccountCredentialsFactory::TPtr credentialsFactory,
     IHTTPGateway::TPtr s3Gateway,
     ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections,
diff --git a/ydb/core/yq/libs/actors/pinger.cpp b/ydb/core/yq/libs/actors/pinger.cpp
index 0d024cdfd7b..b31b4374a20 100644
--- a/ydb/core/yq/libs/actors/pinger.cpp
+++ b/ydb/core/yq/libs/actors/pinger.cpp
@@ -151,7 +151,7 @@ public:
         const TActorId parent,
         const NConfig::TPingerConfig& config,
         TInstant deadline,
-        const ::NYq::NCommon::TServiceCounters& queryCounters,
+        const ::NYql::NCommon::TServiceCounters& queryCounters,
         TInstant createdAt)
         : Config(config)
         , TenantName(tenantName)
@@ -435,7 +435,7 @@ private:
     const TActorId Parent;
     const TInstant Deadline;
 
-    const ::NYq::NCommon::TServiceCounters QueryCounters;
+    const ::NYql::NCommon::TServiceCounters QueryCounters;
     const TInstant CreatedAt;
 
     std::deque<TForwardPingReqInfo> ForwardRequests;
@@ -455,7 +455,7 @@ IActor* CreatePingerActor(
     const TActorId parent,
     const NConfig::TPingerConfig& config,
     TInstant deadline,
-    const ::NYq::NCommon::TServiceCounters& queryCounters,
+    const ::NYql::NCommon::TServiceCounters& queryCounters,
     TInstant createdAt)
 {
     return new TPingerActor(
diff --git a/ydb/core/yq/libs/actors/proxy.h b/ydb/core/yq/libs/actors/proxy.h
index f355e42c241..3870d695383 100644
--- a/ydb/core/yq/libs/actors/proxy.h
+++ b/ydb/core/yq/libs/actors/proxy.h
@@ -44,7 +44,7 @@ NActors::IActor* CreatePendingFetcher(
     TIntrusivePtr<ITimeProvider> timeProvider,
     TIntrusivePtr<IRandomProvider> randomProvider,
     NKikimr::NMiniKQL::TComputationNodeFactory dqCompFactory,
-    const ::NYq::NCommon::TServiceCounters& serviceCounters,
+    const ::NYql::NCommon::TServiceCounters& serviceCounters,
     NYql::ISecuredServiceAccountCredentialsFactory::TPtr credentialsFactory,
     NYql::IHTTPGateway::TPtr s3Gateway,
     ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections,
@@ -54,7 +54,7 @@ NActors::IActor* CreatePendingFetcher(
 
 NActors::IActor* CreateRunActor(
     const NActors::TActorId& fetcherId,
-    const ::NYq::NCommon::TServiceCounters& serviceCounters,
+    const ::NYql::NCommon::TServiceCounters& serviceCounters,
     TRunActorParams&& params);
 
 struct TResultId {
@@ -87,7 +87,7 @@ NActors::IActor* CreatePingerActor(
     const NActors::TActorId parent,
     const NConfig::TPingerConfig& config,
     TInstant deadline,
-    const ::NYq::NCommon::TServiceCounters& queryCounters,
+    const ::NYql::NCommon::TServiceCounters& queryCounters,
     TInstant createdAt);
 
 TString MakeInternalError(const TString& text);
diff --git a/ydb/core/yq/libs/actors/run_actor.cpp b/ydb/core/yq/libs/actors/run_actor.cpp
index 542cc443a5d..70804af0e9d 100644
--- a/ydb/core/yq/libs/actors/run_actor.cpp
+++ b/ydb/core/yq/libs/actors/run_actor.cpp
@@ -87,7 +87,7 @@ class TRunActor : public NActors::TActorBootstrapped<TRunActor> {
 public:
     explicit TRunActor(
         const NActors::TActorId& fetcherId
-        , const ::NYq::NCommon::TServiceCounters& queryCounters
+        , const ::NYql::NCommon::TServiceCounters& queryCounters
         , TRunActorParams&& params)
         : FetcherId(fetcherId)
         , Params(std::move(params))
@@ -1292,7 +1292,7 @@ private:
     NActors::TActorId ControlId;
     NActors::TActorId CheckpointCoordinatorId;
     TString SessionId;
-    ::NYq::NCommon::TServiceCounters QueryCounters;
+    ::NYql::NCommon::TServiceCounters QueryCounters;
     const NMonitoring::TDynamicCounters::TCounterPtr QueryUptime;
     bool EnableCheckpointCoordinator = false;
     bool RetryNeeded = false;
@@ -1326,7 +1326,7 @@ private:
 
 IActor* CreateRunActor(
     const NActors::TActorId& fetcherId,
-    const ::NYq::NCommon::TServiceCounters& serviceCounters,
+    const ::NYql::NCommon::TServiceCounters& serviceCounters,
     TRunActorParams&& params
 ) {
     return new TRunActor(fetcherId, serviceCounters, std::move(params));
diff --git a/ydb/core/yq/libs/init/init.cpp b/ydb/core/yq/libs/init/init.cpp
index 846b5a1bc2b..22149a78659 100644
--- a/ydb/core/yq/libs/init/init.cpp
+++ b/ydb/core/yq/libs/init/init.cpp
@@ -168,7 +168,7 @@ void Init(
         actorRegistrator(NYql::NDqs::MakeWorkerManagerActorID(nodeId), resman);
     }
 
-    ::NYq::NCommon::TServiceCounters serviceCounters(appData->Counters);
+    ::NYql::NCommon::TServiceCounters serviceCounters(appData->Counters);
 
     if (protoConfig.GetNodesManager().GetEnabled()) {
         auto nodesManager = CreateYqlNodesManager(
diff --git a/ydb/library/yql/providers/common/metrics/service_counters.cpp b/ydb/library/yql/providers/common/metrics/service_counters.cpp
index 346fdcd8640..b7cba1c4b32 100644
--- a/ydb/library/yql/providers/common/metrics/service_counters.cpp
+++ b/ydb/library/yql/providers/common/metrics/service_counters.cpp
@@ -1,6 +1,6 @@
 #include "service_counters.h"
 
-namespace NYq {
+namespace NYql {
 namespace NCommon {
 
 TServiceCounters::TServiceCounters(
diff --git a/ydb/library/yql/providers/common/metrics/service_counters.h b/ydb/library/yql/providers/common/metrics/service_counters.h
index 47a7d280854..05685daf85a 100644
--- a/ydb/library/yql/providers/common/metrics/service_counters.h
+++ b/ydb/library/yql/providers/common/metrics/service_counters.h
@@ -3,7 +3,7 @@
 #include <util/generic/string.h>
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
-namespace NYq {
+namespace NYql {
 namespace NCommon {
 
 struct TServiceCounters {
diff --git a/ydb/library/yql/providers/dq/actors/task_controller.cpp b/ydb/library/yql/providers/dq/actors/task_controller.cpp
index 136d956f162..8a8d63ffaac 100644
--- a/ydb/library/yql/providers/dq/actors/task_controller.cpp
+++ b/ydb/library/yql/providers/dq/actors/task_controller.cpp
@@ -50,7 +50,7 @@ public:
         const NActors::TActorId& executerId,
         const NActors::TActorId& resultId,
         const TDqConfiguration::TPtr& settings,
-        const NYq::NCommon::TServiceCounters& serviceCounters,
+        const NYql::NCommon::TServiceCounters& serviceCounters,
         const TDuration& pingPeriod,
         const TDuration& aggrPeriod
     )
@@ -548,7 +548,7 @@ private:
     TDqConfiguration::TPtr Settings;
     bool Finished = false;
     TCounters TaskStat;
-    NYq::NCommon::TServiceCounters ServiceCounters;
+    NYql::NCommon::TServiceCounters ServiceCounters;
     TDuration PingPeriod = TDuration::Zero();
     TDuration AggrPeriod = TDuration::Zero();
     TIssues Issues;
@@ -562,7 +562,7 @@ THolder<NActors::IActor> MakeTaskController(
     const NActors::TActorId& executerId,
     const NActors::TActorId& resultId,
     const TDqConfiguration::TPtr& settings,
-    const NYq::NCommon::TServiceCounters& serviceCounters,
+    const NYql::NCommon::TServiceCounters& serviceCounters,
     const TDuration& pingPeriod,
     const TDuration& aggrPeriod
 ) {
diff --git a/ydb/library/yql/providers/dq/actors/task_controller.h b/ydb/library/yql/providers/dq/actors/task_controller.h
index b5eff5ccd7b..cbf87246cb9 100644
--- a/ydb/library/yql/providers/dq/actors/task_controller.h
+++ b/ydb/library/yql/providers/dq/actors/task_controller.h
@@ -13,7 +13,7 @@ THolder<NActors::IActor> MakeTaskController(
     const NActors::TActorId& executerId,
     const NActors::TActorId& resultId,
     const TDqConfiguration::TPtr& settings,
-    const ::NYq::NCommon::TServiceCounters& serviceCounters,
+    const ::NYql::NCommon::TServiceCounters& serviceCounters,
     const TDuration& pingPeriod = TDuration::Zero(),
     const TDuration& aggrPeriod = TDuration::Seconds(1));
 
diff --git a/ydb/library/yql/providers/dq/service/grpc_service.cpp b/ydb/library/yql/providers/dq/service/grpc_service.cpp
index 65a9e500d9d..b10537591cc 100644
--- a/ydb/library/yql/providers/dq/service/grpc_service.cpp
+++ b/ydb/library/yql/providers/dq/service/grpc_service.cpp
@@ -389,7 +389,7 @@ namespace NYql::NDqs {
                     Request->GetDiscard(),
                     GraphExecutionEventsActorId).Release());
                 auto controlId = Settings->EnableComputeActor.Get().GetOrElse(false) == false ? resultId
-                    :  RegisterChild(NYql::MakeTaskController(TraceId, executerId, resultId, Settings, NYq::NCommon::TServiceCounters(Counters, nullptr, "")).Release());
+                    :  RegisterChild(NYql::MakeTaskController(TraceId, executerId, resultId, Settings, NYql::NCommon::TServiceCounters(Counters, nullptr, "")).Release());
                 Send(executerId, MakeHolder<TEvGraphRequest>(
                     *Request,
                     controlId,