fix: use local container id cache instead of container plugin

collector/CMakeLists.txt

@@ -49,8 +49,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lib/CollectorVersion.h.in ${CMAKE_CUR
 
 set(FALCO_DIR ${PROJECT_SOURCE_DIR}/../falcosecurity-libs)
 
-add_subdirectory(container-plugin)
-
 add_subdirectory(${PROJECT_SOURCE_DIR}/proto)
 
 include_directories(${PROJECT_SOURCE_DIR}/lib)

collector/Makefile

@@ -9,9 +9,9 @@ COLLECTOR_BIN_DIR = $(CMAKE_DIR)/collector
 LIBSINSP_BIN_DIR = $(CMAKE_DIR)/collector/EXCLUDE_FROM_DEFAULT_BUILD/libsinsp
 SRC_MOUNT_DIR = /tmp/collector
 
-HDRS := $(wildcard lib/*.h) $(wildcard container-plugin/*.h) $(shell find $(BASE_PATH)/falcosecurity-libs/userspace -name '*.h')
+HDRS := $(wildcard lib/*.h) $(shell find $(BASE_PATH)/falcosecurity-libs/userspace -name '*.h')
 
-SRCS := $(wildcard lib/*.cpp) $(wildcard container-plugin/*.cpp) collector.cpp
+SRCS := $(wildcard lib/*.cpp) collector.cpp
 
 COLLECTOR_BUILD_DEPS := $(HDRS) $(SRCS) $(shell find $(BASE_PATH)/falcosecurity-libs -name '*.h' -o -name '*.cpp' -o -name '*.c')
 
@@ -40,7 +40,6 @@ container/bin/collector: cmake-build/collector
 	mkdir -p container/libs
 	cp "$(COLLECTOR_BIN_DIR)/collector" container/bin/collector
 	cp "$(COLLECTOR_BIN_DIR)/self-checks" container/bin/self-checks
-	cp "$(COLLECTOR_BIN_DIR)/collector-container-plugin.so" container/libs/collector-container-plugin.so
 
 .PHONY: collector
 collector: container/bin/collector txt-files

collector/container/Dockerfile

@@ -39,7 +39,6 @@ COPY container/THIRD_PARTY_NOTICES/ /THIRD_PARTY_NOTICES/
 COPY kernel-modules /kernel-modules
 COPY container/bin/collector /usr/local/bin/
 COPY container/bin/self-checks /usr/local/bin/self-checks
-COPY container/libs/collector-container-plugin.so /usr/local/lib/collector/collector-container-plugin.so
 COPY container/status-check.sh /usr/local/bin/status-check.sh
 
 EXPOSE 8080 9090

collector/container/dev.Dockerfile

@@ -23,7 +23,6 @@ COPY container/THIRD_PARTY_NOTICES/ /THIRD_PARTY_NOTICES/
 COPY kernel-modules /kernel-modules
 COPY container/bin/collector /usr/local/bin/
 COPY container/bin/self-checks /usr/local/bin/self-checks
-COPY container/libs/collector-container-plugin.so /usr/local/lib/collector/collector-container-plugin.so
 COPY container/status-check.sh /usr/local/bin/status-check.sh
 
 EXPOSE 8080 9090

collector/container/konflux.Dockerfile

@@ -135,7 +135,6 @@ COPY --from=package_installer /out/ /
 
 COPY --from=builder ${CMAKE_BUILD_DIR}/collector/collector /usr/local/bin/
 COPY --from=builder ${CMAKE_BUILD_DIR}/collector/self-checks /usr/local/bin/
-COPY --from=builder ${CMAKE_BUILD_DIR}/collector/collector-container-plugin.so /usr/local/lib/collector/collector-container-plugin.so
 
 COPY LICENSE /licenses/LICENSE
 

collector/lib/CollectorConfig.cpp

@@ -82,7 +82,6 @@ PathEnvVar tls_client_cert_path("ROX_COLLECTOR_TLS_CLIENT_CERT");
 PathEnvVar tls_client_key_path("ROX_COLLECTOR_TLS_CLIENT_KEY");
 
 BoolEnvVar disable_process_arguments("ROX_COLLECTOR_NO_PROCESS_ARGUMENTS", false);
-StringEnvVar container_plugin_path("ROX_COLLECTOR_CONTAINER_PLUGIN_PATH", "/usr/local/lib/collector/collector-container-plugin.so");
 }  // namespace
 
 constexpr bool CollectorConfig::kTurnOffScrape;
@@ -98,7 +97,6 @@ CollectorConfig::CollectorConfig() {
   scrape_interval_ = kScrapeInterval;
   turn_off_scrape_ = kTurnOffScrape;
   collection_method_ = kCollectionMethod;
-  container_plugin_path_ = container_plugin_path.value();
 }
 
 void CollectorConfig::InitCollectorConfig(CollectorArgs* args) {

collector/lib/CollectorConfig.h

@@ -161,7 +161,6 @@ class CollectorConfig {
   unsigned int GetSinspTotalBufferSize() const { return sinsp_total_buffer_size_; }
   unsigned int GetSinspThreadCacheSize() const { return sinsp_thread_cache_size_; }
   bool DisableProcessArguments() const { return disable_process_arguments_; }
-  const std::string& ContainerPluginPath() const { return container_plugin_path_; }
 
   static std::pair<option::ArgStatus, std::string> CheckConfiguration(const char* config, Json::Value* root);
 
@@ -226,7 +225,6 @@ class CollectorConfig {
   std::optional<std::string> grpc_server_;
 
   bool disable_process_arguments_ = false;
-  std::string container_plugin_path_ = "/usr/local/lib/collector/collector-container-plugin.so";
 
   // One ring buffer will be initialized for this many CPUs
   unsigned int sinsp_cpu_per_buffer_ = 0;