polish

alibaba · Sep 23, 2024 · 611f816 · 611f816
1 parent 625513c
commit 611f816
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/core/file_server/polling/PollingDirFile.cpp b/core/file_server/polling/PollingDirFile.cpp
@@ -21,19 +21,20 @@
 #endif
 #include <sys/stat.h>
 
-#include "file_server/polling/PollingEventQueue.h"
-#include "file_server/polling/PollingModify.h"
 #include "app_config/AppConfig.h"
 #include "common/ErrorUtil.h"
 #include "common/FileSystemUtil.h"
 #include "common/Flags.h"
 #include "common/StringTools.h"
 #include "common/TimeUtil.h"
 #include "file_server/ConfigManager.h"
-#include "file_server/event/Event.h"
 #include "file_server/FileServer.h"
+#include "file_server/event/Event.h"
+#include "file_server/polling/PollingEventQueue.h"
+#include "file_server/polling/PollingModify.h"
 #include "logger/Logger.h"
 #include "monitor/LogtailAlarm.h"
+#include "monitor/MetricConstants.h"
 
 // Control the check frequency to call ClearUnavailableFileAndDir.
 DEFINE_FLAG_INT32(check_not_exist_file_dir_round, "clear not exist file dir cache, round", 20);
@@ -70,9 +71,9 @@ void PollingDirFile::Start() {
     ClearCache();
     mAgentConfigTotal = LoongCollectorMonitor::GetInstance()->GetIntGauge(METRIC_AGENT_PIPELINE_CONFIG_TOTAL);
     mPollingDirCacheSize
-        = FileServer::GetInstance()->GetMetricsRecordRef().CreateIntGauge("polling_dir_cache_size");
+        = FileServer::GetInstance()->GetMetricsRecordRef().CreateIntGauge(METRIC_RUNNER_FILE_POLLING_DIR_CACHE_SIZE);
     mPollingFileCacheSize
-        = FileServer::GetInstance()->GetMetricsRecordRef().CreateIntGauge("polling_file_cache_size");
+        = FileServer::GetInstance()->GetMetricsRecordRef().CreateIntGauge(METRIC_RUNNER_FILE_POLLING_FILE_CACHE_SIZE);
     mRuningFlag = true;
     mThreadPtr = CreateThread([this]() { Polling(); });
 }

diff --git a/core/file_server/polling/PollingModify.cpp b/core/file_server/polling/PollingModify.cpp
@@ -24,10 +24,11 @@
 #include "common/Flags.h"
 #include "common/StringTools.h"
 #include "common/TimeUtil.h"
+#include "file_server/FileServer.h"
 #include "file_server/event/Event.h"
 #include "logger/Logger.h"
 #include "monitor/LogtailAlarm.h"
-#include "file_server/FileServer.h"
+#include "monitor/MetricConstants.h"
 
 using namespace std;
 
@@ -48,7 +49,8 @@ PollingModify::~PollingModify() {
 
 void PollingModify::Start() {
     ClearCache();
-    mPollingModifySize = FileServer::GetInstance()->GetMetricsRecordRef().CreateIntGauge("polling_modify_size");
+    mPollingModifySize
+        = FileServer::GetInstance()->GetMetricsRecordRef().CreateIntGauge(METRIC_RUNNER_FILE_POLLING_MODIFY_CACHE_SIZE);
 
     mRuningFlag = true;
     mThreadPtr = CreateThread([this]() { Polling(); });

diff --git a/core/monitor/MetricConstants.cpp b/core/monitor/MetricConstants.cpp
@@ -183,7 +183,8 @@ const std::string METRIC_COMPONENT_QUEUE_DISCARDED_EVENTS_CNT = "component_disca
 const std::string METRIC_PIPELINE_START_TIME = "pipeline_start_time";
 const std::string METRIC_PIPELINE_PROCESSORS_IN_EVENTS_CNT = "pipeline_processors_in_events_total";
 const std::string METRIC_PIPELINE_PROCESSORS_IN_EVENT_GROUPS_CNT = "pipeline_processors_in_event_groups_total";
-const std::string METRIC_PIPELINE_PROCESSORS_IN_EVENT_GROUP_SIZE_BYTES = "pipeline_processors_in_event_group_size_bytes";
+const std::string METRIC_PIPELINE_PROCESSORS_IN_EVENT_GROUP_SIZE_BYTES
+    = "pipeline_processors_in_event_group_size_bytes";
 const std::string METRIC_PIPELINE_PROCESSORS_TOTAL_DELAY_MS = "pipeline_processors_total_delay_ms";
 
 //////////////////////////////////////////////////////////////////////////
@@ -214,5 +215,8 @@ const std::string METRIC_RUNNER_FILE_WATCHED_DIRS_CNT = "runner_watched_dirs_tot
 const std::string METRIC_RUNNER_FILE_ACTIVE_READERS_CNT = "runner_active_readers_total";
 const std::string METRIC_RUNNER_FILE_ENABLE_FILE_INCLUDED_BY_MULTI_CONFIGS_FLAG
     = "runner_enable_file_included_by_multi_configs";
+const std::string METRIC_RUNNER_FILE_POLLING_MODIFY_CACHE_SIZE = "runner_polling_modify_cache_size";
+const std::string METRIC_RUNNER_FILE_POLLING_DIR_CACHE_SIZE = "runner_polling_dir_cache_size";
+const std::string METRIC_RUNNER_FILE_POLLING_FILE_CACHE_SIZE = "runner_polling_file_cache_size";
 
 } // namespace logtail
diff --git a/core/monitor/MetricConstants.h b/core/monitor/MetricConstants.h
@@ -206,5 +206,8 @@ extern const std::string METRIC_RUNNER_FLUSHER_WAITING_ITEMS_CNT;
 extern const std::string METRIC_RUNNER_FILE_WATCHED_DIRS_CNT;
 extern const std::string METRIC_RUNNER_FILE_ACTIVE_READERS_CNT;
 extern const std::string METRIC_RUNNER_FILE_ENABLE_FILE_INCLUDED_BY_MULTI_CONFIGS_FLAG;
+extern const std::string METRIC_RUNNER_FILE_POLLING_MODIFY_CACHE_SIZE;
+extern const std::string METRIC_RUNNER_FILE_POLLING_DIR_CACHE_SIZE;
+extern const std::string METRIC_RUNNER_FILE_POLLING_FILE_CACHE_SIZE;
 
 } // namespace logtail