From 1521d0aeb30adcccad3931cd86ef7fc0936922fe Mon Sep 17 00:00:00 2001 From: yu yunfeng Date: Tue, 28 May 2019 13:36:14 +0800 Subject: [PATCH] delete prometheus-cpp Former-commit-id: d95914cebe38d7f5446cffe28e0d26d0cb82097a --- cpp/src/CMakeLists.txt | 19 ++++++++++--------- cpp/src/server/Server.cpp | 3 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 49f2558f..a25105c2 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -11,7 +11,7 @@ aux_source_directory(server server_files) aux_source_directory(utils utils_files) aux_source_directory(db db_files) aux_source_directory(wrapper wrapper_files) -aux_source_directory(metrics metrics_files) +#aux_source_directory(metrics metrics_files) set(license_check_files @@ -35,7 +35,8 @@ set(vecwise_engine_files ${cache_files} ${db_files} ${wrapper_files} - ${metrics_files} + metrics/Metrics.cpp +# ${metrics_files} ) set(get_sys_info_files @@ -57,9 +58,9 @@ if (GPU_VERSION STREQUAL "ON") cudart cublas libsqlite3.a - libprometheus-cpp-push.a - libprometheus-cpp-pull.a - libprometheus-cpp-core.a +# libprometheus-cpp-push.a +# libprometheus-cpp-pull.a +# libprometheus-cpp-core.a ) else() set(engine_libs @@ -70,9 +71,9 @@ else() libgfortran.a libquadmath.a libsqlite3.a - libprometheus-cpp-push.a - libprometheus-cpp-pull.a - libprometheus-cpp-core.a +# libprometheus-cpp-push.a +# libprometheus-cpp-pull.a +# libprometheus-cpp-core.a ) endif () @@ -106,7 +107,7 @@ endif () # libprometheus-cpp-core.a # ) -add_library(metrics STATIC ${metrics_files}) +#add_library(metrics STATIC ${metrics_files} metrics/MetricBase.h) #target_link_libraries(metrics ${metrics_lib}) add_executable(vecwise_server diff --git a/cpp/src/server/Server.cpp b/cpp/src/server/Server.cpp index eb05d74a..57eecc57 100644 --- a/cpp/src/server/Server.cpp +++ b/cpp/src/server/Server.cpp @@ -10,6 +10,7 @@ #include "utils/SignalUtil.h" #include "utils/TimeRecorder.h" #include "license/LicenseCheck.h" +#include "metrics/Metrics.h" #include #include @@ -137,7 +138,7 @@ int Server::Start() { // server::Metrics::GetInstance().Init(); // server::Metrics::GetInstance().exposer_ptr()->RegisterCollectable(server::Metrics::GetInstance().registry_ptr()); - METRICS_INSTANCE.Init(); + server::Metrics::GetInstance().Init(); if (daemonized_) { Daemonize(); -- GitLab