send discovered services to standard output (#38)

* send discovered services to standard output * Update libebpfdiscoveryproto/src/Translator.cpp Co-authored-by: Jakub Rak <[email protected]> * Update libservice/src/Aggregator.cpp Co-authored-by: Jakub Rak <[email protected]> * Update libservice/src/Aggregator.cpp Co-authored-by: Jakub Rak <[email protected]> * Update libservice/test/AggregatorTest.cpp Co-authored-by: Jakub Rak <[email protected]> * PR comments applied * lock mutex on reading program status * post conflict resolution fixes * clean up proto CMakeLists.txt * fix inclusion of StringFunctions.h * don't wait for servicesProvidingLoop sleep to finish when exiting program * Update libservice/src/Aggregator.cpp Co-authored-by: Jakub Rak <[email protected]> * Update libservice/src/Aggregator.cpp Co-authored-by: Jakub Rak <[email protected]> * Update libservice/src/Aggregator.cpp Co-authored-by: Jakub Rak <[email protected]> * use brackets --------- Co-authored-by: Jakub Rak <[email protected]>
dynatrace-oss · Oct 25, 2023 · fae1515 · fae1515
1 parent 3b586f3
commit fae1515
Show file tree

Hide file tree

Showing 22 changed files with 477 additions and 90 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,91 +11,91 @@ set(CMAKE_CXX_EXTENSIONS FALSE)
 
 # Set BpfObject input parameters -- note this is usually not necessary unless
 # you're in a highly vendored environment
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
-	set(ARCH "x86")
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
-	set(ARCH "arm")
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
-	set(ARCH "arm64")
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64le")
-	set(ARCH "powerpc")
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
-	set(ARCH "mips")
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "riscv64")
-	set(ARCH "riscv")
-elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "loongarch64")
-	set(ARCH "loongarch")
-endif()
+if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
+    set(ARCH "x86")
+elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+    set(ARCH "arm")
+elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
+    set(ARCH "arm64")
+elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64le")
+    set(ARCH "powerpc")
+elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "mips")
+    set(ARCH "mips")
+elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "riscv64")
+    set(ARCH "riscv")
+elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "loongarch64")
+    set(ARCH "loongarch")
+endif ()
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-	set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-endif()
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+endif ()
 
-if("${PROJECT_VERSION}" STREQUAL "")
-	message(FATAL_ERROR "Project version has not been provided\n    Please, provide project version using -DPROJECT_VERSION")
-endif()
+if ("${PROJECT_VERSION}" STREQUAL "")
+    message(FATAL_ERROR "Project version has not been provided\n    Please, provide project version using -DPROJECT_VERSION")
+endif ()
 
 string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _ "${PROJECT_VERSION}")
-if(NOT CMAKE_MATCH_COUNT EQUAL 3)
-	message(FATAL_ERROR "Incorrect project version number format: ${PROJECT_VERSION}. Please provide the project version number in the format major.minor.patch")
-endif()
+if (NOT CMAKE_MATCH_COUNT EQUAL 3)
+    message(FATAL_ERROR "Incorrect project version number format: ${PROJECT_VERSION}. Please provide the project version number in the format major.minor.patch")
+endif ()
 
 project(
-	${_project_name} VERSION "${PROJECT_VERSION}" LANGUAGES C CXX
+        ${_project_name} VERSION "${PROJECT_VERSION}" LANGUAGES C CXX
 )
 
 set(BPF_C_FLAGS ${BPF_C_FLAGS} -DTARGET_BPF)
 
 # Set DEBUG macro in debug build and add additional warnings
 set(EXTRA_DEBUG_FLAGS -DDEBUG -Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers)
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-	add_compile_options(${EXTRA_DEBUG_FLAGS})
-	set(BPF_C_FLAGS ${BPF_C_FLAGS} ${EXTRA_DEBUG_FLAGS})
-endif()
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_compile_options(${EXTRA_DEBUG_FLAGS})
+    set(BPF_C_FLAGS ${BPF_C_FLAGS} ${EXTRA_DEBUG_FLAGS})
+endif ()
 
 set(Boost_USE_STATIC_LIBS ON)
 find_package(Boost REQUIRED COMPONENTS program_options)
-if(Boost_FOUND)
-	include_directories(${Boost_INCLUDE_DIRS})
-endif()
+if (Boost_FOUND)
+    include_directories(${Boost_INCLUDE_DIRS})
+endif ()
 
