Skip to content

admin: optimize prometheus format stat endopint. #18124

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
jmarantz merged 2 commits into from
Sep 15, 2021
Merged

admin: optimize prometheus format stat endopint. #18124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ee817b
admin: optimize prometheus format endopint.
mathetake Sep 15, 2021
1f25732
format_value can be const.
mathetake Sep 15, 2021
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
10 changes: 5 additions & 5 deletions source/server/admin/stats_handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ Http::Code StatsHandler::handlerStats(absl::string_view url,
return Http::Code::BadRequest;
}

const absl::optional<std::string> format_value = Utility::formatParam(params);
if (format_value.has_value() && format_value.value() == "prometheus") {
return handlerPrometheusStats(url, response_headers, response, admin_stream);
}

std::map<std::string, uint64_t> all_stats;
for (const Stats::CounterSharedPtr& counter : server_.stats().counters()) {
if (shouldShowMetric(*counter, used_only, regex)) {
Expand All @@ -103,7 +108,6 @@ Http::Code StatsHandler::handlerStats(absl::string_view url,
}
}

absl::optional<std::string> format_value = Utility::formatParam(params);
if (!format_value.has_value()) {
// Display plain stats if format query param is not there.
statsAsText(all_stats, text_readouts, server_.stats().histograms(), used_only, regex, response);
Expand All @@ -117,10 +121,6 @@ Http::Code StatsHandler::handlerStats(absl::string_view url,
return Http::Code::OK;
}

if (format_value.value() == "prometheus") {
return handlerPrometheusStats(url, response_headers, response, admin_stream);
}

response.add("usage: /stats?format=json or /stats?format=prometheus \n");
response.add("\n");
return Http::Code::NotFound;
Expand Down