Bugfix bpf programs have Trace level inited to trace (#89)

* Fix LogLevel default inited to Trace * Bugfix failing ssl uprobes shoudn't cause ebpfdiscovery process exit
dynatrace-oss · May 27, 2024 · 5fcd677 · 5fcd677
1 parent d942671
commit 5fcd677
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/libebpfdiscovery/src/DiscoveryBpf.cpp b/libebpfdiscovery/src/DiscoveryBpf.cpp
@@ -162,7 +162,7 @@ void DiscoveryBpf::attachOpenSSLProbes() {
 	auto isAttached =
 			std::any_of(libNames.begin(), libNames.end(), [this](const auto& libName) { return tryAttachOpenSSLProbesToLibName(libName); });
 	if (!isAttached) {
-		throw std::runtime_error("Couldn't attach OpenSSL probes to any of the libraries");
+		LOG_ERROR("Couldn't attach OpenSSL probes to any of the libraries");
 	}
 }
 

diff --git a/libebpfdiscoveryshared/headers/ebpfdiscoveryshared/Types.h b/libebpfdiscoveryshared/headers/ebpfdiscoveryshared/Types.h
@@ -221,9 +221,9 @@ struct DiscoveryGlobalState {
  */
 
 enum DiscoveryLogLevel {
-	DISCOVERY_LOG_LEVEL_TRACE,
-	DISCOVERY_LOG_LEVEL_DEBUG,
-	DISCOVERY_LOG_LEVEL_OFF,
+	DISCOVERY_LOG_LEVEL_TRACE = 1,
+	DISCOVERY_LOG_LEVEL_DEBUG = 2,
+	DISCOVERY_LOG_LEVEL_OFF = 3,
 };
 
 struct DiscoveryConfig {

diff --git a/libebpfdiscoveryskel/src/Log.h b/libebpfdiscoveryskel/src/Log.h
@@ -42,9 +42,9 @@ __attribute__((always_inline)) inline static int sendDiscoveryLogEvent(struct pt
 __attribute__((always_inline)) inline static enum DiscoveryLogLevel getDiscoveryLogLevel() {
 	const struct DiscoveryConfig* configPtr = getDiscoveryConfig();
 	if (configPtr == NULL) {
-		return 0;
+		return DISCOVERY_LOG_LEVEL_OFF;
 	}
-	return configPtr->logLevel;
+	return (configPtr->logLevel > 0) ? configPtr->logLevel : DISCOVERY_LOG_LEVEL_OFF;
 }
 
 __attribute__((always_inline)) inline static int discoveryLog(