-if(NOT TARGET fmt)
-	find_package(fmt REQUIRED)
-endif(NOT TARGET fmt)
-if(NOT TARGET spdlog)
-	find_package(spdlog REQUIRED)
-endif(NOT TARGET spdlog)
+if (NOT TARGET fmt)
+    find_package(fmt REQUIRED)
+endif (NOT TARGET fmt)
+if (NOT TARGET spdlog)
+    find_package(spdlog REQUIRED)
+endif (NOT TARGET spdlog)
 
 find_package(Protobuf REQUIRED)
 
 
 find_package(Microsoft.GSL REQUIRED)
-if(Microsoft.GSL_FOUND)
-	include_directories(${Microsoft.GSL_INCLUDE_DIRS})
-endif()
+if (Microsoft.GSL_FOUND)
+    include_directories(${Microsoft.GSL_INCLUDE_DIRS})
+endif ()
 
 set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of googletest" FORCE)
 
-if(BUILD_TESTS OR BUILD_BPF_TESTS)
-	include(FetchContent)
-	FetchContent_Declare(googletest URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip)
-	FetchContent_MakeAvailable(googletest)
+if (BUILD_TESTS OR BUILD_BPF_TESTS)
+    include(FetchContent)
+    FetchContent_Declare(googletest URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip)
+    FetchContent_MakeAvailable(googletest)
 
-	include(CTest)
-	include(GoogleTest)
-	enable_testing()
+    include(CTest)
+    include(GoogleTest)
+    enable_testing()
 
-	add_custom_target(run-tests COMMAND ${CMAKE_CTEST_COMMAND} -T Test --no-compress-output --output-on-failure USES_TERMINAL)
-endif()
+    add_custom_target(run-tests COMMAND ${CMAKE_CTEST_COMMAND} -T Test --no-compress-output --output-on-failure USES_TERMINAL)
+endif ()
 
 add_subdirectory(thirdparty)
 execute_process(
-	COMMAND ${CMAKE_COMMAND} -DTHIRDPARTY_MAKE_JOBS_COUNT=${THIRDPARTY_MAKE_JOBS_COUNT} ${PROJECT_SOURCE_DIR}/thirdparty
-	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/thirdparty
+        COMMAND ${CMAKE_COMMAND} -DTHIRDPARTY_MAKE_JOBS_COUNT=${THIRDPARTY_MAKE_JOBS_COUNT} ${PROJECT_SOURCE_DIR}/thirdparty
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/thirdparty
 )
 execute_process(COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/thirdparty)
 
@@ -109,6 +109,7 @@ add_subdirectory(libebpfdiscoveryproto)
 add_subdirectory(libebpfdiscoveryshared)
 add_subdirectory(libebpfdiscoveryskel)
 add_subdirectory(libhttpparser)
+add_subdirectory(libservice)
 add_subdirectory(liblogging)
 
 include(GNUInstallDirs)

diff --git a/ebpfdiscoverysrv/CMakeLists.txt b/ebpfdiscoverysrv/CMakeLists.txt
@@ -6,4 +6,6 @@ add_executable(${TARGET} ${SOURCES})
 target_link_libraries(${TARGET} Boost::program_options)
 target_link_libraries(${TARGET} ebpfdiscovery)
 target_link_libraries(${TARGET} logging)
+target_link_libraries(${TARGET} service)
+target_link_libraries(${TARGET} ebpfdiscoveryproto)
 target_compile_definitions(${TARGET} PUBLIC PROJECT_VERSION="${PROJECT_VERSION}")
diff --git a/ebpfdiscoverysrv/src/main.cpp b/ebpfdiscoverysrv/src/main.cpp
@@ -2,6 +2,7 @@
 #include "ebpfdiscovery/Discovery.h"
 #include "ebpfdiscovery/DiscoveryBpf.h"
 #include "ebpfdiscovery/DiscoveryBpfLoader.h"
+#include "ebpfdiscoveryproto/Translator.h"
 #include "logging/Logger.h"
 
 #include <boost/program_options.hpp>
