Remove Fetcher to AppData dependency

4 files changed, 18 insertions, 12 deletions

diff --git a/ydb/core/yq/libs/actors/pending_fetcher.cpp b/ydb/core/yq/libs/actors/pending_fetcher.cpp
index 81956d6871..8ff7282c27 100644
--- a/ydb/core/yq/libs/actors/pending_fetcher.cpp
+++ b/ydb/core/yq/libs/actors/pending_fetcher.cpp
@@ -10,7 +10,6 @@
 #include <library/cpp/actors/core/actor_bootstrapped.h>
 #include <library/cpp/protobuf/interop/cast.h>
 
-#include <ydb/core/base/appdata.h>
 #include <ydb/core/mon/mon.h>
 #include <ydb/core/protos/services.pb.h>
 
@@ -134,7 +133,8 @@ public:
         IHTTPGateway::TPtr s3Gateway,
         ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections,
         const ::NMonitoring::TDynamicCounterPtr& clientCounters,
-        const TString& tenantName
+        const TString& tenantName,
+        NActors::TMon* monitoring
         )
         : YqSharedResources(yqSharedResources)
         , CredentialsProviderFactory(credentialsProviderFactory)
@@ -156,6 +156,7 @@ public:
         , ClientCounters(clientCounters)
         , TenantName(tenantName)
         , InternalServiceId(MakeInternalServiceActorId())
+        , Monitoring(monitoring)
     {
         Y_ENSURE(GetYqlDefaultModuleResolverWithContext(ModuleResolver));
     }
@@ -170,11 +171,9 @@ public:
 
     void Bootstrap() {
 
-        NActors::TMon* mon = NKikimr::AppData()->Mon;
-        if (mon) {
-            NMonitoring::TIndexMonPage* actorsMonPage = mon->RegisterIndexPage("fq", "Federated Query");
-            mon->RegisterActorPage(actorsMonPage, "fetcher", "Pending Fetcher", false,
-                TActivationContext::ActorSystem(), SelfId());
+        if (Monitoring) {
+            Monitoring->RegisterActorPage(Monitoring->RegisterIndexPage("fq", "Federated Query"), 
+                "fetcher", "Pending Fetcher", false, TActivationContext::ActorSystem(), SelfId());
         }
         
         Become(&TPendingFetcher::StateFunc);
@@ -462,6 +461,7 @@ private:
     TMap<TActorId, TRunActorInfo> RunActorMap;
     TString TenantName;
     TActorId InternalServiceId;
+    NActors::TMon* Monitoring;
 };
 
 
@@ -483,7 +483,8 @@ NActors::IActor* CreatePendingFetcher(
     IHTTPGateway::TPtr s3Gateway,
     ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections,
     const ::NMonitoring::TDynamicCounterPtr& clientCounters,
-    const TString& tenantName)
+    const TString& tenantName,
+    NActors::TMon* monitoring)
 {
     return new TPendingFetcher(
         yqSharedResources,
@@ -503,7 +504,8 @@ NActors::IActor* CreatePendingFetcher(
         s3Gateway,
         std::move(pqCmConnections),
         clientCounters,
-        tenantName);
+        tenantName,
+        monitoring);
 }
 
 TActorId MakePendingFetcherId(ui32 nodeId) {
diff --git a/ydb/core/yq/libs/actors/proxy.h b/ydb/core/yq/libs/actors/proxy.h
index 8a65a9c987..8a1bf61e78 100644
--- a/ydb/core/yq/libs/actors/proxy.h
+++ b/ydb/core/yq/libs/actors/proxy.h
@@ -3,6 +3,8 @@
 #include "run_actor_params.h"
 #include <util/datetime/base.h>
 
+#include <ydb/core/mon/mon.h>
+
 #include <ydb/core/yq/libs/events/events.h>
 #include <ydb/core/yq/libs/private_client/private_client.h>
 #include <ydb/core/yq/libs/shared_resources/db_pool.h>
@@ -51,7 +53,8 @@ NActors::IActor* CreatePendingFetcher(
     NYql::IHTTPGateway::TPtr s3Gateway,
     ::NPq::NConfigurationManager::IConnections::TPtr pqCmConnections,
     const ::NMonitoring::TDynamicCounterPtr& clientCounters,
-    const TString& tenantName
+    const TString& tenantName,
+    NActors::TMon* monitoring
     );
 
 NActors::IActor* CreateRunActor(
diff --git a/ydb/core/yq/libs/actors/run_actor.cpp b/ydb/core/yq/libs/actors/run_actor.cpp
index cccc6148fa..87fb96282f 100644
--- a/ydb/core/yq/libs/actors/run_actor.cpp
+++ b/ydb/core/yq/libs/actors/run_actor.cpp
@@ -1750,7 +1750,7 @@ private:
                 html << "<td>";
                 if (EvaluationInProgress) html << "EVAL";
                 else html << DqGraphIndex << " of " << DqGraphParams.size();
-                html << "<td>";
+                html << "</td>";
                 html << "<td>" << ExecuterId << "</td>";
                 html << "<td>" << ControlId << "</td>";
                 html << "<td>" << CheckpointCoordinatorId << "</td>";
diff --git a/ydb/core/yq/libs/init/init.cpp b/ydb/core/yq/libs/init/init.cpp
index 051f38a775..7f363212d7 100644
--- a/ydb/core/yq/libs/init/init.cpp
+++ b/ydb/core/yq/libs/init/init.cpp
@@ -268,7 +268,8 @@ void Init(
             httpGateway,
             std::move(pqCmConnections),
             clientCounters,
-            tenant
+            tenant,
+            appData->Mon
             );
 
         actorRegistrator(MakePendingFetcherId(nodeId), fetcher);