refactor(liblogging): Make Logger the singleton class

dynatrace-oss · Oct 10, 2023 · c15ac42 · c15ac42
1 parent 07a9faf
commit c15ac42
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 43 deletions.
diff --git a/ebpfdiscoverysrv/src/main.cpp b/ebpfdiscoverysrv/src/main.cpp
@@ -2,7 +2,7 @@
 #include "ebpfdiscovery/Discovery.h"
 #include "ebpfdiscovery/DiscoveryBpf.h"
 #include "ebpfdiscovery/DiscoveryBpfLoader.h"
-#include "logging/Global.h"
+#include "logging/Logger.h"
 
 #include <boost/program_options.hpp>
 
@@ -15,6 +15,7 @@
 #include <unistd.h>
 
 namespace po = boost::program_options;
+using logging::Logger;
 using logging::LogLevel;
 
 enum class ProgramStatus {
@@ -56,8 +57,8 @@ static std::string getProgramVersion() {
  */
 
 static void setupLogging(logging::LogLevel logLevel, bool enableStdout, const std::filesystem::path& logDir) {
-	logging::Global::getInstance().setup("eBPF-Discovery", enableStdout, logDir);
-	logging::Global::getInstance().setLevel(logLevel);
+	Logger::getInstance().setup("eBPF-Discovery", enableStdout, logDir);
+	Logger::getInstance().setLevel(logLevel);
 	LOG_TRACE("Logging has been set up. (logDir: {})", logDir.string());
 }
 
@@ -98,13 +99,13 @@ static void runUnixSignalHandlerLoop() {
 static int libbpfPrintFn(enum libbpf_print_level level, const char* format, va_list args) {
 	switch (level) {
 	case LIBBPF_WARN:
-		logging::Global::getInstance().vlogf(logging::LogLevel::Warn, format, args);
+		Logger::getInstance().vlogf(logging::LogLevel::Warn, format, args);
 		return 0;
 	case LIBBPF_INFO:
-		logging::Global::getInstance().vlogf(logging::LogLevel::Info, format, args);
+		Logger::getInstance().vlogf(logging::LogLevel::Info, format, args);
 		return 0;
 	case LIBBPF_DEBUG:
-		logging::Global::getInstance().vlogf(logging::LogLevel::Debug, format, args);
+		Logger::getInstance().vlogf(logging::LogLevel::Debug, format, args);
 		return 0;
 	}
 	return 0;

diff --git a/libebpfdiscovery/src/Discovery.cpp b/libebpfdiscovery/src/Discovery.cpp
@@ -3,7 +3,7 @@
 
 #include "StringFunctions.h"
 #include "ebpfdiscovery/Session.h"
-#include "logging/Global.h"
+#include "logging/Logger.h"
 
 #include <algorithm>
 #include <arpa/inet.h>

diff --git a/libebpfdiscovery/src/DiscoveryBpfLoader.cpp b/libebpfdiscovery/src/DiscoveryBpfLoader.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 #include "ebpfdiscovery/DiscoveryBpfLoader.h"
 
-#include "logging/Global.h"
+#include "logging/Logger.h"
 
 extern "C" {
 #include "bpfload/btf_helpers.h"

diff --git a/liblogging/CMakeLists.txt b/liblogging/CMakeLists.txt
@@ -1,4 +1,4 @@
-list(APPEND SOURCES src/Logger.cpp src/Global.cpp)
+list(APPEND SOURCES src/Logger.cpp)
 set(TARGET logging)
 
 add_library(${TARGET} SHARED ${SOURCES})

diff --git a/liblogging/headers/logging/Global.h b/liblogging/headers/logging/Global.h
diff --git a/liblogging/headers/logging/Logger.h b/liblogging/headers/logging/Logger.h
@@ -37,6 +37,8 @@ class Logger {
 	Logger(const Logger&) = delete;
 	Logger& operator=(const Logger&) = delete;
 
+	static Logger& getInstance();
+
 	void setLevel(enum LogLevel level);
 	void setup(std::string name, bool logToStdout = true, std::filesystem::path logDir = {});
 
@@ -116,3 +118,10 @@ class Logger {
 };
 
 } // namespace logging
+
+#define LOG_TRACE(...) logging::Logger::getInstance().trace(__VA_ARGS__)
+#define LOG_DEBUG(...) logging::Logger::getInstance().debug(__VA_ARGS__)
+#define LOG_INFO(...) logging::Logger::getInstance().info(__VA_ARGS__)
+#define LOG_WARN(...) logging::Logger::getInstance().warn(__VA_ARGS__)
+#define LOG_ERROR(...) logging::Logger::getInstance().error(__VA_ARGS__)
+#define LOG_CRITICAL(...) logging::Logger::getInstance().critical(__VA_ARGS__)
diff --git a/liblogging/src/Global.cpp b/liblogging/src/Global.cpp
diff --git a/liblogging/src/Logger.cpp b/liblogging/src/Logger.cpp
@@ -43,6 +43,11 @@ Logger::Logger() : spdLogger("") {
 	loggerSetDefaults();
 }
 
+Logger& Logger::getInstance() {
+	static Logger instance;
+	return instance;
+}
+
 void Logger::setLevel(enum LogLevel level) {
 	spdLogger.set_level(static_cast<spdlog::level::level_enum>(level));
 }