remove metric

Author: qicosmos

include/ylt/standalone/cinatra/coro_http_connection.hpp

@@ -21,14 +21,9 @@
 #include "sha1.hpp"
 #include "string_resize.hpp"
 #include "websocket.hpp"
-#include "ylt/metric/counter.hpp"
-#include "ylt/metric/gauge.hpp"
-#include "ylt/metric/histogram.hpp"
-#include "ylt/metric/metric.hpp"
 #ifdef CINATRA_ENABLE_GZIP
 #include "gzip.hpp"
 #endif
-#include "metric_conf.hpp"
 #include "ylt/coro_io/coro_file.hpp"
 #include "ylt/coro_io/coro_io.hpp"
 
@@ -52,14 +47,9 @@ class coro_http_connection
         request_(parser_, this),
         response_(this) {
     buffers_.reserve(3);
-
-    cinatra_metric_conf::server_total_fd_inc();
   }
 
-  ~coro_http_connection() {
-    cinatra_metric_conf::server_total_fd_dec();
-    close();
-  }
+  ~coro_http_connection() { close(); }
 
 #ifdef CINATRA_ENABLE_SSL
   bool init_ssl(const std::string &cert_file, const std::string &key_file,
@@ -126,20 +116,13 @@ class coro_http_connection
           CINATRA_LOG_WARNING << "read http header error: " << ec.message();
         }
 
-        cinatra_metric_conf::server_failed_req_inc();
         close();
         break;
       }
 
-      if (cinatra_metric_conf::enable_metric) {
-        start = std::chrono::system_clock::now();
-        cinatra_metric_conf::server_total_req_inc();
-      }
-
       const char *data_ptr = asio::buffer_cast<const char *>(head_buf_.data());
       int head_len = parser_.parse_request(data_ptr, size, 0);
       if (head_len <= 0) {
-        cinatra_metric_conf::server_failed_req_inc();
         CINATRA_LOG_ERROR << "parse http header error";
         close();
         break;
@@ -153,9 +136,6 @@ class coro_http_connection
       if (type != content_type::chunked && type != content_type::multipart) {
         size_t body_len = parser_.body_len();
         if (body_len == 0) {
-          if (cinatra_metric_conf::enable_metric) {
-            cinatra_metric_conf::server_total_recv_bytes_inc(head_len);
-          }
           if (parser_.method() == "GET"sv) {
             if (request_.is_upgrade()) {
 #ifdef CINATRA_ENABLE_GZIP
@@ -175,16 +155,6 @@ class coro_http_connection
               }
               response_.set_delay(true);
             }
-            else {
-              if (cinatra_metric_conf::enable_metric) {
-                mid = std::chrono::system_clock::now();
-                double count =
-                    std::chrono::duration_cast<std::chrono::microseconds>(mid -
-                                                                          start)
-                        .count();
-                cinatra_metric_conf::server_read_latency_observe(count);
-              }
-            }
           }
         }
         else if (body_len <= head_buf_.size()) {
@@ -194,7 +164,6 @@ class coro_http_connection
             memcpy(body_.data(), data_ptr, body_len);
             head_buf_.consume(head_buf_.size());
           }
-          cinatra_metric_conf::server_total_recv_bytes_inc(head_len + body_len);
         }
         else {
           size_t part_size = head_buf_.size();
@@ -209,22 +178,9 @@ class coro_http_connection
               size_to_read);
           if (ec) {
             CINATRA_LOG_ERROR << "async_read error: " << ec.message();
-            cinatra_metric_conf::server_failed_req_inc();
             close();
             break;
           }
-          else {
-            if (cinatra_metric_conf::enable_metric) {
-              cinatra_metric_conf::server_total_recv_bytes_inc(head_len +
-                                                               body_len);
-              mid = std::chrono::system_clock::now();
-              double count =
-                  std::chrono::duration_cast<std::chrono::microseconds>(mid -
-                                                                        start)
-                      .count();
-              cinatra_metric_conf::server_read_latency_observe(count);
-            }
-          }
         }
       }
 
@@ -409,14 +365,6 @@ class coro_http_connection
         }
       }
 
-      if (cinatra_metric_conf::enable_metric) {
-        mid = std::chrono::system_clock::now();
-        double count =
-            std::chrono::duration_cast<std::chrono::microseconds>(mid - start)
-                .count();
-        cinatra_metric_conf::server_req_latency_observe(count);
-      }
-
       response_.clear();
       request_.clear();
       buffers_.clear();
