From 49ee49b3795e05259bdcefcda25d46baf9c5e55d Mon Sep 17 00:00:00 2001 From: Giles Hutton Date: Tue, 22 Apr 2025 14:27:19 +0100 Subject: [PATCH 1/2] Refactor logging into its own subdirectory/library --- collector/collector.cpp | 4 ++-- collector/lib/CMakeLists.txt | 4 ++++ collector/lib/CollectionMethod.cpp | 2 +- collector/lib/CollectorArgs.cpp | 2 +- collector/lib/CollectorConfig.cpp | 2 +- collector/lib/CollectorConfig.h | 2 +- collector/lib/CollectorRuntimeConfigInspector.cpp | 3 ++- collector/lib/CollectorService.cpp | 2 +- collector/lib/CollectorStatsExporter.cpp | 2 +- collector/lib/ConfigLoader.cpp | 2 +- collector/lib/ConnTracker.cpp | 2 +- collector/lib/Diagnostics.h | 2 +- collector/lib/EnvVar.h | 2 +- collector/lib/FileSystem.h | 2 +- collector/lib/GRPCUtil.h | 2 +- collector/lib/HostHeuristics.cpp | 2 +- collector/lib/HostInfo.cpp | 2 +- collector/lib/HostInfo.h | 2 +- collector/lib/Inotify.h | 2 +- collector/lib/KernelDriver.h | 2 +- collector/lib/NRadix.h | 2 +- collector/lib/NetworkStatusNotifier.cpp | 2 +- collector/lib/ProcessSignalFormatter.cpp | 2 +- collector/lib/ProcfsScraper.cpp | 2 +- collector/lib/ProfilerHandler.cpp | 2 +- collector/lib/ProtoAllocator.h | 2 +- collector/lib/RateLimit.cpp | 2 +- collector/lib/SelfCheckHandler.cpp | 2 +- collector/lib/SelfChecks.cpp | 2 +- collector/lib/SignalServiceClient.cpp | 2 +- collector/lib/StoppableThread.h | 2 +- collector/lib/Utility.cpp | 2 +- collector/lib/log/CMakeLists.txt | 2 ++ collector/lib/{ => log}/LogLevel.cpp | 2 +- collector/lib/{ => log}/LogLevel.h | 0 collector/lib/{ => log}/Logging.cpp | 2 +- collector/lib/{ => log}/Logging.h | 0 collector/lib/system-inspector/EventExtractor.h | 2 +- collector/lib/system-inspector/Service.cpp | 2 +- 39 files changed, 43 insertions(+), 36 deletions(-) create mode 100644 collector/lib/log/CMakeLists.txt rename collector/lib/{ => log}/LogLevel.cpp (97%) rename collector/lib/{ => log}/LogLevel.h (100%) rename collector/lib/{ => log}/Logging.cpp (99%) rename collector/lib/{ => log}/Logging.h (100%) diff --git a/collector/collector.cpp b/collector/collector.cpp index 76de031649..c4207549b2 100644 --- a/collector/collector.cpp +++ b/collector/collector.cpp @@ -40,9 +40,9 @@ extern "C" { #include "GRPCUtil.h" #include "GetStatus.h" #include "HostInfo.h" -#include "LogLevel.h" -#include "Logging.h" #include "Utility.h" +#include "log/LogLevel.h" +#include "log/Logging.h" static const int MAX_GRPC_CONNECTION_POLLS = 30; diff --git a/collector/lib/CMakeLists.txt b/collector/lib/CMakeLists.txt index 2899168aa7..c1c2ac30d8 100644 --- a/collector/lib/CMakeLists.txt +++ b/collector/lib/CMakeLists.txt @@ -1,3 +1,5 @@ +add_subdirectory(log) + file(GLOB COLLECTOR_LIB_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/system-inspector/*.cpp @@ -15,6 +17,8 @@ target_link_libraries(collector_lib yaml-cpp::yaml-cpp) target_link_libraries(collector_lib rox-proto) +target_link_libraries(collector_lib collector_logging) + if(NOT DISABLE_PROFILING) find_library(GPERFTOOLS_PROFILER profiler) find_library(GPERFTOOLS_TCMALLOC tcmalloc) diff --git a/collector/lib/CollectionMethod.cpp b/collector/lib/CollectionMethod.cpp index 29864ddd6f..936d0e2eef 100644 --- a/collector/lib/CollectionMethod.cpp +++ b/collector/lib/CollectionMethod.cpp @@ -4,7 +4,7 @@ #include -#include "Logging.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/CollectorArgs.cpp b/collector/lib/CollectorArgs.cpp index 64f97b6daf..3cb68bb54c 100644 --- a/collector/lib/CollectorArgs.cpp +++ b/collector/lib/CollectorArgs.cpp @@ -8,7 +8,7 @@ #include "CollectorConfig.h" #include "GRPC.h" -#include "Logging.h" +#include "log/Logging.h" #include "optionparser.h" namespace collector { diff --git a/collector/lib/CollectorConfig.cpp b/collector/lib/CollectorConfig.cpp index 54a434a5c1..2f269144b9 100644 --- a/collector/lib/CollectorConfig.cpp +++ b/collector/lib/CollectorConfig.cpp @@ -15,9 +15,9 @@ #include "GRPC.h" #include "HostHeuristics.h" #include "HostInfo.h" -#include "Logging.h" #include "TlsConfig.h" #include "Utility.h" +#include "log/Logging.h" #include "optionparser.h" namespace collector { diff --git a/collector/lib/CollectorConfig.h b/collector/lib/CollectorConfig.h index f6b2e52410..35bb6045d3 100644 --- a/collector/lib/CollectorConfig.h +++ b/collector/lib/CollectorConfig.h @@ -16,10 +16,10 @@ #include "CollectionMethod.h" #include "HostConfig.h" -#include "Logging.h" #include "NetworkConnection.h" #include "TlsConfig.h" #include "json/value.h" +#include "log/Logging.h" #include "optionparser.h" namespace collector { diff --git a/collector/lib/CollectorRuntimeConfigInspector.cpp b/collector/lib/CollectorRuntimeConfigInspector.cpp index 26a2645659..f55489aba9 100644 --- a/collector/lib/CollectorRuntimeConfigInspector.cpp +++ b/collector/lib/CollectorRuntimeConfigInspector.cpp @@ -1,8 +1,9 @@ #include "CollectorRuntimeConfigInspector.h" -#include #include +#include + #include namespace collector { diff --git a/collector/lib/CollectorService.cpp b/collector/lib/CollectorService.cpp index 369e1ed8e6..610b93ad2e 100644 --- a/collector/lib/CollectorService.cpp +++ b/collector/lib/CollectorService.cpp @@ -11,12 +11,12 @@ #include "Diagnostics.h" #include "GRPCUtil.h" #include "GetStatus.h" -#include "LogLevel.h" #include "NetworkSignalHandler.h" #include "NetworkStatusInspector.h" #include "NetworkStatusNotifier.h" #include "ProfilerHandler.h" #include "Utility.h" +#include "log/LogLevel.h" #include "system-inspector/Service.h" namespace collector { diff --git a/collector/lib/CollectorStatsExporter.cpp b/collector/lib/CollectorStatsExporter.cpp index cc4659dc78..b16909b84e 100644 --- a/collector/lib/CollectorStatsExporter.cpp +++ b/collector/lib/CollectorStatsExporter.cpp @@ -6,8 +6,8 @@ #include "Containers.h" #include "EventNames.h" -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" #include "prometheus/gauge.h" #include "prometheus/summary.h" #include "system-inspector/Service.h" diff --git a/collector/lib/ConfigLoader.cpp b/collector/lib/ConfigLoader.cpp index 0da798b116..74bb71e47a 100644 --- a/collector/lib/ConfigLoader.cpp +++ b/collector/lib/ConfigLoader.cpp @@ -7,7 +7,7 @@ #include "internalapi/sensor/collector.pb.h" #include "EnvVar.h" -#include "Logging.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/ConnTracker.cpp b/collector/lib/ConnTracker.cpp index 18ca75abda..64c7c93c62 100644 --- a/collector/lib/ConnTracker.cpp +++ b/collector/lib/ConnTracker.cpp @@ -4,8 +4,8 @@ #include "CollectorStats.h" #include "Containers.h" -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/Diagnostics.h b/collector/lib/Diagnostics.h index 7866b96109..684bc6581e 100644 --- a/collector/lib/Diagnostics.h +++ b/collector/lib/Diagnostics.h @@ -4,7 +4,7 @@ #include #include -#include "Logging.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/EnvVar.h b/collector/lib/EnvVar.h index 61bd83aaba..45a1a41b1f 100644 --- a/collector/lib/EnvVar.h +++ b/collector/lib/EnvVar.h @@ -13,8 +13,8 @@ #include #include -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/FileSystem.h b/collector/lib/FileSystem.h index 3d36cabc98..abe7acfa6a 100644 --- a/collector/lib/FileSystem.h +++ b/collector/lib/FileSystem.h @@ -10,8 +10,8 @@ #include #include -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/GRPCUtil.h b/collector/lib/GRPCUtil.h index 5ca0cf15aa..4eeb881e94 100644 --- a/collector/lib/GRPCUtil.h +++ b/collector/lib/GRPCUtil.h @@ -8,7 +8,7 @@ #include #include -#include "Logging.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/HostHeuristics.cpp b/collector/lib/HostHeuristics.cpp index 7cc6d33127..cd33252e89 100644 --- a/collector/lib/HostHeuristics.cpp +++ b/collector/lib/HostHeuristics.cpp @@ -1,6 +1,6 @@ #include "HostHeuristics.h" -#include "Logging.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/HostInfo.cpp b/collector/lib/HostInfo.cpp index b742ed0af9..870c663ea6 100644 --- a/collector/lib/HostInfo.cpp +++ b/collector/lib/HostInfo.cpp @@ -30,7 +30,7 @@ You should have received a copy of the GNU General Public License along with thi #include #include "FileSystem.h" -#include "Logging.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/HostInfo.h b/collector/lib/HostInfo.h index eafd1578b4..4f83ad8a8d 100644 --- a/collector/lib/HostInfo.h +++ b/collector/lib/HostInfo.h @@ -32,8 +32,8 @@ extern "C" { #include #include -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/Inotify.h b/collector/lib/Inotify.h index 5f8d70ebe8..d542cd1cfe 100644 --- a/collector/lib/Inotify.h +++ b/collector/lib/Inotify.h @@ -11,8 +11,8 @@ #include -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/KernelDriver.h b/collector/lib/KernelDriver.h index fe40d7ae7b..d5dcab1213 100644 --- a/collector/lib/KernelDriver.h +++ b/collector/lib/KernelDriver.h @@ -13,8 +13,8 @@ extern "C" { #include "CollectorConfig.h" #include "EventNames.h" #include "FileSystem.h" -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" #include "system-inspector/Service.h" extern const struct syscall_evt_pair g_syscall_table[]; // defined in libscap diff --git a/collector/lib/NRadix.h b/collector/lib/NRadix.h index 5cec2663ae..b0b413a408 100644 --- a/collector/lib/NRadix.h +++ b/collector/lib/NRadix.h @@ -31,9 +31,9 @@ #include -#include "Logging.h" #include "NetworkConnection.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/NetworkStatusNotifier.cpp b/collector/lib/NetworkStatusNotifier.cpp index 27efaa6ade..b8af110187 100644 --- a/collector/lib/NetworkStatusNotifier.cpp +++ b/collector/lib/NetworkStatusNotifier.cpp @@ -5,12 +5,12 @@ #include "CollectorStats.h" #include "DuplexGRPC.h" #include "GRPCUtil.h" -#include "Logging.h" #include "Profiler.h" #include "ProtoUtil.h" #include "RateLimit.h" #include "TimeUtil.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/ProcessSignalFormatter.cpp b/collector/lib/ProcessSignalFormatter.cpp index a588d75bd6..7490b7b3d1 100644 --- a/collector/lib/ProcessSignalFormatter.cpp +++ b/collector/lib/ProcessSignalFormatter.cpp @@ -8,8 +8,8 @@ #include "CollectorStats.h" #include "EventMap.h" -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" #include "system-inspector/EventExtractor.h" namespace collector { diff --git a/collector/lib/ProcfsScraper.cpp b/collector/lib/ProcfsScraper.cpp index a0097e272b..b703275383 100644 --- a/collector/lib/ProcfsScraper.cpp +++ b/collector/lib/ProcfsScraper.cpp @@ -13,9 +13,9 @@ #include "Containers.h" #include "FileSystem.h" #include "Hash.h" -#include "Logging.h" #include "ProcfsScraper_internal.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/ProfilerHandler.cpp b/collector/lib/ProfilerHandler.cpp index 58a88612fa..4dcf012589 100644 --- a/collector/lib/ProfilerHandler.cpp +++ b/collector/lib/ProfilerHandler.cpp @@ -7,9 +7,9 @@ #include #include -#include "Logging.h" #include "Profiler.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/ProtoAllocator.h b/collector/lib/ProtoAllocator.h index 0b5c0ae97e..15d1f01bce 100644 --- a/collector/lib/ProtoAllocator.h +++ b/collector/lib/ProtoAllocator.h @@ -5,7 +5,7 @@ # include #endif -#include "Logging.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/RateLimit.cpp b/collector/lib/RateLimit.cpp index 6995cf955f..6356943b89 100644 --- a/collector/lib/RateLimit.cpp +++ b/collector/lib/RateLimit.cpp @@ -1,9 +1,9 @@ #include "RateLimit.h" #include "CollectorStats.h" -#include "Logging.h" #include "TimeUtil.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/SelfCheckHandler.cpp b/collector/lib/SelfCheckHandler.cpp index d190e42218..eaec7eb1ff 100644 --- a/collector/lib/SelfCheckHandler.cpp +++ b/collector/lib/SelfCheckHandler.cpp @@ -3,8 +3,8 @@ #include #include -#include "Logging.h" #include "SelfChecks.h" +#include "log/Logging.h" #include "system-inspector/EventExtractor.h" namespace collector { diff --git a/collector/lib/SelfChecks.cpp b/collector/lib/SelfChecks.cpp index f9f69456f5..cf97129070 100644 --- a/collector/lib/SelfChecks.cpp +++ b/collector/lib/SelfChecks.cpp @@ -5,8 +5,8 @@ #include -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/SignalServiceClient.cpp b/collector/lib/SignalServiceClient.cpp index 18a03b016a..6cbcf6bbe3 100644 --- a/collector/lib/SignalServiceClient.cpp +++ b/collector/lib/SignalServiceClient.cpp @@ -3,9 +3,9 @@ #include #include "GRPCUtil.h" -#include "Logging.h" #include "ProtoUtil.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/StoppableThread.h b/collector/lib/StoppableThread.h index 4a2151a6f1..aec6ae42de 100644 --- a/collector/lib/StoppableThread.h +++ b/collector/lib/StoppableThread.h @@ -10,7 +10,7 @@ #include #include -#include "Logging.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/Utility.cpp b/collector/lib/Utility.cpp index 26832eada8..e859a73642 100644 --- a/collector/lib/Utility.cpp +++ b/collector/lib/Utility.cpp @@ -22,8 +22,8 @@ extern "C" { #include #include "HostInfo.h" -#include "Logging.h" #include "Utility.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/log/CMakeLists.txt b/collector/lib/log/CMakeLists.txt new file mode 100644 index 0000000000..8b1f2b0dff --- /dev/null +++ b/collector/lib/log/CMakeLists.txt @@ -0,0 +1,2 @@ + +add_library(collector_logging STATIC Logging.cpp Logging.h LogLevel.cpp LogLevel.h) diff --git a/collector/lib/LogLevel.cpp b/collector/lib/log/LogLevel.cpp similarity index 97% rename from collector/lib/LogLevel.cpp rename to collector/lib/log/LogLevel.cpp index 7188f2ea4c..e84fc4decd 100644 --- a/collector/lib/LogLevel.cpp +++ b/collector/lib/log/LogLevel.cpp @@ -4,7 +4,7 @@ #include -#include "Logging.h" +#include "log/Logging.h" namespace collector { diff --git a/collector/lib/LogLevel.h b/collector/lib/log/LogLevel.h similarity index 100% rename from collector/lib/LogLevel.h rename to collector/lib/log/LogLevel.h diff --git a/collector/lib/Logging.cpp b/collector/lib/log/Logging.cpp similarity index 99% rename from collector/lib/Logging.cpp rename to collector/lib/log/Logging.cpp index 1c9bcf1b78..c791d102bd 100644 --- a/collector/lib/Logging.cpp +++ b/collector/lib/log/Logging.cpp @@ -1,4 +1,4 @@ -#include "Logging.h" +#include "log/Logging.h" #include #include diff --git a/collector/lib/Logging.h b/collector/lib/log/Logging.h similarity index 100% rename from collector/lib/Logging.h rename to collector/lib/log/Logging.h diff --git a/collector/lib/system-inspector/EventExtractor.h b/collector/lib/system-inspector/EventExtractor.h index 7881311816..62cb756eb6 100644 --- a/collector/lib/system-inspector/EventExtractor.h +++ b/collector/lib/system-inspector/EventExtractor.h @@ -7,7 +7,7 @@ #include "libsinsp/filterchecks.h" #include "libsinsp/sinsp.h" -#include "Logging.h" +#include "log/Logging.h" namespace collector::system_inspector { diff --git a/collector/lib/system-inspector/Service.cpp b/collector/lib/system-inspector/Service.cpp index 95c0394416..9495d886cc 100644 --- a/collector/lib/system-inspector/Service.cpp +++ b/collector/lib/system-inspector/Service.cpp @@ -21,13 +21,13 @@ #include "EventNames.h" #include "HostInfo.h" #include "KernelDriver.h" -#include "Logging.h" #include "NetworkSignalHandler.h" #include "ProcessSignalHandler.h" #include "SelfCheckHandler.h" #include "SelfChecks.h" #include "TimeUtil.h" #include "Utility.h" +#include "log/Logging.h" #include "logger.h" namespace collector::system_inspector { From 549ff104f20baa058a3006c6c723630b39d55783 Mon Sep 17 00:00:00 2001 From: Giles Hutton Date: Tue, 22 Apr 2025 15:31:16 +0100 Subject: [PATCH 2/2] Add grpc and utils directories --- collector/collector.cpp | 9 +++++---- collector/connscrape.cpp | 2 +- collector/lib/AbortHandler.h | 2 +- collector/lib/CMakeLists.txt | 7 +++---- collector/lib/CollectorArgs.cpp | 3 ++- collector/lib/CollectorConfig.cpp | 7 ++++--- collector/lib/CollectorService.cpp | 5 +++-- collector/lib/CollectorStats.h | 2 +- collector/lib/CollectorStatsExporter.cpp | 4 ++-- collector/lib/CollectorStatsExporter.h | 2 +- collector/lib/ConfigLoader.cpp | 2 +- collector/lib/ConfigLoader.h | 2 +- collector/lib/ConnTracker.cpp | 4 ++-- collector/lib/ConnTracker.h | 6 +++--- collector/lib/HostInfo.cpp | 2 +- collector/lib/HostInfo.h | 2 +- collector/lib/Inotify.h | 2 +- collector/lib/KernelDriver.h | 4 ++-- collector/lib/NetworkConnection.h | 2 +- collector/lib/NetworkConnectionInfoServiceComm.cpp | 5 +++-- collector/lib/NetworkConnectionInfoServiceComm.h | 3 +-- collector/lib/NetworkStatusNotifier.cpp | 8 ++++---- collector/lib/NetworkStatusNotifier.h | 2 +- collector/lib/ProcessSignalFormatter.cpp | 2 +- collector/lib/ProcfsScraper.cpp | 8 ++++---- collector/lib/ProfilerHandler.cpp | 2 +- collector/lib/RateLimit.cpp | 4 ++-- collector/lib/RateLimit.h | 2 +- collector/lib/SelfChecks.cpp | 2 +- collector/lib/SignalServiceClient.cpp | 5 +++-- collector/lib/SignalServiceClient.h | 4 ++-- collector/lib/grpc/CMakeLists.txt | 0 collector/lib/{ => grpc}/DuplexGRPC.h | 2 +- collector/lib/{ => grpc}/GRPC.cpp | 2 +- collector/lib/{ => grpc}/GRPC.h | 0 collector/lib/{ => grpc}/GRPCUtil.cpp | 2 +- collector/lib/{ => grpc}/GRPCUtil.h | 0 collector/lib/log/CMakeLists.txt | 2 -- collector/lib/system-inspector/Service.cpp | 4 ++-- collector/lib/utils/CMakeLists.txt | 0 collector/lib/{ => utils}/Containers.h | 0 collector/lib/{ => utils}/EnvVar.h | 2 +- collector/lib/{ => utils}/FileSystem.h | 2 +- collector/lib/{ => utils}/Hash.h | 0 collector/lib/{ => utils}/NRadix.cpp | 4 ++-- collector/lib/{ => utils}/NRadix.h | 2 +- collector/lib/{ => utils}/StoppableThread.cpp | 4 ++-- collector/lib/{ => utils}/StoppableThread.h | 0 collector/lib/{ => utils}/TimeUtil.h | 0 collector/lib/{ => utils}/Utility.cpp | 2 +- collector/lib/{ => utils}/Utility.h | 0 collector/test/ConnTrackerTest.cpp | 2 +- collector/test/NRadixTest.cpp | 4 ++-- collector/test/NetworkConnectionTest.cpp | 2 +- collector/test/NetworkStatusNotifierTest.cpp | 4 ++-- collector/test/ProcessSignalFormatterTest.cpp | 2 +- collector/test/UtilityTest.cpp | 2 +- 57 files changed, 81 insertions(+), 79 deletions(-) create mode 100644 collector/lib/grpc/CMakeLists.txt rename collector/lib/{ => grpc}/DuplexGRPC.h (99%) rename collector/lib/{ => grpc}/GRPC.cpp (99%) rename collector/lib/{ => grpc}/GRPC.h (100%) rename collector/lib/{ => grpc}/GRPCUtil.cpp (95%) rename collector/lib/{ => grpc}/GRPCUtil.h (100%) delete mode 100644 collector/lib/log/CMakeLists.txt create mode 100644 collector/lib/utils/CMakeLists.txt rename collector/lib/{ => utils}/Containers.h (100%) rename collector/lib/{ => utils}/EnvVar.h (99%) rename collector/lib/{ => utils}/FileSystem.h (99%) rename collector/lib/{ => utils}/Hash.h (100%) rename collector/lib/{ => utils}/NRadix.cpp (99%) rename collector/lib/{ => utils}/NRadix.h (99%) rename collector/lib/{ => utils}/StoppableThread.cpp (95%) rename collector/lib/{ => utils}/StoppableThread.h (100%) rename collector/lib/{ => utils}/TimeUtil.h (100%) rename collector/lib/{ => utils}/Utility.cpp (99%) rename collector/lib/{ => utils}/Utility.h (100%) diff --git a/collector/collector.cpp b/collector/collector.cpp index c4207549b2..4b503dc829 100644 --- a/collector/collector.cpp +++ b/collector/collector.cpp @@ -27,6 +27,9 @@ extern "C" { #include #include } +#include "grpc/GRPC.h" +#include "grpc/GRPCUtil.h" + #include "AbortHandler.h" #include "CollectorArgs.h" #include "CollectorService.h" @@ -35,14 +38,12 @@ extern "C" { #include "Control.h" #include "Diagnostics.h" #include "EventNames.h" -#include "FileSystem.h" -#include "GRPC.h" -#include "GRPCUtil.h" #include "GetStatus.h" #include "HostInfo.h" -#include "Utility.h" #include "log/LogLevel.h" #include "log/Logging.h" +#include "utils/FileSystem.h" +#include "utils/Utility.h" static const int MAX_GRPC_CONNECTION_POLLS = 30; diff --git a/collector/connscrape.cpp b/collector/connscrape.cpp index 5f7c655d49..e0bc8361fa 100644 --- a/collector/connscrape.cpp +++ b/collector/connscrape.cpp @@ -2,8 +2,8 @@ #include -#include "EnvVar.h" #include "ProcfsScraper.h" +#include "utils/EnvVar.h" using namespace collector; diff --git a/collector/lib/AbortHandler.h b/collector/lib/AbortHandler.h index 586534aea0..6db6f65b60 100644 --- a/collector/lib/AbortHandler.h +++ b/collector/lib/AbortHandler.h @@ -15,7 +15,7 @@ extern "C" { #include } -#include "Utility.h" +#include "utils/Utility.h" // Standards before C++17 [1] specify that a signal handler installed via // std::signal should have a C language linkage, otherwise resulting in diff --git a/collector/lib/CMakeLists.txt b/collector/lib/CMakeLists.txt index c1c2ac30d8..0358eebe07 100644 --- a/collector/lib/CMakeLists.txt +++ b/collector/lib/CMakeLists.txt @@ -1,7 +1,8 @@ -add_subdirectory(log) - file(GLOB COLLECTOR_LIB_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/log/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/grpc/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/utils/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/system-inspector/*.cpp ) @@ -17,8 +18,6 @@ target_link_libraries(collector_lib yaml-cpp::yaml-cpp) target_link_libraries(collector_lib rox-proto) -target_link_libraries(collector_lib collector_logging) - if(NOT DISABLE_PROFILING) find_library(GPERFTOOLS_PROFILER profiler) find_library(GPERFTOOLS_TCMALLOC tcmalloc) diff --git a/collector/lib/CollectorArgs.cpp b/collector/lib/CollectorArgs.cpp index 3cb68bb54c..ffc04a2569 100644 --- a/collector/lib/CollectorArgs.cpp +++ b/collector/lib/CollectorArgs.cpp @@ -6,8 +6,9 @@ #include #include +#include "grpc/GRPC.h" + #include "CollectorConfig.h" -#include "GRPC.h" #include "log/Logging.h" #include "optionparser.h" diff --git a/collector/lib/CollectorConfig.cpp b/collector/lib/CollectorConfig.cpp index 2f269144b9..134d99ce98 100644 --- a/collector/lib/CollectorConfig.cpp +++ b/collector/lib/CollectorConfig.cpp @@ -9,16 +9,17 @@ #include +#include "grpc/GRPC.h" + #include "CollectionMethod.h" #include "CollectorArgs.h" -#include "EnvVar.h" -#include "GRPC.h" #include "HostHeuristics.h" #include "HostInfo.h" #include "TlsConfig.h" -#include "Utility.h" #include "log/Logging.h" #include "optionparser.h" +#include "utils/EnvVar.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/CollectorService.cpp b/collector/lib/CollectorService.cpp index 610b93ad2e..b3bbcb5686 100644 --- a/collector/lib/CollectorService.cpp +++ b/collector/lib/CollectorService.cpp @@ -2,6 +2,8 @@ #include +#include "grpc/GRPCUtil.h" + #include "CollectionMethod.h" #include "CollectorRuntimeConfigInspector.h" #include "CollectorStatsExporter.h" @@ -9,15 +11,14 @@ #include "ConnTracker.h" #include "ContainerInfoInspector.h" #include "Diagnostics.h" -#include "GRPCUtil.h" #include "GetStatus.h" #include "NetworkSignalHandler.h" #include "NetworkStatusInspector.h" #include "NetworkStatusNotifier.h" #include "ProfilerHandler.h" -#include "Utility.h" #include "log/LogLevel.h" #include "system-inspector/Service.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/CollectorStats.h b/collector/lib/CollectorStats.h index d21d8603c0..ad52c4b3dd 100644 --- a/collector/lib/CollectorStats.h +++ b/collector/lib/CollectorStats.h @@ -7,7 +7,7 @@ #include #include -#include "TimeUtil.h" +#include "utils/TimeUtil.h" #define TIMER_NAMES \ X(net_scrape_read) \ diff --git a/collector/lib/CollectorStatsExporter.cpp b/collector/lib/CollectorStatsExporter.cpp index b16909b84e..176942bacc 100644 --- a/collector/lib/CollectorStatsExporter.cpp +++ b/collector/lib/CollectorStatsExporter.cpp @@ -4,13 +4,13 @@ #include #include -#include "Containers.h" #include "EventNames.h" -#include "Utility.h" #include "log/Logging.h" #include "prometheus/gauge.h" #include "prometheus/summary.h" #include "system-inspector/Service.h" +#include "utils/Containers.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/CollectorStatsExporter.h b/collector/lib/CollectorStatsExporter.h index 60d2547481..be077a3857 100644 --- a/collector/lib/CollectorStatsExporter.h +++ b/collector/lib/CollectorStatsExporter.h @@ -5,9 +5,9 @@ #include "CollectorConfig.h" #include "CollectorStats.h" -#include "StoppableThread.h" #include "prometheus/registry.h" #include "system-inspector/Service.h" +#include "utils/StoppableThread.h" namespace collector { diff --git a/collector/lib/ConfigLoader.cpp b/collector/lib/ConfigLoader.cpp index 74bb71e47a..267c8bd3d1 100644 --- a/collector/lib/ConfigLoader.cpp +++ b/collector/lib/ConfigLoader.cpp @@ -6,8 +6,8 @@ #include "internalapi/sensor/collector.pb.h" -#include "EnvVar.h" #include "log/Logging.h" +#include "utils/EnvVar.h" namespace collector { diff --git a/collector/lib/ConfigLoader.h b/collector/lib/ConfigLoader.h index b2ec409942..f3eeda827c 100644 --- a/collector/lib/ConfigLoader.h +++ b/collector/lib/ConfigLoader.h @@ -10,7 +10,7 @@ #include "CollectorConfig.h" #include "Inotify.h" -#include "StoppableThread.h" +#include "utils/StoppableThread.h" namespace collector { diff --git a/collector/lib/ConnTracker.cpp b/collector/lib/ConnTracker.cpp index 64c7c93c62..1fe9fe02e1 100644 --- a/collector/lib/ConnTracker.cpp +++ b/collector/lib/ConnTracker.cpp @@ -3,9 +3,9 @@ #include #include "CollectorStats.h" -#include "Containers.h" -#include "Utility.h" #include "log/Logging.h" +#include "utils/Containers.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/ConnTracker.h b/collector/lib/ConnTracker.h index 5f5cdf9b53..fd28054012 100644 --- a/collector/lib/ConnTracker.h +++ b/collector/lib/ConnTracker.h @@ -4,10 +4,10 @@ #include #include -#include "Containers.h" -#include "Hash.h" -#include "NRadix.h" #include "NetworkConnection.h" +#include "utils/Containers.h" +#include "utils/Hash.h" +#include "utils/NRadix.h" namespace collector { diff --git a/collector/lib/HostInfo.cpp b/collector/lib/HostInfo.cpp index 870c663ea6..462fff8a7b 100644 --- a/collector/lib/HostInfo.cpp +++ b/collector/lib/HostInfo.cpp @@ -29,8 +29,8 @@ You should have received a copy of the GNU General Public License along with thi #include #include -#include "FileSystem.h" #include "log/Logging.h" +#include "utils/FileSystem.h" namespace collector { diff --git a/collector/lib/HostInfo.h b/collector/lib/HostInfo.h index 4f83ad8a8d..489b50a507 100644 --- a/collector/lib/HostInfo.h +++ b/collector/lib/HostInfo.h @@ -32,8 +32,8 @@ extern "C" { #include #include -#include "Utility.h" #include "log/Logging.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/Inotify.h b/collector/lib/Inotify.h index d542cd1cfe..71263c2f47 100644 --- a/collector/lib/Inotify.h +++ b/collector/lib/Inotify.h @@ -11,8 +11,8 @@ #include -#include "Utility.h" #include "log/Logging.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/KernelDriver.h b/collector/lib/KernelDriver.h index d5dcab1213..105743b4e9 100644 --- a/collector/lib/KernelDriver.h +++ b/collector/lib/KernelDriver.h @@ -12,10 +12,10 @@ extern "C" { #include "CollectorConfig.h" #include "EventNames.h" -#include "FileSystem.h" -#include "Utility.h" #include "log/Logging.h" #include "system-inspector/Service.h" +#include "utils/FileSystem.h" +#include "utils/Utility.h" extern const struct syscall_evt_pair g_syscall_table[]; // defined in libscap static const unsigned long DRIVER_BUFFER_DIM = 16UL * 1024UL * 1024UL; diff --git a/collector/lib/NetworkConnection.h b/collector/lib/NetworkConnection.h index e51486fe6b..52d6da74d3 100644 --- a/collector/lib/NetworkConnection.h +++ b/collector/lib/NetworkConnection.h @@ -15,8 +15,8 @@ #include #include -#include "Hash.h" #include "Process.h" +#include "utils/Hash.h" namespace collector { diff --git a/collector/lib/NetworkConnectionInfoServiceComm.cpp b/collector/lib/NetworkConnectionInfoServiceComm.cpp index a34447d771..c7df8513cb 100644 --- a/collector/lib/NetworkConnectionInfoServiceComm.cpp +++ b/collector/lib/NetworkConnectionInfoServiceComm.cpp @@ -1,8 +1,9 @@ #include "NetworkConnectionInfoServiceComm.h" -#include "GRPCUtil.h" +#include "grpc/GRPCUtil.h" + #include "HostInfo.h" -#include "Utility.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/NetworkConnectionInfoServiceComm.h b/collector/lib/NetworkConnectionInfoServiceComm.h index d587545ff2..e0df5912ce 100644 --- a/collector/lib/NetworkConnectionInfoServiceComm.h +++ b/collector/lib/NetworkConnectionInfoServiceComm.h @@ -3,6 +3,7 @@ #include +#include "grpc/DuplexGRPC.h" #include #include #include @@ -11,8 +12,6 @@ #include "internalapi/sensor/network_connection_iservice.grpc.pb.h" -#include "DuplexGRPC.h" - namespace collector { // Gathers all the communication routines targeted at NetworkConnectionInfoService. diff --git a/collector/lib/NetworkStatusNotifier.cpp b/collector/lib/NetworkStatusNotifier.cpp index b8af110187..3b863d3212 100644 --- a/collector/lib/NetworkStatusNotifier.cpp +++ b/collector/lib/NetworkStatusNotifier.cpp @@ -1,16 +1,16 @@ #include "NetworkStatusNotifier.h" +#include "grpc/DuplexGRPC.h" +#include "grpc/GRPCUtil.h" #include #include "CollectorStats.h" -#include "DuplexGRPC.h" -#include "GRPCUtil.h" #include "Profiler.h" #include "ProtoUtil.h" #include "RateLimit.h" -#include "TimeUtil.h" -#include "Utility.h" #include "log/Logging.h" +#include "utils/TimeUtil.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/NetworkStatusNotifier.h b/collector/lib/NetworkStatusNotifier.h index aedd0ea000..b1a5657d3e 100644 --- a/collector/lib/NetworkStatusNotifier.h +++ b/collector/lib/NetworkStatusNotifier.h @@ -12,7 +12,7 @@ #include "ProcfsScraper.h" #include "ProtoAllocator.h" #include "RateLimit.h" -#include "StoppableThread.h" +#include "utils/StoppableThread.h" namespace collector { diff --git a/collector/lib/ProcessSignalFormatter.cpp b/collector/lib/ProcessSignalFormatter.cpp index 7490b7b3d1..7cd34d4b01 100644 --- a/collector/lib/ProcessSignalFormatter.cpp +++ b/collector/lib/ProcessSignalFormatter.cpp @@ -8,9 +8,9 @@ #include "CollectorStats.h" #include "EventMap.h" -#include "Utility.h" #include "log/Logging.h" #include "system-inspector/EventExtractor.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/ProcfsScraper.cpp b/collector/lib/ProcfsScraper.cpp index b703275383..a92355fdf6 100644 --- a/collector/lib/ProcfsScraper.cpp +++ b/collector/lib/ProcfsScraper.cpp @@ -10,12 +10,12 @@ #include #include "CollectorStats.h" -#include "Containers.h" -#include "FileSystem.h" -#include "Hash.h" #include "ProcfsScraper_internal.h" -#include "Utility.h" #include "log/Logging.h" +#include "utils/Containers.h" +#include "utils/FileSystem.h" +#include "utils/Hash.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/ProfilerHandler.cpp b/collector/lib/ProfilerHandler.cpp index 4dcf012589..5c3bd272ca 100644 --- a/collector/lib/ProfilerHandler.cpp +++ b/collector/lib/ProfilerHandler.cpp @@ -8,8 +8,8 @@ #include #include "Profiler.h" -#include "Utility.h" #include "log/Logging.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/RateLimit.cpp b/collector/lib/RateLimit.cpp index 6356943b89..a487ec0d9b 100644 --- a/collector/lib/RateLimit.cpp +++ b/collector/lib/RateLimit.cpp @@ -1,9 +1,9 @@ #include "RateLimit.h" #include "CollectorStats.h" -#include "TimeUtil.h" -#include "Utility.h" #include "log/Logging.h" +#include "utils/TimeUtil.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/RateLimit.h b/collector/lib/RateLimit.h index 2c92c11ccd..93591e8585 100644 --- a/collector/lib/RateLimit.h +++ b/collector/lib/RateLimit.h @@ -3,7 +3,7 @@ #include -#include "Utility.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/SelfChecks.cpp b/collector/lib/SelfChecks.cpp index cf97129070..c78642167b 100644 --- a/collector/lib/SelfChecks.cpp +++ b/collector/lib/SelfChecks.cpp @@ -5,8 +5,8 @@ #include -#include "Utility.h" #include "log/Logging.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/SignalServiceClient.cpp b/collector/lib/SignalServiceClient.cpp index 6cbcf6bbe3..0863b3bc38 100644 --- a/collector/lib/SignalServiceClient.cpp +++ b/collector/lib/SignalServiceClient.cpp @@ -2,10 +2,11 @@ #include -#include "GRPCUtil.h" +#include "grpc/GRPCUtil.h" + #include "ProtoUtil.h" -#include "Utility.h" #include "log/Logging.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/SignalServiceClient.h b/collector/lib/SignalServiceClient.h index 668989f609..8f443db595 100644 --- a/collector/lib/SignalServiceClient.h +++ b/collector/lib/SignalServiceClient.h @@ -6,6 +6,7 @@ #include +#include "grpc/DuplexGRPC.h" #include #include #include @@ -13,9 +14,8 @@ #include "api/v1/signal.pb.h" #include "internalapi/sensor/signal_iservice.grpc.pb.h" -#include "DuplexGRPC.h" #include "SignalHandler.h" -#include "StoppableThread.h" +#include "utils/StoppableThread.h" namespace collector { diff --git a/collector/lib/grpc/CMakeLists.txt b/collector/lib/grpc/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/collector/lib/DuplexGRPC.h b/collector/lib/grpc/DuplexGRPC.h similarity index 99% rename from collector/lib/DuplexGRPC.h rename to collector/lib/grpc/DuplexGRPC.h index efa6e5f04a..cb655d56ef 100644 --- a/collector/lib/DuplexGRPC.h +++ b/collector/lib/grpc/DuplexGRPC.h @@ -7,7 +7,7 @@ #include #include -#include "Utility.h" +#include "utils/Utility.h" // This file defines an alternative client interface for bidirectional GRPC streams. The interface supports: // - simultaneous reading and writing without multithreading or low-level completion queue/tag work. diff --git a/collector/lib/GRPC.cpp b/collector/lib/grpc/GRPC.cpp similarity index 99% rename from collector/lib/GRPC.cpp rename to collector/lib/grpc/GRPC.cpp index f835bdf990..000127cf16 100644 --- a/collector/lib/GRPC.cpp +++ b/collector/lib/grpc/GRPC.cpp @@ -1,4 +1,4 @@ -#include "GRPC.h" +#include "grpc/GRPC.h" #include #include diff --git a/collector/lib/GRPC.h b/collector/lib/grpc/GRPC.h similarity index 100% rename from collector/lib/GRPC.h rename to collector/lib/grpc/GRPC.h diff --git a/collector/lib/GRPCUtil.cpp b/collector/lib/grpc/GRPCUtil.cpp similarity index 95% rename from collector/lib/GRPCUtil.cpp rename to collector/lib/grpc/GRPCUtil.cpp index 6ed7629b5a..f4162bf81b 100644 --- a/collector/lib/GRPCUtil.cpp +++ b/collector/lib/grpc/GRPCUtil.cpp @@ -1,4 +1,4 @@ -#include "GRPCUtil.h" +#include "grpc/GRPCUtil.h" namespace collector { diff --git a/collector/lib/GRPCUtil.h b/collector/lib/grpc/GRPCUtil.h similarity index 100% rename from collector/lib/GRPCUtil.h rename to collector/lib/grpc/GRPCUtil.h diff --git a/collector/lib/log/CMakeLists.txt b/collector/lib/log/CMakeLists.txt deleted file mode 100644 index 8b1f2b0dff..0000000000 --- a/collector/lib/log/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ - -add_library(collector_logging STATIC Logging.cpp Logging.h LogLevel.cpp LogLevel.h) diff --git a/collector/lib/system-inspector/Service.cpp b/collector/lib/system-inspector/Service.cpp index 9495d886cc..1d8d16f863 100644 --- a/collector/lib/system-inspector/Service.cpp +++ b/collector/lib/system-inspector/Service.cpp @@ -25,10 +25,10 @@ #include "ProcessSignalHandler.h" #include "SelfCheckHandler.h" #include "SelfChecks.h" -#include "TimeUtil.h" -#include "Utility.h" #include "log/Logging.h" #include "logger.h" +#include "utils/TimeUtil.h" +#include "utils/Utility.h" namespace collector::system_inspector { diff --git a/collector/lib/utils/CMakeLists.txt b/collector/lib/utils/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/collector/lib/Containers.h b/collector/lib/utils/Containers.h similarity index 100% rename from collector/lib/Containers.h rename to collector/lib/utils/Containers.h diff --git a/collector/lib/EnvVar.h b/collector/lib/utils/EnvVar.h similarity index 99% rename from collector/lib/EnvVar.h rename to collector/lib/utils/EnvVar.h index 45a1a41b1f..786c1963cc 100644 --- a/collector/lib/EnvVar.h +++ b/collector/lib/utils/EnvVar.h @@ -13,8 +13,8 @@ #include #include -#include "Utility.h" #include "log/Logging.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/FileSystem.h b/collector/lib/utils/FileSystem.h similarity index 99% rename from collector/lib/FileSystem.h rename to collector/lib/utils/FileSystem.h index abe7acfa6a..d2ed271c55 100644 --- a/collector/lib/FileSystem.h +++ b/collector/lib/utils/FileSystem.h @@ -10,8 +10,8 @@ #include #include -#include "Utility.h" #include "log/Logging.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/Hash.h b/collector/lib/utils/Hash.h similarity index 100% rename from collector/lib/Hash.h rename to collector/lib/utils/Hash.h diff --git a/collector/lib/NRadix.cpp b/collector/lib/utils/NRadix.cpp similarity index 99% rename from collector/lib/NRadix.cpp rename to collector/lib/utils/NRadix.cpp index 911be3b140..60830f09a4 100644 --- a/collector/lib/NRadix.cpp +++ b/collector/lib/utils/NRadix.cpp @@ -26,9 +26,9 @@ * SUCH DAMAGE. */ -#include "NRadix.h" +#include "utils/NRadix.h" -#include "Utility.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/NRadix.h b/collector/lib/utils/NRadix.h similarity index 99% rename from collector/lib/NRadix.h rename to collector/lib/utils/NRadix.h index b0b413a408..189f27c677 100644 --- a/collector/lib/NRadix.h +++ b/collector/lib/utils/NRadix.h @@ -32,8 +32,8 @@ #include #include "NetworkConnection.h" -#include "Utility.h" #include "log/Logging.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/StoppableThread.cpp b/collector/lib/utils/StoppableThread.cpp similarity index 95% rename from collector/lib/StoppableThread.cpp rename to collector/lib/utils/StoppableThread.cpp index 13e05444d2..bb855e74f5 100644 --- a/collector/lib/StoppableThread.cpp +++ b/collector/lib/utils/StoppableThread.cpp @@ -1,9 +1,9 @@ -#include "StoppableThread.h" +#include "utils/StoppableThread.h" #include #include -#include "Utility.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/StoppableThread.h b/collector/lib/utils/StoppableThread.h similarity index 100% rename from collector/lib/StoppableThread.h rename to collector/lib/utils/StoppableThread.h diff --git a/collector/lib/TimeUtil.h b/collector/lib/utils/TimeUtil.h similarity index 100% rename from collector/lib/TimeUtil.h rename to collector/lib/utils/TimeUtil.h diff --git a/collector/lib/Utility.cpp b/collector/lib/utils/Utility.cpp similarity index 99% rename from collector/lib/Utility.cpp rename to collector/lib/utils/Utility.cpp index e859a73642..e5ef7a8ace 100644 --- a/collector/lib/Utility.cpp +++ b/collector/lib/utils/Utility.cpp @@ -22,8 +22,8 @@ extern "C" { #include #include "HostInfo.h" -#include "Utility.h" #include "log/Logging.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/lib/Utility.h b/collector/lib/utils/Utility.h similarity index 100% rename from collector/lib/Utility.h rename to collector/lib/utils/Utility.h diff --git a/collector/test/ConnTrackerTest.cpp b/collector/test/ConnTrackerTest.cpp index 83e07445a6..d7cd0ce522 100644 --- a/collector/test/ConnTrackerTest.cpp +++ b/collector/test/ConnTrackerTest.cpp @@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License along with thi #include #include "ConnTracker.h" -#include "TimeUtil.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "utils/TimeUtil.h" namespace collector { diff --git a/collector/test/NRadixTest.cpp b/collector/test/NRadixTest.cpp index 8f4ef7650a..b5afa088d5 100644 --- a/collector/test/NRadixTest.cpp +++ b/collector/test/NRadixTest.cpp @@ -1,9 +1,9 @@ #include -#include "Containers.h" -#include "NRadix.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "utils/Containers.h" +#include "utils/NRadix.h" namespace collector { diff --git a/collector/test/NetworkConnectionTest.cpp b/collector/test/NetworkConnectionTest.cpp index ae4c02f9c6..937c2925ac 100644 --- a/collector/test/NetworkConnectionTest.cpp +++ b/collector/test/NetworkConnectionTest.cpp @@ -1,9 +1,9 @@ #include #include "NetworkConnection.h" -#include "Utility.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/test/NetworkStatusNotifierTest.cpp b/collector/test/NetworkStatusNotifierTest.cpp index edf0cd861c..8fae3204f8 100644 --- a/collector/test/NetworkStatusNotifierTest.cpp +++ b/collector/test/NetworkStatusNotifierTest.cpp @@ -2,18 +2,18 @@ #include #include +#include "grpc/DuplexGRPC.h" #include #include "internalapi/sensor/network_connection_iservice.grpc.pb.h" #include "CollectorArgs.h" #include "CollectorConfig.h" -#include "DuplexGRPC.h" #include "NetworkStatusNotifier.h" #include "RateLimit.h" -#include "Utility.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "utils/Utility.h" namespace collector { diff --git a/collector/test/ProcessSignalFormatterTest.cpp b/collector/test/ProcessSignalFormatterTest.cpp index 68e1fcb9c7..fe87c4c7cc 100644 --- a/collector/test/ProcessSignalFormatterTest.cpp +++ b/collector/test/ProcessSignalFormatterTest.cpp @@ -1,5 +1,5 @@ // clang-format off -#include +#include "utils/Utility.h" #include "libsinsp/sinsp.h" // clang-format on diff --git a/collector/test/UtilityTest.cpp b/collector/test/UtilityTest.cpp index f5dee2b865..236f4e48f0 100644 --- a/collector/test/UtilityTest.cpp +++ b/collector/test/UtilityTest.cpp @@ -1,9 +1,9 @@ #include #include -#include "Utility.cpp" #include "gmock/gmock.h" #include "gtest/gtest.h" +#include "utils/Utility.cpp" using namespace testing;