related update

alibaba · Jul 30, 2024 · 25b1d1f · 25b1d1f
1 parent b12bc6b
commit 25b1d1f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git 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<counter_t>(
+    default_metric_manager::instance().create_metric_static<counter_t>(
         cinatra_metric_conf::server_total_req, "");
-    default_metric_manager::create_metric_static<counter_t>(
+    default_metric_manager::instance().create_metric_static<counter_t>(
         cinatra_metric_conf::server_failed_req, "");
-    default_metric_manager::create_metric_static<counter_t>(
+    default_metric_manager::instance().create_metric_static<counter_t>(
         cinatra_metric_conf::server_total_recv_bytes, "");
-    default_metric_manager::create_metric_static<counter_t>(
+    default_metric_manager::instance().create_metric_static<counter_t>(
         cinatra_metric_conf::server_total_send_bytes, "");
-    default_metric_manager::create_metric_static<gauge_t>(
+    default_metric_manager::instance().create_metric_static<gauge_t>(
         cinatra_metric_conf::server_total_fd, "");
-    default_metric_manager::create_metric_static<histogram_t>(
+    default_metric_manager::instance().create_metric_static<histogram_t>(
         cinatra_metric_conf::server_req_latency, "",
         std::vector<double>{30, 40, 50, 60, 70, 80, 90, 100, 150});
-    default_metric_manager::create_metric_static<histogram_t>(
+    default_metric_manager::instance().create_metric_static<histogram_t>(
         cinatra_metric_conf::server_read_latency, "",
         std::vector<double>{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
@@ -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<ylt::metric::counter_t>(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<ylt::metric::counter_t>(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<ylt::metric::gauge_t>(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<ylt::metric::gauge_t>(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<ylt::metric::counter_t>(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<ylt::metric::counter_t>(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<ylt::metric::histogram_t>(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<ylt::metric::histogram_t>(server_read_latency);
     if (m == nullptr) {
       return;
     }