From f0760c1e0bce673c76ad2f5a23122bff410cc84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=B3=E6=80=9D=E6=BE=9C?= Date: Fri, 15 Oct 2021 19:01:38 +0800 Subject: [PATCH] fix coredump when table name contains '_' and prometheus is enabled --- src/reporter/pegasus_counter_reporter.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/reporter/pegasus_counter_reporter.cpp b/src/reporter/pegasus_counter_reporter.cpp index f3a823167d..8776d4a540 100644 --- a/src/reporter/pegasus_counter_reporter.cpp +++ b/src/reporter/pegasus_counter_reporter.cpp @@ -234,22 +234,18 @@ void pegasus_counter_reporter::update() const dsn::perf_counters::counter_snapshot &cs) { std::string metrics_name = cs.name; - // prometheus metric_name don't support characters like .*()@, it only support ":" - // and "_" - // so change the name to make it all right - format_metrics_name(metrics_name); - - // split metric_name like "collector_app_pegasus_app_stat_multi_put_qps:1_0_p999" or - // "collector_app_pegasus_app_stat_multi_put_qps:1_0" + // split metric_name like "collector*app.pegasus*app_stat_multi_put_qps@1.0.p999" or + // "collector*app.pegasus*app_stat_multi_put_qps@1.0" // app[0] = "1" which is the app(app name or app id) // app[1] = "0" which is the partition_index // app[2] = "p999" or "" which represent the percent std::string app[3] = {"", "", ""}; std::list lv; - ::dsn::utils::split_args(metrics_name.c_str(), lv, ':'); + ::dsn::utils::split_args(metrics_name.c_str(), lv, '@'); if (lv.size() > 1) { std::list lv1; - ::dsn::utils::split_args(lv.back().c_str(), lv1, '_'); + ::dsn::utils::split_args(lv.back().c_str(), lv1, '.'); + dcheck_le(lv1.size(), 3); int i = 0; for (auto &v : lv1) { app[i] = v; @@ -268,6 +264,13 @@ void pegasus_counter_reporter::update() // create metrics that prometheus support to report data metrics_name = lv.front() + app[2]; + + // prometheus metric_name don't support characters like .*()@, it only support ":" + // and "_" + // so change the name to make it all right + format_metrics_name(metrics_name); + + std::map *>::iterator it = _gauge_family_map.find(metrics_name); if (it == _gauge_family_map.end()) {