diff --git a/include/MySQL_HostGroups_Manager.h b/include/MySQL_HostGroups_Manager.h index 741cd29c69..383d8bc38d 100644 --- a/include/MySQL_HostGroups_Manager.h +++ b/include/MySQL_HostGroups_Manager.h @@ -10,8 +10,8 @@ #include // Headers for declaring Prometheus counters -#include -#include +#include "prometheus/counter.h" +#include "prometheus/gauge.h" #include "thread.h" #include "wqueue.h" diff --git a/include/MySQL_Monitor.hpp b/include/MySQL_Monitor.hpp index 4116ac3898..32765f49cc 100644 --- a/include/MySQL_Monitor.hpp +++ b/include/MySQL_Monitor.hpp @@ -1,8 +1,8 @@ #ifndef __CLASS_MYSQL_MONITOR_H #define __CLASS_MYSQL_MONITOR_H #include -#include -#include +#include "prometheus/counter.h" +#include "prometheus/gauge.h" #include "MySQL_HostGroups_Manager.h" #include "proxysql.h" diff --git a/include/MySQL_Thread.h b/include/MySQL_Thread.h index dc36a0f9f6..ddd663056d 100644 --- a/include/MySQL_Thread.h +++ b/include/MySQL_Thread.h @@ -1,8 +1,8 @@ #ifndef __CLASS_MYSQL_THREAD_H #define __CLASS_MYSQL_THREAD_H #define ____CLASS_STANDARD_MYSQL_THREAD_H -#include -#include +#include "prometheus/counter.h" +#include "prometheus/gauge.h" #include "proxysql.h" #include "cpp.h" diff --git a/include/ProxySQL_Cluster.hpp b/include/ProxySQL_Cluster.hpp index 92d81efdec..05621f543e 100644 --- a/include/ProxySQL_Cluster.hpp +++ b/include/ProxySQL_Cluster.hpp @@ -6,8 +6,8 @@ #include "wqueue.h" #include -#include -#include +#include "prometheus/counter.h" +#include "prometheus/gauge.h" #define PROXYSQL_NODE_METRICS_LEN 5 diff --git a/include/prometheus_helpers.h b/include/prometheus_helpers.h index 41759c8d37..d8ab904c6d 100644 --- a/include/prometheus_helpers.h +++ b/include/prometheus_helpers.h @@ -1,9 +1,9 @@ #ifndef __PROXYSQL_PROMETHEUS_HELPERS_H #define __PROXYSQL_PROMETHEUS_HELPERS_H -#include -#include -#include +#include "prometheus/counter.h" +#include "prometheus/gauge.h" +#include "prometheus/family.h" #include #include "proxysql.h" diff --git a/include/query_cache.hpp b/include/query_cache.hpp index cf9bbf6adc..ee621d3635 100644 --- a/include/query_cache.hpp +++ b/include/query_cache.hpp @@ -13,8 +13,8 @@ #define DEFAULT_purge_threshold_pct_min 3 #define DEFAULT_purge_threshold_pct_max 90 -#include -#include +#include "prometheus/counter.h" +#include "prometheus/gauge.h" class KV_BtreeArray; diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp index 583f51a718..37c075c6b1 100644 --- a/lib/MySQL_HostGroups_Manager.cpp +++ b/lib/MySQL_HostGroups_Manager.cpp @@ -9,10 +9,10 @@ #include #include -#include -#include -#include -#include +#include "prometheus/counter.h" +#include "prometheus/detail/builder.h" +#include "prometheus/family.h" +#include "prometheus/gauge.h" #include "prometheus_helpers.h" #include "proxysql_utils.h" diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp index 537d0f4213..4d5d9bc95f 100644 --- a/lib/MySQL_Monitor.cpp +++ b/lib/MySQL_Monitor.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include "prometheus/counter.h" #include "MySQL_Protocol.h" #include "MySQL_HostGroups_Manager.h" #include "MySQL_Monitor.hpp" diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp index 96ef9816b1..6f1450b4e1 100644 --- a/lib/ProxySQL_Admin.cpp +++ b/lib/ProxySQL_Admin.cpp @@ -5,8 +5,8 @@ #include #include // std::vector #include -#include -#include +#include "prometheus/exposer.h" +#include "prometheus/counter.h" #include "openssl/ssl.h" #include "openssl/err.h" #include "MySQL_HostGroups_Manager.h" diff --git a/lib/ProxySQL_GloVars.cpp b/lib/ProxySQL_GloVars.cpp index b01c62f893..037b2eaf63 100644 --- a/lib/ProxySQL_GloVars.cpp +++ b/lib/ProxySQL_GloVars.cpp @@ -3,7 +3,7 @@ #include "cpp.h" #include #include -#include +#include "prometheus/registry.h" #ifndef SPOOKYV2 #include "SpookyV2.h" #define SPOOKYV2 diff --git a/lib/Query_Cache.cpp b/lib/Query_Cache.cpp index 327a0f46f3..e79e34a7ab 100644 --- a/lib/Query_Cache.cpp +++ b/lib/Query_Cache.cpp @@ -1,4 +1,4 @@ -#include +#include "prometheus/counter.h" #include "btree_map.h" #include "proxysql.h" #include "cpp.h"