update

Author: KayzzzZ

Diff for: core/collection_pipeline/plugin/PluginRegistry.cpp

@@ -69,17 +69,10 @@
 #endif
 
 DEFINE_FLAG_BOOL(enable_processor_spl, "", true);
-#ifdef APSARA_UNIT_TEST_MAIN
-DEFINE_FLAG_BOOL(enable_ebpf_network_observer, "", true);
-DEFINE_FLAG_BOOL(enable_ebpf_process_secure, "", true);
-DEFINE_FLAG_BOOL(enable_ebpf_file_secure, "", true);
-DEFINE_FLAG_BOOL(enable_ebpf_network_secure, "", true);
-#else
 DEFINE_FLAG_BOOL(enable_ebpf_network_observer, "", false);
 DEFINE_FLAG_BOOL(enable_ebpf_process_secure, "", false);
 DEFINE_FLAG_BOOL(enable_ebpf_file_secure, "", false);
 DEFINE_FLAG_BOOL(enable_ebpf_network_secure, "", false);
-#endif
 
 using namespace std;
 

Diff for: core/common/StringTools.h

@@ -19,14 +19,15 @@
 #include <algorithm>
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#include <boost/lexical_cast.hpp>
+#include "boost/lexical_cast.hpp"
 #pragma GCC diagnostic pop
 #include <charconv>
 
-#include <boost/regex.hpp>
 #include <string>
 #include <vector>
 
+#include "boost/regex.hpp"
+
 #include "common/StringView.h"
 
 namespace logtail {

Diff for: core/common/timer/Timer.cpp

@@ -21,7 +21,9 @@ using namespace std;
 namespace logtail {
 
 Timer::~Timer() {
+#ifdef APSARA_UNIT_TEST_MAIN
     Stop();
+#endif
 }
 
 void Timer::Init() {

Diff for: core/common/timer/TimerEvent.h

@@ -31,7 +31,7 @@ class TimerEvent {
     std::chrono::steady_clock::time_point GetExecTime() const { return mExecTime; }
     void SetExecTime(std::chrono::steady_clock::time_point nextExecTime) { mExecTime = nextExecTime; }
 
-protected:
+private:
     std::chrono::steady_clock::time_point mExecTime;
 };
 

Diff for: core/ebpf/plugin/network_observer/Connection.cpp

@@ -144,10 +144,6 @@ void Connection::TryAttachL7Meta(support_role_e role, support_proto_e protocol)
         mTags.Set<kProtocol>(std::string(magic_enum::enum_name(mProtocol)));
     }
 
-    LOG_INFO(sLogger,
-             ("protocol", magic_enum::enum_name(protocol))("role", magic_enum::enum_name(role))(
-                 "mprotocol", magic_enum::enum_name(mProtocol))("mrole", magic_enum::enum_name(mRole)));
-
     if (mProtocol == support_proto_e::ProtoHTTP) {
         if (mRole == support_role_e::IsClient) {
             mTags.SetNoCopy<kRpcType>(kRpc25Str);

Diff for: core/ebpf/plugin/network_observer/NetworkObserverManager.cpp

@@ -1307,16 +1307,6 @@ int NetworkObserverManager::Init(const std::variant<SecurityOptions*, ObserverNe
         mgr->RecordEventLost(type, lostCount);
     };
 
-
-    // register update host K8s metadata task ...
-    if (K8sMetadata::GetInstance().Enable()) {
-        config.mCidOffset = mCidOffset;
-        config.mEnableCidFilter = true;
-        std::shared_ptr<ScheduleConfig> config
-            = std::make_shared<NetworkObserverScheduleConfig>(std::chrono::seconds(5), JobType::HOST_META_UPDATE);
-        ScheduleNext(now, config);
-    }
-
     pc->mConfig = config;
     auto ret = mSourceManager->StartPlugin(PluginType::NETWORK_OBSERVE, std::move(pc));
     if (!ret) {
@@ -1328,6 +1318,16 @@ int NetworkObserverManager::Init(const std::variant<SecurityOptions*, ObserverNe
     LOG_INFO(sLogger, ("begin to start ebpf ... ", ""));
     this->mFlag = true;
     this->runInThread();
+
+    // register update host K8s metadata task ...
+    if (K8sMetadata::GetInstance().Enable()) {
+        config.mCidOffset = mCidOffset;
+        config.mEnableCidFilter = true;
+        std::shared_ptr<ScheduleConfig> config
+            = std::make_shared<NetworkObserverScheduleConfig>(std::chrono::seconds(5), JobType::HOST_META_UPDATE);
+        ScheduleNext(now, config);
+    }
+
     return 0;
 }
 

Diff for: core/ebpf/type/AggregateEvent.cpp

@@ -24,7 +24,7 @@ bool AggregateEvent::Execute() {
         return false;
     }
 
-    return manager->ScheduleNext(mExecTime, mScheduleConfig);
+    return manager->ScheduleNext(GetExecTime(), mScheduleConfig);
 }
 
 bool AggregateEvent::IsValid() const {

Diff for: core/unittest/ebpf/NetworkObserverUnittest.cpp

@@ -46,6 +46,7 @@ class NetworkObserverManagerUnittest : public ::testing::Test {
     void TestHandleHostMetadataUpdate();
     void TestGuessContainerIdOffSet();
     void TestPeriodicalTask();
+    void BenchmarkConsumeTask();
 
 protected:
     void SetUp() override {
@@ -659,6 +660,8 @@ void NetworkObserverManagerUnittest::TestPeriodicalTask() {
     APSARA_TEST_EQUAL(mManager->mExecTimes, 20);
 }
 
+void NetworkObserverManagerUnittest::BenchmarkConsumeTask() {
+}
 
 UNIT_TEST_CASE(NetworkObserverManagerUnittest, TestInitialization);
 UNIT_TEST_CASE(NetworkObserverManagerUnittest, TestEventHandling);
@@ -672,6 +675,7 @@ UNIT_TEST_CASE(NetworkObserverManagerUnittest, TestPluginLifecycle);
 UNIT_TEST_CASE(NetworkObserverManagerUnittest, TestHandleHostMetadataUpdate);
 UNIT_TEST_CASE(NetworkObserverManagerUnittest, TestGuessContainerIdOffSet);
 UNIT_TEST_CASE(NetworkObserverManagerUnittest, TestPeriodicalTask);
+UNIT_TEST_CASE(NetworkObserverManagerUnittest, BenchmarkConsumeTask);
 
 
 } // namespace ebpf