@@ -41,6 +42,7 @@ static po::options_description getProgramOptions() {
       ("log-level", po::value<logging::LogLevel>()->default_value(logging::LogLevel::Err, "error"), "Set log level {trace,debug,info,warning,error,critical,off}")
       ("log-no-stdout", po::bool_switch()->default_value(false), "Disable logging to stdout")
       ("version", "Display program version")
+      ("interval", po::value<int>()->default_value(60), "Services reporting time interval (in seconds)")
   ;
 	// clang-format on
 
@@ -110,6 +112,19 @@ static void initLibbpf() {
 	libbpf_set_print(libbpfPrintFn);
 }
 
+void servicesProvidingLoop(ebpfdiscovery::Discovery& discoveryInstance, std::chrono::seconds interval) {
+	std::unique_lock<std::mutex> lock(programStatusMutex);
+	while (programStatus == ProgramStatus::Running) {
+		if (auto services = discoveryInstance.popServices(); !services.empty()) {
+			auto servicesProto = proto::internalToProto(services);
+			LOG_DEBUG("Services list:\n{}\n", servicesProto.DebugString());
+			auto servicesJson = proto::protoToJson(servicesProto);
+			std::cout << servicesJson << std::endl;
+		}
+		programStatusCV.wait_for(lock, interval);
+	}
+}
+
 int main(int argc, char** argv) {
 	po::options_description desc{getProgramOptions()};
 	po::variables_map vm;
@@ -172,6 +187,7 @@ int main(int argc, char** argv) {
 	}
 
 	if (!isLaunchTest) {
+		std::thread servicesProvider(servicesProvidingLoop, std::ref(instance), std::chrono::seconds(vm["interval"].as<int>()));
 		std::thread unixSignalThread(runUnixSignalHandlerLoop);
 		{
 			std::unique_lock<std::mutex> programStatusLock(programStatusMutex);
@@ -182,6 +198,10 @@ int main(int argc, char** argv) {
 		if (unixSignalThread.joinable()) {
 			unixSignalThread.join();
 		}
+		LOG_TRACE("Waiting for services providing thread to exit.");
+		if (servicesProvider.joinable()) {
+			servicesProvider.join();
+		}
 	}
 
 	LOG_DEBUG("Exiting the program.");

diff --git a/libebpfdiscovery/CMakeLists.txt b/libebpfdiscovery/CMakeLists.txt
@@ -1,14 +1,14 @@
 list(
-	APPEND
-	SOURCES
-	src/Config.cpp
-	src/Discovery.cpp
-	src/DiscoveryBpf.cpp
-	src/DiscoveryBpfLoader.cpp
-	src/IpAddressChecker.cpp
-	src/NetlinkCalls.cpp
-	src/Session.cpp
-	src/StringFunctions.cpp
+        APPEND
+        SOURCES
+        src/Config.cpp
+        src/Discovery.cpp
+        src/DiscoveryBpf.cpp
+        src/DiscoveryBpfLoader.cpp
+        src/IpAddressChecker.cpp
+        src/NetlinkCalls.cpp
+        src/Session.cpp
+        src/StringFunctions.cpp
 )
 set(TARGET ebpfdiscovery)
 
@@ -24,13 +24,14 @@ target_link_libraries(${TARGET} fmt::fmt)
 target_link_libraries(${TARGET} httpparser)
 target_link_libraries(${TARGET} logging)
 target_link_libraries(${TARGET} spdlog::spdlog)
+target_link_libraries(${TARGET} service)
 
-if(BUILD_TESTS)
-	list(APPEND TEST_SOURCES test/StringFunctionsTest.cpp test/LRUCacheTest.cpp test/IpAddressCheckerTest.cpp)
-	set(TEST_TARGET test${TARGET})
+if (BUILD_TESTS)
+    list(APPEND TEST_SOURCES test/StringFunctionsTest.cpp test/LRUCacheTest.cpp test/IpAddressCheckerTest.cpp)
+    set(TEST_TARGET test${TARGET})
 
-	add_executable(${TEST_TARGET} ${TEST_SOURCES})
-	target_link_libraries(${TEST_TARGET} GTest::gtest_main GTest::gmock_main ${TARGET})
-	target_include_directories(${TEST_TARGET} PRIVATE src)
-	gtest_discover_tests(${TEST_TARGET})
-endif()
+    add_executable(${TEST_TARGET} ${TEST_SOURCES})
+    target_link_libraries(${TEST_TARGET} GTest::gtest_main GTest::gmock_main ${TARGET})
+    target_include_directories(${TEST_TARGET} PRIVATE src)
+    gtest_discover_tests(${TEST_TARGET})
+endif ()
diff --git a/libebpfdiscovery/headers/ebpfdiscovery/Discovery.h b/libebpfdiscovery/headers/ebpfdiscovery/Discovery.h
@@ -7,6 +7,7 @@
 #include "ebpfdiscovery/Session.h"
 #include "ebpfdiscoveryshared/Types.h"
 #include "httpparser/HttpRequestParser.h"
+#include "service/Aggregator.h"
 
 #include <atomic>
 #include <chrono>
@@ -35,8 +36,10 @@ class Discovery {
 	void stop();
 	void wait();
 
+	std::vector<service::Service> popServices();
+
 private:
-	typedef LRUCache<DiscoverySavedSessionKey, Session, DiscoverySavedSessionKeyHash> SavedSessionsCacheType;
+	using SavedSessionsCacheType = LRUCache<DiscoverySavedSessionKey, Session, DiscoverySavedSessionKeyHash>;
 
 	void run();
 
@@ -64,6 +67,9 @@ class Discovery {
 	DiscoveryConfig config;
 	DiscoveryBpf discoveryBpf;
 	SavedSessionsCacheType savedSessions;
+	ebpfdiscovery::NetlinkCalls netlinkCalls;
+	ebpfdiscovery::IpAddressChecker ipChecker{{}, netlinkCalls};
+	service::Aggregator serviceAggregator{ipChecker};
 
 	std::atomic<bool> running{false};
 	bool stopReceived{false};

diff --git a/libebpfdiscovery/headers/ebpfdiscovery/IpAddressChecker.h b/libebpfdiscovery/headers/ebpfdiscovery/IpAddressChecker.h
@@ -4,7 +4,6 @@
 #include <initializer_list>
 #include <vector>
 
-
 namespace ebpfdiscovery {
 
 using IPv4int = uint32_t;
@@ -17,7 +16,12 @@ struct IpIfce {
 	bool isLocalBridge;
 };
 
-class IpAddressChecker {
+class IpAddressCheckerInerface {
+public:
+	virtual bool isAddressExternalLocal(IPv4int addr) = 0;
+};
+
+class IpAddressChecker : public IpAddressCheckerInerface {
 	std::vector<IpIfce> interfaces;
 	std::vector<IpIfce>::iterator bridgeEnd = interfaces.end();
 	const NetlinkCalls& netlink;
@@ -27,13 +31,14 @@ class IpAddressChecker {
 	bool isLoopback(const IpIfce&);
 	void addIpIfce(IpIfce&& ifce);
 	void markBridge(int idx);
+
 protected:
 	void moveBridges();
+
 public:
-	IpAddressChecker(const NetlinkCalls &calls);
-	IpAddressChecker(std::initializer_list<IpIfce> config, const NetlinkCalls &calls);
-	bool isAddressExternalLocal(IPv4int addr);
+	IpAddressChecker(const NetlinkCalls& calls);
+	IpAddressChecker(std::initializer_list<IpIfce> config, const NetlinkCalls& calls);
+	bool isAddressExternalLocal(IPv4int addr) override;
 	bool readNetworks();
 };
 } // namespace ebpfdiscovery
-
diff --git a/libebpfdiscovery/src/StringFunctions.h → ...y/headers/ebpfdiscovery/StringFunctions.h b/libebpfdiscovery/src/StringFunctions.h → ...y/headers/ebpfdiscovery/StringFunctions.h
diff --git a/libebpfdiscovery/src/Config.cpp b/libebpfdiscovery/src/Config.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "ebpfdiscovery/Config.h"
-#include "ebpfdiscoveryproto/example.pb.h"
 
 namespace ebpfdiscovery {
 

diff --git a/libebpfdiscovery/src/Discovery.cpp b/libebpfdiscovery/src/Discovery.cpp
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 #include "ebpfdiscovery/Discovery.h"
 
-#include "StringFunctions.h"
 #include "ebpfdiscovery/Session.h"
+#include "ebpfdiscovery/StringFunctions.h"
 #include "logging/Logger.h"
 
 #include <algorithm>
@@ -174,6 +174,11 @@ void Discovery::handleNewRequest(const Session& session, const DiscoverySessionM
 				request.xForwardedFor,
 				meta.pid);
 	}
+	serviceAggregator.newRequest(request, meta);
+}
+
+std::vector<service::Service> Discovery::popServices() {
+	return serviceAggregator.popServices();
 }
 
 void Discovery::handleCloseEvent(DiscoveryEvent& event) {

diff --git a/libebpfdiscovery/src/StringFunctions.cpp b/libebpfdiscovery/src/StringFunctions.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "StringFunctions.h"
+#include "ebpfdiscovery/StringFunctions.h"
 
 #include <arpa/inet.h>
 

diff --git a/libebpfdiscovery/test/StringFunctionsTest.cpp b/libebpfdiscovery/test/StringFunctionsTest.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-#include "StringFunctions.h"
+#include "ebpfdiscovery/StringFunctions.h"
 
 #include <gtest/gtest.h>