@@ -430,10 +378,6 @@ class coro_http_connection
   }
 
   async_simple::coro::Lazy<bool> reply(bool need_to_bufffer = true) {
-    if (response_.status() >= status_type::bad_request) {
-      if (cinatra_metric_conf::enable_metric)
-        cinatra_metric_conf::server_failed_req_inc();
-    }
     std::error_code ec;
     size_t size;
     if (multi_buf_) {
@@ -444,18 +388,12 @@ class coro_http_connection
       for (auto &buf : buffers_) {
         send_size += buf.size();
       }
-      if (cinatra_metric_conf::enable_metric) {
-        cinatra_metric_conf::server_total_send_bytes_inc(send_size);
-      }
       std::tie(ec, size) = co_await async_write(buffers_);
     }
     else {
       if (need_to_bufffer) {
         response_.build_resp_str(resp_str_);
       }
-      if (cinatra_metric_conf::enable_metric) {
-        cinatra_metric_conf::server_total_send_bytes_inc(resp_str_.size());
-      }
       std::tie(ec, size) = co_await async_write(asio::buffer(resp_str_));
     }
 

include/ylt/standalone/cinatra/coro_http_server.hpp

@@ -11,7 +11,6 @@
 #include "ylt/coro_io/coro_io.hpp"
 #include "ylt/coro_io/io_context_pool.hpp"
 #include "ylt/coro_io/load_blancer.hpp"
-#include "ylt/metric/system_metric.hpp"
 
 namespace cinatra {
 enum class file_resp_format_type {
@@ -182,29 +181,6 @@ class coro_http_server {
     }
   }
 
-  void use_metrics(bool enable_json = false,
-                   std::string url_path = "/metrics") {
-    init_metrics();
-    using root = ylt::metric::metric_collector_t<
-        ylt::metric::default_static_metric_manager,
-        ylt::metric::system_metric_manager>;
-    set_http_handler<http_method::GET>(
-        url_path,
-        [enable_json](coro_http_request &req, coro_http_response &res) {
-          std::string str;
-#ifdef CINATRA_ENABLE_METRIC_JSON
-          if (enable_json) {
-            str = root::serialize_to_json();
-            res.set_content_type<resp_content_type::json>();
-          }
-          else
-#endif
-            str = root::serialize();
-
-          res.set_status_and_content(status_type::ok, std::move(str));
-        });
-  }
-
   template <http_method... method, typename... Aspects>
   void set_http_proxy_handler(std::string url_path,
                               std::vector<std::string_view> hosts,
@@ -928,32 +904,6 @@ class coro_http_server {
     address_ = std::move(address);
   }
 
- private:
-  void init_metrics() {
-    using namespace ylt::metric;
-
-    cinatra_metric_conf::enable_metric = true;
-    default_static_metric_manager::instance().create_metric_static<counter_t>(
-        cinatra_metric_conf::server_total_req, "");
-    default_static_metric_manager::instance().create_metric_static<counter_t>(
-        cinatra_metric_conf::server_failed_req, "");
-    default_static_metric_manager::instance().create_metric_static<counter_t>(
-        cinatra_metric_conf::server_total_recv_bytes, "");
-    default_static_metric_manager::instance().create_metric_static<counter_t>(
-        cinatra_metric_conf::server_total_send_bytes, "");
-    default_static_metric_manager::instance().create_metric_static<gauge_t>(
-        cinatra_metric_conf::server_total_fd, "");
-    default_static_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_static_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__)
-    ylt::metric::start_system_metric();
-#endif
-  }
-
  private:
   std::unique_ptr<coro_io::io_context_pool> pool_;
   asio::io_context *out_ctx_ = nullptr;

include/ylt/standalone/cinatra/metric_conf.hpp

@@ -618,26 +618,3 @@ test_summary_count 100
 然后启动prometheus，prometheus会定时访问`http://127.0.0.1:9001/metrics` 拉取所有指标数据。
 
 在本地浏览器输入:127.0.0.1:9090, 打开prometheus前端，在前端页面的搜索框中输入指标的名称request_count之后就能看到table和graph 结果了。
-
-# cinatra http server中启用内置的metric指标
-
-http server 内置的指标：
-```cpp
-server_total_req: server总的请求数；
-server_failed_req：server总的失败请求数；
-server_total_fd：server使用的总的句柄数；
-server_total_recv_bytes：server总共收到的字节数；
-server_total_send_bytes：server总共发送的字节数；
-server_req_latency：http 请求的延迟，从收到请求到发送响应的时间间隔
-server_read_latency：http 读请求的延迟，读到完整的http数据的时间间隔
-```
-
-```cpp
-coro_http_server server(1, 9001);
-server.use_metrics("/metrics");//这个url默认就是/metrics，可以不填
-```
-在浏览器中输入`http://127.0.0.1:9001/metrics` 即可看到所有的指标。
-
-查看当前server的client pool中有多少client，调用`pool.free_client_count()`
-
-查看当前server内部线程池中有多少线程，调用`coro_io::get_total_thread_num()`