rework query id

Author: uzhastik

ydb/core/fq/libs/actors/pending_fetcher.cpp

@@ -359,15 +359,17 @@ class TPendingFetcher : public NActors::TActorBootstrapped<TPendingFetcher> {
         const TString cloudId = task.sensor_labels().at("cloud_id");
         const TString queryId = task.query_id().value();
         const bool isStreaming = task.query_type() == FederatedQuery::QueryContent::STREAMING;
-        TString queryIdLabel = queryId;
+        TString queryIdLabel;
+        TString queryNameLabel;
         if (task.automatic()) {
-            queryIdLabel = isStreaming ? "streaming" : "automatic";
+            queryIdLabel = isStreaming ? "streaming" : "analytics";
         } else {
-            if (!isStreaming) {
-                queryIdLabel = "analytics";
-            } else if (task.query_name()) {
+            if (isStreaming) {
                 // todo: sanitize query name
-                queryIdLabel = task.query_name();
+                queryNameLabel = task.query_name();
+                queryIdLabel = queryId;
+            } else {
+                queryIdLabel = "manual";
             }
         }
 
@@ -377,15 +379,31 @@ class TPendingFetcher : public NActors::TActorBootstrapped<TPendingFetcher> {
         if (cloudId && folderId) {
             publicCountersParent = publicCountersParent->GetSubgroup("cloud_id", cloudId)->GetSubgroup("folder_id", folderId);
         }
-        queryCounters.PublicCounters = publicCountersParent->GetSubgroup("query_id", queryIdLabel);
+
+        if (queryIdLabel) {
+            publicCountersParent = publicCountersParent->GetSubgroup("query_id", queryIdLabel);
+        }
+
+        if (queryNameLabel) {
+            publicCountersParent = publicCountersParent->GetSubgroup("query_name", queryNameLabel);
+        }
+        queryCounters.PublicCounters = publicCountersParent;
 
         auto rootCountersParent = ServiceCounters.RootCounters;
         std::set<std::pair<TString, TString>> sensorLabels(task.sensor_labels().begin(), task.sensor_labels().end());
         for (const auto& [label, item]: sensorLabels) {
             rootCountersParent = rootCountersParent->GetSubgroup(label, item);
         }
 
-        queryCounters.RootCounters = rootCountersParent->GetSubgroup("query_id", queryIdLabel);
+        if (queryIdLabel) {
+            rootCountersParent = rootCountersParent->GetSubgroup("query_id", queryIdLabel);
+        }
+
+        if (queryNameLabel) {
+            rootCountersParent = rootCountersParent->GetSubgroup("query_name", queryNameLabel);
+        }
+
+        queryCounters.RootCounters = rootCountersParent;
         queryCounters.Counters = queryCounters.RootCounters;
 
         queryCounters.InitUptimeCounter();

ydb/tests/fq/s3/test_public_metrics.py

@@ -56,7 +56,7 @@ def test_public_metrics(self, kikimr, s3, client, yq_version, unique_prefix):
         )
         logging.debug(str(metrics))
 
-        query_id_label = "analytics"
+        query_id_label = "manual"
         assert (
             metrics.find_sensor(
                 {"cloud_id": cloud_id, "folder_id": folder_id, "query_id": query_id_label, "name": "query.running_tasks"}