polish

core/config/common_provider/CommonConfigProvider.cpp

@@ -132,10 +132,6 @@ void CommonConfigProvider::Stop() {
     }
 }
 
-const std::map<std::string, std::string>& CommonConfigProvider::GetAllInernalPipelineConfigs() {
-    return mPipelineMaps;
-}
-
 void CommonConfigProvider::LoadConfigFile() {
     error_code ec;
     lock_guard<mutex> pipelineInfomaplock(mContinuousPipelineInfoMapMux);

core/config/common_provider/CommonConfigProvider.h

@@ -54,7 +54,6 @@ class CommonConfigProvider : public ConfigProvider, ConfigFeedbackable {
     void Init(const std::string& dir) override;
     void Stop() override;
 
-    const std::map<std::string, std::string>& GetAllInernalPipelineConfigs();
     void FeedbackContinuousPipelineConfigStatus(const std::string& name, ConfigFeedbackStatus status) override;
     void FeedbackInstanceConfigStatus(const std::string& name, ConfigFeedbackStatus status) override;
     void FeedbackOnetimePipelineConfigStatus(const std::string& type,
@@ -131,7 +130,6 @@ class CommonConfigProvider : public ConfigProvider, ConfigFeedbackable {
     std::vector<ConfigServerAddress> mConfigServerAddresses;
     int mConfigServerAddressId = 0;
     std::map<std::string, std::string> mConfigServerTags;
-    std::map<std::string, std::string> mPipelineMaps;
 
 #ifdef APSARA_UNIT_TEST_MAIN
     friend class CommonConfigProviderUnittest;

core/config/watcher/PipelineConfigWatcher.cpp

@@ -41,9 +41,9 @@ pair<PipelineConfigDiff, TaskConfigDiff> PipelineConfigWatcher::CheckConfigDiff(
     PipelineConfigDiff pDiff;
     TaskConfigDiff tDiff;
     unordered_set<string> configSet;
-    // inner configs
-    InsertInnerPipelines(pDiff, tDiff, configSet);
-    // configs from file
+    // builtin pipeline configs
+    InsertBuiltInPipelines(pDiff, tDiff, configSet);
+    // file pipeline configs 
     InsertPipelines(pDiff, tDiff, configSet);
 
     for (const auto& name : mPipelineManager->GetAllConfigNames()) {
@@ -87,19 +87,14 @@ pair<PipelineConfigDiff, TaskConfigDiff> PipelineConfigWatcher::CheckConfigDiff(
     return make_pair(std::move(pDiff), std::move(tDiff));
 }
 
-void PipelineConfigWatcher::InsertInnerPipelines(PipelineConfigDiff& pDiff,
+void PipelineConfigWatcher::InsertBuiltInPipelines(PipelineConfigDiff& pDiff,
                                                  TaskConfigDiff& tDiff,
                                                  unordered_set<string>& configSet) {
 #ifdef __ENTERPRISE__
-    const std::map<std::string, std::string>& innerPipelines
-        = EnterpriseConfigProvider::GetInstance()->GetAllInernalPipelineConfigs();
-#else
-    const std::map<std::string, std::string>& innerPipelines
-        = CommonConfigProvider::GetInstance()->GetAllInernalPipelineConfigs();
-#endif
+    const std::map<std::string, std::string>& builtInPipelines
+        = EnterpriseConfigProvider::GetInstance()->GetAllBuiltInPipelineConfigs();
 
-    // process
-    for (const auto& pipeline : innerPipelines) {
+    for (const auto& pipeline : builtInPipelines) {
         const string& pipelineName = pipeline.first;
         const string& pipleineDetail = pipeline.second;
         if (configSet.find(pipelineName) != configSet.end()) {
@@ -173,6 +168,9 @@ void PipelineConfigWatcher::InsertInnerPipelines(PipelineConfigDiff& pDiff,
             LOG_DEBUG(sLogger, ("existing inner config unchanged", "skip current object"));
         }
     }
+#else
+    return;
+#endif
 }
 
 void PipelineConfigWatcher::InsertPipelines(PipelineConfigDiff& pDiff,

core/config/watcher/PipelineConfigWatcher.h

@@ -46,7 +46,7 @@ class PipelineConfigWatcher : public ConfigWatcher {
     PipelineConfigWatcher();
     ~PipelineConfigWatcher() = default;
 
-    void InsertInnerPipelines(PipelineConfigDiff& pDiff, TaskConfigDiff& tDiff, std::unordered_set<std::string>& configSet);
+    void InsertBuiltInPipelines(PipelineConfigDiff& pDiff, TaskConfigDiff& tDiff, std::unordered_set<std::string>& configSet);
     void InsertPipelines(PipelineConfigDiff& pDiff, TaskConfigDiff& tDiff, std::unordered_set<std::string>& configSet);
     bool CheckAddedConfig(const std::string& configName,
                           std::unique_ptr<Json::Value>&& configDetail,

core/unittest/config/CommonConfigProviderUnittest.cpp

@@ -433,19 +433,18 @@ void CommonConfigProviderUnittest::TestGetConfigUpdateAndConfigWatcher() {
 
         // 处理 pipelineconfig
         auto pipelineConfigDiff = PipelineConfigWatcher::GetInstance()->CheckConfigDiff();
-        auto innerPipelinesCnt = CommonConfigProvider::GetInstance()->GetAllInernalPipelineConfigs().size();
         PipelineManager::GetInstance()->UpdatePipelines(pipelineConfigDiff.first);
         APSARA_TEST_TRUE(!pipelineConfigDiff.first.IsEmpty());
-        APSARA_TEST_EQUAL(1U + innerPipelinesCnt, pipelineConfigDiff.first.mAdded.size());
-        APSARA_TEST_EQUAL(pipelineConfigDiff.first.mAdded[innerPipelinesCnt].mName, "config1");
-        APSARA_TEST_EQUAL(PipelineManager::GetInstance()->GetAllConfigNames().size(), 1 + innerPipelinesCnt);
+        APSARA_TEST_EQUAL(1U, pipelineConfigDiff.first.mAdded.size());
+        APSARA_TEST_EQUAL(pipelineConfigDiff.first.mAdded[0].mName, "config1");
+        APSARA_TEST_EQUAL(PipelineManager::GetInstance()->GetAllConfigNames().size(), 1);
         APSARA_TEST_TRUE(PipelineManager::GetInstance()->FindConfigByName("config1").get() != nullptr);
         // 再次处理 pipelineconfig
         pipelineConfigDiff = PipelineConfigWatcher::GetInstance()->CheckConfigDiff();
         PipelineManager::GetInstance()->UpdatePipelines(pipelineConfigDiff.first);
         APSARA_TEST_TRUE(pipelineConfigDiff.first.IsEmpty());
         APSARA_TEST_TRUE(pipelineConfigDiff.first.mAdded.empty());
-        APSARA_TEST_EQUAL(PipelineManager::GetInstance()->GetAllConfigNames().size(), 1 + innerPipelinesCnt);
+        APSARA_TEST_EQUAL(PipelineManager::GetInstance()->GetAllConfigNames().size(), 1);
         APSARA_TEST_TRUE(PipelineManager::GetInstance()->FindConfigByName("config1").get() != nullptr);
 
 
@@ -650,18 +649,17 @@ void CommonConfigProviderUnittest::TestGetConfigUpdateAndConfigWatcher() {
 
         // 处理pipelineConfigDiff
         auto pipelineConfigDiff = PipelineConfigWatcher::GetInstance()->CheckConfigDiff();
-        auto innerPipelinesCnt = CommonConfigProvider::GetInstance()->GetAllInernalPipelineConfigs().size();
         PipelineManager::GetInstance()->UpdatePipelines(pipelineConfigDiff.first);
         APSARA_TEST_TRUE(!pipelineConfigDiff.first.IsEmpty());
         APSARA_TEST_EQUAL(1U, pipelineConfigDiff.first.mRemoved.size());
         APSARA_TEST_EQUAL(pipelineConfigDiff.first.mRemoved[0], "config1");
-        APSARA_TEST_EQUAL(0U + innerPipelinesCnt, PipelineManager::GetInstance()->GetAllConfigNames().size());
+        APSARA_TEST_EQUAL(0U, PipelineManager::GetInstance()->GetAllConfigNames().size());
         // 再次处理pipelineConfigDiff
         pipelineConfigDiff = PipelineConfigWatcher::GetInstance()->CheckConfigDiff();
         PipelineManager::GetInstance()->UpdatePipelines(pipelineConfigDiff.first);
         APSARA_TEST_TRUE(pipelineConfigDiff.first.IsEmpty());
         APSARA_TEST_TRUE(pipelineConfigDiff.first.mRemoved.empty());
-        APSARA_TEST_EQUAL(0U + innerPipelinesCnt, PipelineManager::GetInstance()->GetAllConfigNames().size());
+        APSARA_TEST_EQUAL(0U, PipelineManager::GetInstance()->GetAllConfigNames().size());
 
         APSARA_TEST_TRUE(provider.mInstanceConfigInfoMap.empty());
         // 处理instanceConfigDiff

core/unittest/config/ConfigUpdateUnittest.cpp

@@ -268,8 +268,7 @@ class ConfigUpdateUnittest : public testing::Test {
 
 void ConfigUpdateUnittest::OnStartUp() const {
     auto diff = PipelineConfigWatcher::GetInstance()->CheckConfigDiff();
-    auto innerPipelinesCnt = CommonConfigProvider::GetInstance()->GetAllInernalPipelineConfigs().size();
-    APSARA_TEST_EQUAL(innerPipelinesCnt, diff.first.mAdded.size());
+    APSARA_TEST_EQUAL(0U, diff.first.mAdded.size());
     APSARA_TEST_TRUE(diff.second.IsEmpty());
 
     GenerateInitialConfigs();

core/unittest/config/ConfigWatcherUnittest.cpp

@@ -51,8 +51,7 @@ const filesystem::path ConfigWatcherUnittest::instanceConfigDir = "./instance_co
 void ConfigWatcherUnittest::InvalidConfigDirFound() const {
     {
         auto diff = PipelineConfigWatcher::GetInstance()->CheckConfigDiff();
-        auto innerPipelinesCnt = CommonConfigProvider::GetInstance()->GetAllInernalPipelineConfigs().size();
-        APSARA_TEST_EQUAL(innerPipelinesCnt, diff.first.mAdded.size());
+        APSARA_TEST_EQUAL(0U, diff.first.mAdded.size());
         APSARA_TEST_TRUE(diff.second.IsEmpty());
 
         { ofstream fout("continuous_pipeline_config"); }
@@ -84,8 +83,7 @@ void ConfigWatcherUnittest::InvalidConfigFileFound() const {
             fout << "[}";
         }
         auto diff = PipelineConfigWatcher::GetInstance()->CheckConfigDiff();
-        auto innerPipelinesCnt = CommonConfigProvider::GetInstance()->GetAllInernalPipelineConfigs().size();
-        APSARA_TEST_EQUAL(innerPipelinesCnt, diff.first.mAdded.size());
+        APSARA_TEST_EQUAL(0U, diff.first.mAdded.size());
         APSARA_TEST_TRUE(diff.second.IsEmpty());
         filesystem::remove_all(configDir);
     }
@@ -134,9 +132,8 @@ void ConfigWatcherUnittest::DuplicateConfigs() const {
         }
         { ofstream fout("dir2/config.json"); }
         auto diff = PipelineConfigWatcher::GetInstance()->CheckConfigDiff();
-        auto innerPipelinesCnt = CommonConfigProvider::GetInstance()->GetAllInernalPipelineConfigs().size();
         APSARA_TEST_FALSE(diff.first.IsEmpty());
-        APSARA_TEST_EQUAL(1U + innerPipelinesCnt, diff.first.mAdded.size());
+        APSARA_TEST_EQUAL(1U, diff.first.mAdded.size());
 
         filesystem::remove_all("dir1");
         filesystem::remove_all("dir2");