This is an automated email from the ASF dual-hosted git repository.
caiconghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 3438a74 [Typo] Fix typo in metrics macros (#4739)
3438a74 is described below
commit 3438a746aced7abdf971b9eb8b3b7cc537841305
Author: Yingchun Lai <[email protected]>
AuthorDate: Thu Oct 15 19:56:43 2020 +0800
[Typo] Fix typo in metrics macros (#4739)
Just fix typo.
Rename DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(name, unit) to
DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(name, unit)
Rename DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(name, unit) witch define core
metrics to DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(name, unit)
---
be/src/http/action/stream_load.cpp | 2 +-
be/src/olap/data_dir.cpp | 12 ++++----
be/src/olap/rowset/unique_rowset_id_generator.cpp | 2 +-
be/src/olap/storage_engine.cpp | 4 +--
be/src/runtime/broker_mgr.cpp | 2 +-
be/src/runtime/data_stream_mgr.cpp | 4 +--
be/src/runtime/external_scan_context_mgr.cpp | 2 +-
be/src/runtime/fragment_mgr.cpp | 2 +-
be/src/runtime/load_channel_mgr.cpp | 2 +-
be/src/runtime/result_buffer_mgr.cpp | 2 +-
be/src/runtime/result_queue_mgr.cpp | 2 +-
.../routine_load/routine_load_task_executor.cpp | 2 +-
be/src/runtime/small_file_mgr.cpp | 2 +-
be/src/runtime/stream_load/load_stream_mgr.cpp | 2 +-
be/src/runtime/tablets_channel.cpp | 2 +-
be/src/util/brpc_stub_cache.cpp | 2 +-
be/src/util/doris_metrics.cpp | 34 +++++++++++-----------
be/src/util/metrics.h | 4 +--
be/src/util/system_metrics.cpp | 4 +--
be/test/http/metrics_action_test.cpp | 4 +--
20 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/be/src/http/action/stream_load.cpp
b/be/src/http/action/stream_load.cpp
index 7f39167..b7ba234 100644
--- a/be/src/http/action/stream_load.cpp
+++ b/be/src/http/action/stream_load.cpp
@@ -63,7 +63,7 @@ namespace doris {
DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(streaming_load_requests_total,
MetricUnit::REQUESTS);
DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(streaming_load_bytes, MetricUnit::BYTES);
DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(streaming_load_duration_ms,
MetricUnit::MILLISECONDS);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(streaming_load_current_processing,
MetricUnit::REQUESTS);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(streaming_load_current_processing,
MetricUnit::REQUESTS);
#ifdef BE_TEST
TStreamLoadPutResult k_stream_load_put_result;
diff --git a/be/src/olap/data_dir.cpp b/be/src/olap/data_dir.cpp
index c20849b..55a2194 100644
--- a/be/src/olap/data_dir.cpp
+++ b/be/src/olap/data_dir.cpp
@@ -55,12 +55,12 @@ using strings::Substitute;
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(disks_total_capacity, MetricUnit::BYTES);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(disks_avail_capacity, MetricUnit::BYTES);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(disks_data_used_capacity,
MetricUnit::BYTES);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(disks_state, MetricUnit::BYTES);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(disks_compaction_score, MetricUnit::NOUNIT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(disks_compaction_num, MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(disks_total_capacity, MetricUnit::BYTES);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(disks_avail_capacity, MetricUnit::BYTES);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(disks_data_used_capacity,
MetricUnit::BYTES);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(disks_state, MetricUnit::BYTES);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(disks_compaction_score, MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(disks_compaction_num, MetricUnit::NOUNIT);
static const char* const kMtabPath = "/etc/mtab";
static const char* const kTestFilePath = "/.testfile";
diff --git a/be/src/olap/rowset/unique_rowset_id_generator.cpp
b/be/src/olap/rowset/unique_rowset_id_generator.cpp
index fca648d..71352ca 100644
--- a/be/src/olap/rowset/unique_rowset_id_generator.cpp
+++ b/be/src/olap/rowset/unique_rowset_id_generator.cpp
@@ -23,7 +23,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(rowset_count_generated_and_in_use,
MetricUnit::ROWSETS);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(rowset_count_generated_and_in_use,
MetricUnit::ROWSETS);
UniqueRowsetIdGenerator::UniqueRowsetIdGenerator(const UniqueId& backend_uid)
: _backend_uid(backend_uid), _inc_id(0) {
diff --git a/be/src/olap/storage_engine.cpp b/be/src/olap/storage_engine.cpp
index 72ea4c7..9a3f125 100644
--- a/be/src/olap/storage_engine.cpp
+++ b/be/src/olap/storage_engine.cpp
@@ -84,8 +84,8 @@ using strings::Substitute;
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(unused_rowsets_count, MetricUnit::ROWSETS);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(compaction_mem_current_consumption,
MetricUnit::BYTES);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(unused_rowsets_count, MetricUnit::ROWSETS);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(compaction_mem_current_consumption,
MetricUnit::BYTES);
StorageEngine* StorageEngine::_s_instance = nullptr;
diff --git a/be/src/runtime/broker_mgr.cpp b/be/src/runtime/broker_mgr.cpp
index 2149952..78607f0 100644
--- a/be/src/runtime/broker_mgr.cpp
+++ b/be/src/runtime/broker_mgr.cpp
@@ -30,7 +30,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(broker_count, MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(broker_count, MetricUnit::NOUNIT);
BrokerMgr::BrokerMgr(ExecEnv* exec_env) :
_exec_env(exec_env), _stop_background_threads_latch(1) {
diff --git a/be/src/runtime/data_stream_mgr.cpp
b/be/src/runtime/data_stream_mgr.cpp
index 3152ded..adb7131 100644
--- a/be/src/runtime/data_stream_mgr.cpp
+++ b/be/src/runtime/data_stream_mgr.cpp
@@ -35,8 +35,8 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(data_stream_receiver_count,
MetricUnit::NOUNIT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(fragment_endpoint_count,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(data_stream_receiver_count,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(fragment_endpoint_count,
MetricUnit::NOUNIT);
using boost::mutex;
using boost::shared_ptr;
diff --git a/be/src/runtime/external_scan_context_mgr.cpp
b/be/src/runtime/external_scan_context_mgr.cpp
index 9a9e488..a736cad 100644
--- a/be/src/runtime/external_scan_context_mgr.cpp
+++ b/be/src/runtime/external_scan_context_mgr.cpp
@@ -28,7 +28,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(active_scan_context_count,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(active_scan_context_count,
MetricUnit::NOUNIT);
ExternalScanContextMgr::ExternalScanContextMgr(ExecEnv* exec_env) :
_exec_env(exec_env), _stop_background_threads_latch(1) {
// start the reaper thread for gc the expired context
diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index 6aecb84..e25a478 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -52,7 +52,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(plan_fragment_count, MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(plan_fragment_count, MetricUnit::NOUNIT);
std::string to_load_error_http_path(const std::string& file_name) {
if (file_name.empty()) {
diff --git a/be/src/runtime/load_channel_mgr.cpp
b/be/src/runtime/load_channel_mgr.cpp
index 5a20ec7..7f7e87e 100644
--- a/be/src/runtime/load_channel_mgr.cpp
+++ b/be/src/runtime/load_channel_mgr.cpp
@@ -27,7 +27,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(load_channel_count, MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(load_channel_count, MetricUnit::NOUNIT);
// Calculate the total memory limit of all load tasks on this BE
static int64_t calc_process_max_load_memory(int64_t process_mem_limit) {
diff --git a/be/src/runtime/result_buffer_mgr.cpp
b/be/src/runtime/result_buffer_mgr.cpp
index 8983298..f4a7c00 100644
--- a/be/src/runtime/result_buffer_mgr.cpp
+++ b/be/src/runtime/result_buffer_mgr.cpp
@@ -26,7 +26,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(result_buffer_block_count,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(result_buffer_block_count,
MetricUnit::NOUNIT);
//std::size_t hash_value(const TUniqueId& fragment_id) {
// uint32_t value = RawValue::get_hash_value(&fragment_id.lo,
TypeDescriptor(TYPE_BIGINT), 0);
diff --git a/be/src/runtime/result_queue_mgr.cpp
b/be/src/runtime/result_queue_mgr.cpp
index cfdd60a..89f8e6c 100644
--- a/be/src/runtime/result_queue_mgr.cpp
+++ b/be/src/runtime/result_queue_mgr.cpp
@@ -28,7 +28,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(result_block_queue_count,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(result_block_queue_count,
MetricUnit::NOUNIT);
ResultQueueMgr::ResultQueueMgr() {
// Each BlockingQueue has a limited size (default 20, by
config::max_memory_sink_batch_count),
diff --git a/be/src/runtime/routine_load/routine_load_task_executor.cpp
b/be/src/runtime/routine_load/routine_load_task_executor.cpp
index a34c2f9..765d299 100644
--- a/be/src/runtime/routine_load/routine_load_task_executor.cpp
+++ b/be/src/runtime/routine_load/routine_load_task_executor.cpp
@@ -34,7 +34,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(routine_load_task_count,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(routine_load_task_count,
MetricUnit::NOUNIT);
RoutineLoadTaskExecutor::RoutineLoadTaskExecutor(ExecEnv* exec_env)
: _exec_env(exec_env),
diff --git a/be/src/runtime/small_file_mgr.cpp
b/be/src/runtime/small_file_mgr.cpp
index a44a315..23f8da9 100644
--- a/be/src/runtime/small_file_mgr.cpp
+++ b/be/src/runtime/small_file_mgr.cpp
@@ -38,7 +38,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(small_file_cache_count, MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(small_file_cache_count, MetricUnit::NOUNIT);
SmallFileMgr::SmallFileMgr(
ExecEnv* env,
diff --git a/be/src/runtime/stream_load/load_stream_mgr.cpp
b/be/src/runtime/stream_load/load_stream_mgr.cpp
index 72fe114..285d5fc 100644
--- a/be/src/runtime/stream_load/load_stream_mgr.cpp
+++ b/be/src/runtime/stream_load/load_stream_mgr.cpp
@@ -19,7 +19,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(stream_load_pipe_count, MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(stream_load_pipe_count, MetricUnit::NOUNIT);
LoadStreamMgr::LoadStreamMgr() {
// Each StreamLoadPipe has a limited buffer size (default 1M), it's not
needed to count the
diff --git a/be/src/runtime/tablets_channel.cpp
b/be/src/runtime/tablets_channel.cpp
index 7cab4fe..853a2b8 100644
--- a/be/src/runtime/tablets_channel.cpp
+++ b/be/src/runtime/tablets_channel.cpp
@@ -27,7 +27,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(tablet_writer_count, MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(tablet_writer_count, MetricUnit::NOUNIT);
std::atomic<uint64_t> TabletsChannel::_s_tablet_writer_count;
diff --git a/be/src/util/brpc_stub_cache.cpp b/be/src/util/brpc_stub_cache.cpp
index a80cc28..8f656ef 100644
--- a/be/src/util/brpc_stub_cache.cpp
+++ b/be/src/util/brpc_stub_cache.cpp
@@ -19,7 +19,7 @@
namespace doris {
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(brpc_endpoint_stub_count,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(brpc_endpoint_stub_count,
MetricUnit::NOUNIT);
BrpcStubCache::BrpcStubCache() {
_stub_map.init(239);
diff --git a/be/src/util/doris_metrics.cpp b/be/src/util/doris_metrics.cpp
index 39ec078..78a8a93 100644
--- a/be/src/util/doris_metrics.cpp
+++ b/be/src/util/doris_metrics.cpp
@@ -100,20 +100,20 @@ DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(load_bytes,
MetricUnit::BYTES);
DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(memtable_flush_total,
MetricUnit::OPERATIONS);
DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(memtable_flush_duration_us,
MetricUnit::MICROSECONDS);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(memory_pool_bytes_total, MetricUnit::BYTES);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(process_thread_num, MetricUnit::NOUNIT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(process_fd_num_used, MetricUnit::NOUNIT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(process_fd_num_limit_soft,
MetricUnit::NOUNIT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(process_fd_num_limit_hard,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(memory_pool_bytes_total, MetricUnit::BYTES);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(process_thread_num,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(process_fd_num_used,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(process_fd_num_limit_soft,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(process_fd_num_limit_hard,
MetricUnit::NOUNIT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(tablet_cumulative_max_compaction_score,
MetricUnit::NOUNIT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(tablet_base_max_compaction_score,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(tablet_cumulative_max_compaction_score,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(tablet_base_max_compaction_score,
MetricUnit::NOUNIT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(push_request_write_bytes_per_second,
MetricUnit::BYTES);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(query_scan_bytes_per_second,
MetricUnit::BYTES);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(max_disk_io_util_percent,
MetricUnit::PERCENT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(max_network_send_bytes_rate,
MetricUnit::BYTES);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(max_network_receive_bytes_rate,
MetricUnit::BYTES);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(push_request_write_bytes_per_second,
MetricUnit::BYTES);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(query_scan_bytes_per_second,
MetricUnit::BYTES);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(max_disk_io_util_percent,
MetricUnit::PERCENT);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(max_network_send_bytes_rate,
MetricUnit::BYTES);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(max_network_receive_bytes_rate,
MetricUnit::BYTES);
DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(readable_blocks_total,
MetricUnit::BLOCKS);
DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(writable_blocks_total,
MetricUnit::BLOCKS);
@@ -123,12 +123,12 @@ DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(bytes_read_total,
MetricUnit::BYTES);
DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(bytes_written_total, MetricUnit::BYTES);
DEFINE_COUNTER_METRIC_PROTOTYPE_2ARG(disk_sync_total, MetricUnit::OPERATIONS);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(blocks_open_reading, MetricUnit::BLOCKS);
-DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(blocks_open_writing, MetricUnit::BLOCKS);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(blocks_open_reading, MetricUnit::BLOCKS);
+DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(blocks_open_writing, MetricUnit::BLOCKS);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(query_cache_memory_total_byte,
MetricUnit::BYTES);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(query_cache_sql_total_count,
MetricUnit::NOUNIT);
-DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(query_cache_partition_total_count,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(query_cache_memory_total_byte,
MetricUnit::BYTES);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(query_cache_sql_total_count,
MetricUnit::NOUNIT);
+DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(query_cache_partition_total_count,
MetricUnit::NOUNIT);
const std::string DorisMetrics::_s_registry_name = "doris_be";
const std::string DorisMetrics::_s_hook_name = "doris_metrics";
diff --git a/be/src/util/metrics.h b/be/src/util/metrics.h
index 61fccce..cc85ffe 100644
--- a/be/src/util/metrics.h
+++ b/be/src/util/metrics.h
@@ -262,10 +262,10 @@ public:
#define DEFINE_COUNTER_METRIC_PROTOTYPE_5ARG(name, unit, desc, group, labels)
\
DEFINE_METRIC_PROTOTYPE(name, MetricType::COUNTER, unit, desc, #group,
labels, false)
-#define DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(name, unit)
\
+#define DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(name, unit)
\
DEFINE_METRIC_PROTOTYPE(name, MetricType::GAUGE, unit, "", "", Labels(),
false)
-#define DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(name, unit)
\
+#define DEFINE_GAUGE_CORE_METRIC_PROTOTYPE_2ARG(name, unit)
\
DEFINE_METRIC_PROTOTYPE(name, MetricType::GAUGE, unit, "", "", Labels(),
true)
#define DEFINE_GAUGE_METRIC_PROTOTYPE_3ARG(name, unit, desc)
\
diff --git a/be/src/util/system_metrics.cpp b/be/src/util/system_metrics.cpp
index a51a624..5dbccf4 100644
--- a/be/src/util/system_metrics.cpp
+++ b/be/src/util/system_metrics.cpp
@@ -84,7 +84,7 @@ struct CpuMetrics {
};
#define DEFINE_MEMORY_GAUGE_METRIC(metric, unit) \
- DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(memory_##metric, unit);
+ DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(memory_##metric, unit);
DEFINE_MEMORY_GAUGE_METRIC(allocated_bytes, MetricUnit::BYTES);
struct MemoryMetrics {
@@ -176,7 +176,7 @@ struct SnmpMetrics {
};
#define DEFINE_FD_COUNTER_METRIC(metric, unit) \
- DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(fd_##metric, unit);
+ DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(fd_##metric, unit);
DEFINE_FD_COUNTER_METRIC(num_limit, MetricUnit::NOUNIT);
DEFINE_FD_COUNTER_METRIC(num_used, MetricUnit::NOUNIT);
diff --git a/be/test/http/metrics_action_test.cpp
b/be/test/http/metrics_action_test.cpp
index 1dc6c72..c5c6a1a 100644
--- a/be/test/http/metrics_action_test.cpp
+++ b/be/test/http/metrics_action_test.cpp
@@ -56,7 +56,7 @@ TEST_F(MetricsActionTest, prometheus_output) {
std::shared_ptr<MetricEntity> entity =
metric_registry.register_entity("metrics_action_test.prometheus_output");
IntGauge* cpu_idle = nullptr;
- DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(cpu_idle, MetricUnit::PERCENT);
+ DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(cpu_idle, MetricUnit::PERCENT);
INT_GAUGE_METRIC_REGISTER(entity, cpu_idle);
IntCounter* put_requests_total = nullptr;
@@ -81,7 +81,7 @@ TEST_F(MetricsActionTest, prometheus_no_prefix) {
std::shared_ptr<MetricEntity> entity =
metric_registry.register_entity("metrics_action_test.prometheus_no_prefix");
IntGauge* cpu_idle = nullptr;
- DEFINE_GAUGE_METRIC_PROTOTYPE_5ARG(cpu_idle, MetricUnit::PERCENT);
+ DEFINE_GAUGE_METRIC_PROTOTYPE_2ARG(cpu_idle, MetricUnit::PERCENT);
INT_GAUGE_METRIC_REGISTER(entity, cpu_idle);
cpu_idle->set_value(50);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
