rebase main

alibaba · Jan 23, 2025 · 8c0850b · 8c0850b
1 parent 96f80a9
commit 8c0850b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 20 deletions.
diff --git a/core/ebpf/Config.cpp b/core/ebpf/Config.cpp
@@ -215,7 +215,7 @@ bool InitObserverNetworkOption(const Json::Value& config,
 }
 
 void InitSecurityFileFilter(const Json::Value& config,
-                            logtail::ebpf::ObserverNetworkOption& thisObserverNetworkOption,
+                            SecurityFileFilter& thisFileFilter,
                             const CollectionPipelineContext* mContext,
                             const std::string& sName) {
     std::string errorMsg;
@@ -242,7 +242,7 @@ void InitSecurityFileFilter(const Json::Value& config,
 }
 
 void InitSecurityNetworkFilter(const Json::Value& config,
-                               logtail::ebpf::ObserverNetworkOption& thisObserverNetworkOption,
+                               SecurityNetworkFilter& thisNetworkFilter,
                                const CollectionPipelineContext* mContext,
                                const std::string& sName) {
     std::string errorMsg;

diff --git a/core/ebpf/handler/HostMetadataHandler.cpp b/core/ebpf/handler/HostMetadataHandler.cpp
@@ -18,14 +18,14 @@
 #include "ebpf/Config.h"
 #include "ebpf/include/export.h"
 #include "metadata/K8sMetadata.h"
-#include "pipeline/PipelineContext.h"
-#include "pipeline/queue/ProcessQueueItem.h"
-#include "pipeline/queue/ProcessQueueManager.h"
+#include "collection_pipeline/CollectionPipelineContext.h"
+#include "collection_pipeline/queue/ProcessQueueItem.h"
+#include "collection_pipeline/queue/ProcessQueueManager.h"
 
 namespace logtail {
 namespace ebpf {
 
-HostMetadataHandler::HostMetadataHandler(const logtail::PipelineContext* ctx,
+HostMetadataHandler::HostMetadataHandler(const CollectionPipelineContext* ctx,
                                          QueueKey key,
                                          uint32_t idx,
                                          int intervalSec)

diff --git a/core/ebpf/handler/HostMetadataHandler.h b/core/ebpf/handler/HostMetadataHandler.h
@@ -44,7 +44,7 @@ class HostMetadataHandler : public AbstractHandler {
 public:
     using UpdatePluginCallbackFunc = std::function<bool(
         PluginType, /*UpdataType updateType, */ const std::variant<SecurityOptions*, ObserverNetworkOption*>)>;
-    HostMetadataHandler(const logtail::PipelineContext* ctx, QueueKey key, uint32_t idx, int intervalSec = 60);
+    HostMetadataHandler(const CollectionPipelineContext* ctx, QueueKey key, uint32_t idx, int intervalSec = 60);
     ~HostMetadataHandler();
     void RegisterUpdatePluginCallback(UpdatePluginCallbackFunc&& fn) { mUpdateFunc = fn; }
     void DegisterUpdatePluginCallback() { mUpdateFunc = nullptr; }

diff --git a/core/ebpf/plugin/AbstractManager.h b/core/ebpf/plugin/AbstractManager.h
@@ -25,6 +25,7 @@
 #include "common/Lock.h"
 #include "common/magic_enum.hpp"
 #include "common/timer/Timer.h"
+#include "common/queue/blockingconcurrentqueue.h"
 #include "ebpf/Config.h"
 #include "ebpf/SourceManager.h"
 #include "ebpf/include/export.h"
@@ -113,7 +114,7 @@ class AbstractManager {
         return 0;
     }
 
-    void UpdateContext(const logtail::PipelineContext* ctx, logtail::QueueKey key, uint32_t index) {
+    void UpdateContext(const CollectionPipelineContext* ctx, logtail::QueueKey key, uint32_t index) {
         std::lock_guard lk(mContextMutex);
         mPipelineCtx = ctx;
         mQueueKey = key;
@@ -145,7 +146,7 @@ class AbstractManager {
 
     mutable std::mutex mContextMutex;
     // mPipelineCtx/mQueueKey/mPluginIndex is guarded by mContextMutex
-    const PipelineContext* mPipelineCtx{nullptr};
+    const CollectionPipelineContext* mPipelineCtx{nullptr};
     logtail::QueueKey mQueueKey = 0;
     uint32_t mPluginIndex{0};
 

diff --git a/core/ebpf/plugin/file_security/FileSecurityManager.cpp b/core/ebpf/plugin/file_security/FileSecurityManager.cpp
@@ -18,9 +18,9 @@
 #include "ebpf/Config.h"
 #include "ebpf/type/PeriodicalEvent.h"
 #include "logger/Logger.h"
-#include "pipeline/PipelineContext.h"
-#include "pipeline/queue/ProcessQueueItem.h"
-#include "pipeline/queue/ProcessQueueManager.h"
+#include "collection_pipeline/CollectionPipelineContext.h"
+#include "collection_pipeline/queue/ProcessQueueItem.h"
+#include "collection_pipeline/queue/ProcessQueueManager.h"
 
 namespace logtail {
 namespace ebpf {

diff --git a/core/ebpf/plugin/network_observer/NetworkObserverManager.cpp b/core/ebpf/plugin/network_observer/NetworkObserverManager.cpp
@@ -23,8 +23,8 @@
 #include "ebpf/util/TraceId.h"
 #include "logger/Logger.h"
 #include "models/StringView.h"
-#include "pipeline/queue/ProcessQueueItem.h"
-#include "pipeline/queue/ProcessQueueManager.h"
+#include "collection_pipeline/queue/ProcessQueueItem.h"
+#include "collection_pipeline/queue/ProcessQueueManager.h"
 
 extern "C" {
 #include <net.h>

diff --git a/core/ebpf/plugin/network_security/NetworkSecurityManager.cpp b/core/ebpf/plugin/network_security/NetworkSecurityManager.cpp
@@ -21,9 +21,9 @@
 #include "ebpf/type/table/BaseElements.h"
 #include "logger/Logger.h"
 #include "models/PipelineEventGroup.h"
-#include "pipeline/PipelineContext.h"
-#include "pipeline/queue/ProcessQueueItem.h"
-#include "pipeline/queue/ProcessQueueManager.h"
+#include "collection_pipeline/CollectionPipelineContext.h"
+#include "collection_pipeline/queue/ProcessQueueItem.h"
+#include "collection_pipeline/queue/ProcessQueueManager.h"
 
 namespace logtail {
 namespace ebpf {

diff --git a/core/ebpf/plugin/process_security/ProcessSecurityManager.cpp b/core/ebpf/plugin/process_security/ProcessSecurityManager.cpp
@@ -26,9 +26,9 @@
 #include "ebpf/plugin/BaseManager.h"
 #include "ebpf/type/NetworkObserverEvent.h"
 #include "ebpf/type/PeriodicalEvent.h"
-#include "pipeline/PipelineContext.h"
-#include "pipeline/queue/ProcessQueueItem.h"
-#include "pipeline/queue/ProcessQueueManager.h"
+#include "collection_pipeline/CollectionPipelineContext.h"
+#include "collection_pipeline/queue/ProcessQueueItem.h"
+#include "collection_pipeline/queue/ProcessQueueManager.h"
 
 namespace logtail {
 namespace ebpf {