fix test

alibaba · Dec 19, 2024 · f68b24a · f68b24a
1 parent e096805
commit f68b24a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/core/metadata/K8sMetadata.cpp b/core/metadata/K8sMetadata.cpp
@@ -93,6 +93,11 @@ bool K8sMetadata::FromContainerJson(const Json::Value& json, std::shared_ptr<Con
     return true;
 }
 
+void K8sMetadata::ClearCache() {
+    containerCache.clear();
+    ipCache.clear();
+}
+
 bool K8sMetadata::SendRequestToOperator(const std::string& urlHost,
                                         const std::string& output,
                                         containerInfoType infoType) {

diff --git a/core/metadata/K8sMetadata.h b/core/metadata/K8sMetadata.h
@@ -71,11 +71,14 @@ namespace logtail {
             void SetContainerCache(const Json::Value& root);
             bool FromInfoJson(const Json::Value& json, k8sContainerInfo& info);
             bool FromContainerJson(const Json::Value& json, std::shared_ptr<ContainerData> data);
-
         public:
-            static K8sMetadata& GetInstance() {
+            // Destructor
+            ~K8sMetadata() {
+               ClearCache();
+            }
+            static K8sMetadata* GetInstance() {
                 static K8sMetadata instance(500);
-                return instance;
+                return &instance;
             }
             // 公共方法
             //if cache not have,get from server
@@ -87,6 +90,7 @@ namespace logtail {
             // get info by ip from cache
             std::shared_ptr<k8sContainerInfo> GetInfoByIpFromCache(const std::string& ip);
             bool SendRequestToOperator(const std::string& urlHost, const std::string& output, containerInfoType infoType);
+            void ClearCache();
 
     #ifdef APSARA_UNIT_TEST_MAIN
         friend class k8sMetadataUnittest;

diff --git a/core/metadata/LabelingK8sMetadata.cpp b/core/metadata/LabelingK8sMetadata.cpp
@@ -43,11 +43,11 @@ void LabelingK8sMetadata::AddLabelToLogGroup(PipelineEventGroup& logGroup) {
             cotainerNotTag.push_back(rIdx);
         }
     }
-    auto& k8sMetadata = K8sMetadata::GetInstance();
-    if (containerVec.empty() || (!k8sMetadata.GetByContainerIdsFromServer(containerVec))) {
+    K8sMetadata* k8sMetadata = K8sMetadata::GetInstance();
+    if (containerVec.empty() || (!k8sMetadata->GetByContainerIdsFromServer(containerVec))) {
         return;
     }
-    if (remoteIpVec.empty() || (!k8sMetadata.GetByIpsFromServer(remoteIpVec))) {
+    if (remoteIpVec.empty() || (!k8sMetadata->GetByIpsFromServer(remoteIpVec))) {
         return;
     }
     for (size_t i = 0; i < cotainerNotTag.size(); ++i) {
@@ -74,12 +74,12 @@ template <typename Event>
 bool LabelingK8sMetadata::AddLabels(Event& e, std::vector<std::string>& containerVec, std::vector<std::string>& remoteIpVec) {
     bool res = true;
 
-    auto& k8sMetadata = K8sMetadata::GetInstance();
+    K8sMetadata* k8sMetadata = K8sMetadata::GetInstance();
     StringView containerIdViewKey(containerIdKey);
     StringView containerIdView = e.HasTag(containerIdViewKey) ? e.GetTag(containerIdViewKey) : StringView{};
     if (!containerIdView.empty()) {
         std::string containerId(containerIdView);
-        std::shared_ptr<k8sContainerInfo> containerInfo = k8sMetadata.GetInfoByContainerIdFromCache(containerId);
+        std::shared_ptr<k8sContainerInfo> containerInfo = k8sMetadata->GetInfoByContainerIdFromCache(containerId);
         if (containerInfo == nullptr) {
             containerVec.push_back(containerId);
             res = false;
@@ -95,7 +95,7 @@ bool LabelingK8sMetadata::AddLabels(Event& e, std::vector<std::string>& containe
     StringView remoteIpView = e.HasTag(ipView) ? e.GetTag(ipView) : StringView{};
     if (!remoteIpView.empty()) {
         std::string remoteIp(remoteIpView);
-        std::shared_ptr<k8sContainerInfo> ipInfo = k8sMetadata.GetInfoByIpFromCache(remoteIp);
+        std::shared_ptr<k8sContainerInfo> ipInfo = k8sMetadata->GetInfoByIpFromCache(remoteIp);
         if (ipInfo == nullptr) {
             remoteIpVec.push_back(remoteIp);
             res = false;

diff --git a/core/unittest/metadata/CMakeLists.txt b/core/unittest/metadata/CMakeLists.txt
@@ -15,8 +15,8 @@
 cmake_minimum_required(VERSION 3.22)
 project(metadata_unittest)
 
-# add_executable(metadata_unittest K8sMetadataUnittest.cpp)
-# target_link_libraries(metadata_unittest ${UT_BASE_TARGET})
+ add_executable(metadata_unittest K8sMetadataUnittest.cpp)
+ target_link_libraries(metadata_unittest ${UT_BASE_TARGET})
 
 include(GoogleTest)
-# gtest_discover_tests(metadata_unittest)
+ gtest_discover_tests(metadata_unittest)