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/proxysql.h b/include/proxysql.h index 522bd4d1d4..90c881d414 100644 --- a/include/proxysql.h +++ b/include/proxysql.h @@ -38,11 +38,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "openssl/bio.h" +#include "openssl/sha.h" +#include "openssl/md5.h" +#include "openssl/ssl.h" +#include "openssl/err.h" #include #include 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/MySQL_Protocol.cpp b/lib/MySQL_Protocol.cpp index cba71c6a8a..5b02b562a6 100644 --- a/lib/MySQL_Protocol.cpp +++ b/lib/MySQL_Protocol.cpp @@ -1,4 +1,4 @@ -#include +#include "openssl/rand.h" #include "proxysql.h" #include "cpp.h" #include "re2/re2.h" diff --git a/lib/MySQL_ResultSet.cpp b/lib/MySQL_ResultSet.cpp index 87e713aa76..403f89ff5d 100644 --- a/lib/MySQL_ResultSet.cpp +++ b/lib/MySQL_ResultSet.cpp @@ -1,4 +1,4 @@ -#include +#include "openssl/rand.h" #include "proxysql.h" #include "cpp.h" #include "re2/re2.h" diff --git a/lib/MySQL_encode.cpp b/lib/MySQL_encode.cpp index 13a4f0461b..384a415c24 100644 --- a/lib/MySQL_encode.cpp +++ b/lib/MySQL_encode.cpp @@ -1,4 +1,4 @@ -#include +#include "openssl/rand.h" #include "proxysql.h" #include "cpp.h" diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp index 61fe3af6ed..6f1450b4e1 100644 --- a/lib/ProxySQL_Admin.cpp +++ b/lib/ProxySQL_Admin.cpp @@ -5,10 +5,10 @@ #include #include // std::vector #include -#include -#include -#include -#include +#include "prometheus/exposer.h" +#include "prometheus/counter.h" +#include "openssl/ssl.h" +#include "openssl/err.h" #include "MySQL_HostGroups_Manager.h" #include "mysql.h" #include "proxysql_admin.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" diff --git a/lib/configfile.cpp b/lib/configfile.cpp index 31da0a07d9..e27a0d51df 100644 --- a/lib/configfile.cpp +++ b/lib/configfile.cpp @@ -13,7 +13,7 @@ #include -#include +#include "libconfig.h++" using namespace std; using namespace libconfig; diff --git a/lib/mysql_data_stream.cpp b/lib/mysql_data_stream.cpp index 2407f3b7ee..7330f9492a 100644 --- a/lib/mysql_data_stream.cpp +++ b/lib/mysql_data_stream.cpp @@ -8,7 +8,7 @@ #include "MySQL_PreparedStatement.h" #include "MySQL_Data_Stream.h" -#include +#include "openssl/x509v3.h" /** diff --git a/src/main.cpp b/src/main.cpp index db619b6b6d..f234b72dc5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,16 +27,16 @@ #include "Web_Interface.hpp" #include "proxysql_utils.h" -#include -#include -#include -#include -#include +#include "libdaemon/dfork.h" +#include "libdaemon/dsignal.h" +#include "libdaemon/dlog.h" +#include "libdaemon/dpid.h" +#include "libdaemon/dexec.h" #include "ev.h" #include "curl/curl.h" -#include +#include "openssl/x509v3.h" #include @@ -71,7 +71,7 @@ char *binary_sha1 = NULL; #endif static pthread_mutex_t *lockarray; -#include +#include "openssl/crypto.h" // this fuction will be called as a deatached thread diff --git a/src/proxy_tls.cpp b/src/proxy_tls.cpp index 433bb173fc..c940116313 100644 --- a/src/proxy_tls.cpp +++ b/src/proxy_tls.cpp @@ -1,6 +1,6 @@ #include "proxysql.h" #include "cpp.h" -#include +#include "openssl/x509v3.h" static long get_file_size (const char *filename) { diff --git a/test/tap/tests/mysql_reconnect.cpp b/test/tap/tests/mysql_reconnect.cpp index 8962d009d7..386e7078ee 100644 --- a/test/tap/tests/mysql_reconnect.cpp +++ b/test/tap/tests/mysql_reconnect.cpp @@ -13,7 +13,7 @@ #include #ifdef LIBMYSQL_HELPER8 -#include +#include "mysql/mysql.h" #else #include "mysql.h" #endif diff --git a/test/tap/tests/test_binlog_reader-t.cpp b/test/tap/tests/test_binlog_reader-t.cpp index 82eaf7f619..f4cfaca5d8 100644 --- a/test/tap/tests/test_binlog_reader-t.cpp +++ b/test/tap/tests/test_binlog_reader-t.cpp @@ -30,7 +30,7 @@ #include "mysql.h" #include "mysqld_error.h" -#include +#include "json.hpp" #include "tap.h" #include "command_line.h" diff --git a/test/tap/tests/test_client_limit_error-t.cpp b/test/tap/tests/test_client_limit_error-t.cpp index 6d84f245a7..4b3b690419 100644 --- a/test/tap/tests/test_client_limit_error-t.cpp +++ b/test/tap/tests/test_client_limit_error-t.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include "libconfig.h" #include "proxysql_utils.h" #include "mysql.h" diff --git a/test/tap/tests/test_cluster_sync-t.cpp b/test/tap/tests/test_cluster_sync-t.cpp index 09b4bdd027..cddc43c052 100644 --- a/test/tap/tests/test_cluster_sync-t.cpp +++ b/test/tap/tests/test_cluster_sync-t.cpp @@ -75,7 +75,7 @@ #include #include -#include +#include "libconfig.h" #include "proxysql_utils.h" diff --git a/test/tap/tests/test_cluster_sync_mysql_servers-t.cpp b/test/tap/tests/test_cluster_sync_mysql_servers-t.cpp index a1338a4a8d..4a84270c2f 100644 --- a/test/tap/tests/test_cluster_sync_mysql_servers-t.cpp +++ b/test/tap/tests/test_cluster_sync_mysql_servers-t.cpp @@ -40,11 +40,11 @@ #include #include -#include +#include "libconfig.h" -#include +#include "proxysql_utils.h" -#include +#include "mysql.h" #ifndef SPOOKYV2 #include "SpookyV2.h" #define SPOOKYV2 diff --git a/test/tap/tests/test_warnings-t.cpp b/test/tap/tests/test_warnings-t.cpp index 65ed4c76d7..b111294ea6 100644 --- a/test/tap/tests/test_warnings-t.cpp +++ b/test/tap/tests/test_warnings-t.cpp @@ -12,8 +12,8 @@ #include #include "json.hpp" -#include -#include +#include "mysql.h" +#include "mysql/mysqld_error.h" #include "tap.h" #include "command_line.h" #include "utils.h" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_cache_mixed_flags-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_cache_mixed_flags-t.cpp index f7f95a694d..477a5989a6 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/eof_cache_mixed_flags-t.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/eof_cache_mixed_flags-t.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include "mysql.h" #include "mysqld_error.h" #include "tap.h" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp index ea64d518c8..f4ffd9306e 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/eof_conn_options_check-t.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include "mysql.h" #include "mysqld_error.h" #include "json.hpp" diff --git a/test/tap/tests_with_deps/deprecate_eof_support/eof_mixed_flags_queries-t.cpp b/test/tap/tests_with_deps/deprecate_eof_support/eof_mixed_flags_queries-t.cpp index 556d77ba50..5693a07d48 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/eof_mixed_flags_queries-t.cpp +++ b/test/tap/tests_with_deps/deprecate_eof_support/eof_mixed_flags_queries-t.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include "mysql.h" #include "mysqld_error.h" #include "tap.h"