Skip to content

less query id labels #12427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 17, 2024
Merged

less query id labels #12427

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
29668ae
less query id labels
uzhastik Dec 9, 2024
54704d5
fix test
uzhastik Dec 9, 2024
93ca57c
rework query id
uzhastik Dec 10, 2024
c536ea2
rework query id
uzhastik Dec 12, 2024
d89bf3a
fix test
uzhastik Dec 12, 2024
df83916
revert
uzhastik Dec 12, 2024
7b694ea
fix metrics
uzhastik Dec 13, 2024
d07f9a2
rework
uzhastik Dec 17, 2024
894159a
revert tests
uzhastik Dec 17, 2024
f79c162
revert tests
uzhastik Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions ydb/core/fq/libs/actors/pending_fetcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,25 +358,51 @@ class TPendingFetcher : public NActors::TActorBootstrapped<TPendingFetcher> {
const TString folderId = NYdb::NFq::TScope(task.scope()).ParseFolder();
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;
// todo: sanitize query name
TString queryNameLabel = task.query_name();
if (task.automatic()) {
queryIdLabel = isStreaming ? "streaming" : "analytics";
} else if (isStreaming) {
queryIdLabel = queryId;
} else {
queryIdLabel = "manual";
}

::NYql::NCommon::TServiceCounters queryCounters(ServiceCounters);
auto publicCountersParent = ServiceCounters.PublicCounters;

if (cloudId && folderId) {
publicCountersParent = publicCountersParent->GetSubgroup("cloud_id", cloudId)->GetSubgroup("folder_id", folderId);
}
queryCounters.PublicCounters = publicCountersParent->GetSubgroup("query_id",
task.automatic() ? (task.query_name() ? task.query_name() : "automatic") : queryId);

::NMonitoring::TDynamicCounterPtr queryPublicCounters = publicCountersParent;
// use original query id here
queryPublicCounters = queryPublicCounters->GetSubgroup("query_id", queryId);

if (queryNameLabel) {
queryPublicCounters = queryPublicCounters->GetSubgroup("query_name", queryNameLabel);
}
queryCounters.PublicCounters = queryPublicCounters;

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",
task.automatic() ? (folderId ? "automatic_" + folderId : "automatic") : queryId);
queryCounters.Counters = queryCounters.RootCounters;
::NMonitoring::TDynamicCounterPtr queryRootCounters = rootCountersParent;
if (queryIdLabel) {
queryRootCounters = queryRootCounters->GetSubgroup("query_id", queryIdLabel);
}

if (!task.automatic() && isStreaming && queryNameLabel) {
queryRootCounters = queryRootCounters->GetSubgroup("query_name", queryNameLabel);
}

queryCounters.RootCounters = queryRootCounters;
queryCounters.Counters = queryRootCounters;

queryCounters.InitUptimeCounter();
const auto createdAt = TInstant::Now();
Expand Down
Loading