From 25b1d1f513a53d3e18591762749a0676187bf7fe Mon Sep 17 00:00:00 2001 From: qicosmos Date: Tue, 30 Jul 2024 17:55:47 +0800 Subject: [PATCH] related update --- .../standalone/cinatra/coro_http_server.hpp | 14 +++---- .../ylt/standalone/cinatra/metric_conf.hpp | 40 +++++++++++-------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/include/ylt/standalone/cinatra/coro_http_server.hpp b/include/ylt/standalone/cinatra/coro_http_server.hpp index bbdfbead1..95b846124 100644 --- a/include/ylt/standalone/cinatra/coro_http_server.hpp +++ b/include/ylt/standalone/cinatra/coro_http_server.hpp @@ -928,20 +928,20 @@ class coro_http_server { using namespace ylt::metric; cinatra_metric_conf::enable_metric = true; - default_metric_manager::create_metric_static( + default_metric_manager::instance().create_metric_static( cinatra_metric_conf::server_total_req, ""); - default_metric_manager::create_metric_static( + default_metric_manager::instance().create_metric_static( cinatra_metric_conf::server_failed_req, ""); - default_metric_manager::create_metric_static( + default_metric_manager::instance().create_metric_static( cinatra_metric_conf::server_total_recv_bytes, ""); - default_metric_manager::create_metric_static( + default_metric_manager::instance().create_metric_static( cinatra_metric_conf::server_total_send_bytes, ""); - default_metric_manager::create_metric_static( + default_metric_manager::instance().create_metric_static( cinatra_metric_conf::server_total_fd, ""); - default_metric_manager::create_metric_static( + default_metric_manager::instance().create_metric_static( cinatra_metric_conf::server_req_latency, "", std::vector{30, 40, 50, 60, 70, 80, 90, 100, 150}); - default_metric_manager::create_metric_static( + default_metric_manager::instance().create_metric_static( cinatra_metric_conf::server_read_latency, "", std::vector{3, 5, 7, 9, 13, 18, 23, 35, 50}); #if defined(__GNUC__) diff --git a/include/ylt/standalone/cinatra/metric_conf.hpp b/include/ylt/standalone/cinatra/metric_conf.hpp index 4800481ad..1c0bc2015 100644 --- a/include/ylt/standalone/cinatra/metric_conf.hpp +++ b/include/ylt/standalone/cinatra/metric_conf.hpp @@ -25,8 +25,9 @@ struct cinatra_metric_conf { return; } - static auto m = ylt::metric::default_metric_manager::get_metric_static< - ylt::metric::counter_t>(server_total_req); + static auto m = + ylt::metric::default_metric_manager::instance() + .get_metric_static(server_total_req); if (m == nullptr) { return; } @@ -37,8 +38,9 @@ struct cinatra_metric_conf { if (!enable_metric) { return; } - static auto m = ylt::metric::default_metric_manager::get_metric_static< - ylt::metric::counter_t>(server_failed_req); + static auto m = + ylt::metric::default_metric_manager::instance() + .get_metric_static(server_failed_req); if (m == nullptr) { return; } @@ -49,8 +51,9 @@ struct cinatra_metric_conf { if (!enable_metric) { return; } - static auto m = ylt::metric::default_metric_manager::get_metric_static< - ylt::metric::gauge_t>(server_total_fd); + static auto m = + ylt::metric::default_metric_manager::instance() + .get_metric_static(server_total_fd); if (m == nullptr) { return; } @@ -61,8 +64,9 @@ struct cinatra_metric_conf { if (!enable_metric) { return; } - static auto m = ylt::metric::default_metric_manager::get_metric_static< - ylt::metric::gauge_t>(server_total_fd); + static auto m = + ylt::metric::default_metric_manager::instance() + .get_metric_static(server_total_fd); if (m == nullptr) { return; } @@ -73,8 +77,9 @@ struct cinatra_metric_conf { if (!enable_metric) { return; } - static auto m = ylt::metric::default_metric_manager::get_metric_static< - ylt::metric::counter_t>(server_total_recv_bytes); + static auto m = + ylt::metric::default_metric_manager::instance() + .get_metric_static(server_total_recv_bytes); if (m == nullptr) { return; } @@ -85,8 +90,9 @@ struct cinatra_metric_conf { if (!enable_metric) { return; } - static auto m = ylt::metric::default_metric_manager::get_metric_static< - ylt::metric::counter_t>(server_total_send_bytes); + static auto m = + ylt::metric::default_metric_manager::instance() + .get_metric_static(server_total_send_bytes); if (m == nullptr) { return; } @@ -97,8 +103,9 @@ struct cinatra_metric_conf { if (!enable_metric) { return; } - static auto m = ylt::metric::default_metric_manager::get_metric_static< - ylt::metric::histogram_t>(server_req_latency); + static auto m = + ylt::metric::default_metric_manager::instance() + .get_metric_static(server_req_latency); if (m == nullptr) { return; } @@ -109,8 +116,9 @@ struct cinatra_metric_conf { if (!enable_metric) { return; } - static auto m = ylt::metric::default_metric_manager::get_metric_static< - ylt::metric::histogram_t>(server_read_latency); + static auto m = + ylt::metric::default_metric_manager::instance() + .get_metric_static(server_read_latency); if (m == nullptr) { return; }