morningman commented on a change in pull request #4115:
URL: https://github.com/apache/incubator-doris/pull/4115#discussion_r459497028
##########
File path: be/src/util/doris_metrics.h
##########
@@ -28,163 +28,152 @@
namespace doris {
-class IntGaugeMetricsMap {
-public:
- void set_metric(const std::string& key, int64_t val) {
- auto metric = metrics.find(key);
- if (metric != metrics.end()) {
- metric->second->set_value(val);
- }
- }
-
- IntGauge* add_metric(const std::string& key, const MetricUnit unit) {
- metrics.emplace(key, new IntGauge(unit));
- return metrics.find(key)->second.get();
- }
-
-private:
- std::unordered_map<std::string, std::unique_ptr<IntGauge>> metrics;
-};
-
-#define REGISTER_GAUGE_DORIS_METRIC(name, func) \
- DorisMetrics::instance()->metrics()->register_metric(#name,
&DorisMetrics::instance()->name); \
- DorisMetrics::instance()->metrics()->register_hook(#name, [&]() { \
+#define REGISTER_HOOK_METRIC(name, func) \
+ DorisMetrics::instance()->server_entity()->register_metric(&METRIC_##name,
&DorisMetrics::instance()->name); \
+ DorisMetrics::instance()->server_entity()->register_hook(#name, [&]() { \
DorisMetrics::instance()->name.set_value(func()); \
});
+#define DEREGISTER_HOOK_METRIC(name) \
+
DorisMetrics::instance()->server_entity()->deregister_metric(&METRIC_##name); \
+ DorisMetrics::instance()->server_entity()->deregister_hook(#name);
+
class DorisMetrics {
public:
- // counters
- METRIC_DEFINE_INT_COUNTER(fragment_requests_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(fragment_request_duration_us,
MetricUnit::MICROSECONDS);
- METRIC_DEFINE_INT_COUNTER(http_requests_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(http_request_send_bytes, MetricUnit::BYTES);
- METRIC_DEFINE_INT_COUNTER(query_scan_bytes, MetricUnit::BYTES);
- METRIC_DEFINE_INT_COUNTER(query_scan_rows, MetricUnit::ROWS);
- METRIC_DEFINE_INT_COUNTER(push_requests_success_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(push_requests_fail_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(push_request_duration_us,
MetricUnit::MICROSECONDS);
- METRIC_DEFINE_INT_COUNTER(push_request_write_bytes, MetricUnit::BYTES);
- METRIC_DEFINE_INT_COUNTER(push_request_write_rows, MetricUnit::ROWS);
- METRIC_DEFINE_INT_COUNTER(create_tablet_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(create_tablet_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(drop_tablet_requests_total,
MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(report_all_tablets_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_all_tablets_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_tablet_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_tablet_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_disk_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_disk_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_task_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_task_requests_failed,
MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(schema_change_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(schema_change_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(create_rollup_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(create_rollup_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(storage_migrate_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(delete_requests_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(delete_requests_failed, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(clone_requests_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(clone_requests_failed, MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(finish_task_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(finish_task_requests_failed,
MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(base_compaction_request_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(base_compaction_request_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(cumulative_compaction_request_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(cumulative_compaction_request_failed,
MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(base_compaction_deltas_total,
MetricUnit::ROWSETS);
- METRIC_DEFINE_INT_COUNTER(base_compaction_bytes_total, MetricUnit::BYTES);
- METRIC_DEFINE_INT_COUNTER(cumulative_compaction_deltas_total,
MetricUnit::ROWSETS);
- METRIC_DEFINE_INT_COUNTER(cumulative_compaction_bytes_total,
MetricUnit::BYTES);
-
- METRIC_DEFINE_INT_COUNTER(publish_task_request_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(publish_task_failed_total, MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(meta_write_request_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(meta_write_request_duration_us,
MetricUnit::MICROSECONDS);
- METRIC_DEFINE_INT_COUNTER(meta_read_request_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(meta_read_request_duration_us,
MetricUnit::MICROSECONDS);
+ //METRIC_DEFINE_INT_COUNTER(load_rows_total, MetricUnit::ROWS);
+ //METRIC_DEFINE_INT_COUNTER(load_bytes_total, MetricUnit::BYTES);
+
+ //IntGaugeMetricsMap disks_total_capacity;
Review comment:
Remove the unused code
##########
File path: be/src/util/doris_metrics.h
##########
@@ -28,163 +28,152 @@
namespace doris {
-class IntGaugeMetricsMap {
-public:
- void set_metric(const std::string& key, int64_t val) {
- auto metric = metrics.find(key);
- if (metric != metrics.end()) {
- metric->second->set_value(val);
- }
- }
-
- IntGauge* add_metric(const std::string& key, const MetricUnit unit) {
- metrics.emplace(key, new IntGauge(unit));
- return metrics.find(key)->second.get();
- }
-
-private:
- std::unordered_map<std::string, std::unique_ptr<IntGauge>> metrics;
-};
-
-#define REGISTER_GAUGE_DORIS_METRIC(name, func) \
- DorisMetrics::instance()->metrics()->register_metric(#name,
&DorisMetrics::instance()->name); \
- DorisMetrics::instance()->metrics()->register_hook(#name, [&]() { \
+#define REGISTER_HOOK_METRIC(name, func) \
+ DorisMetrics::instance()->server_entity()->register_metric(&METRIC_##name,
&DorisMetrics::instance()->name); \
+ DorisMetrics::instance()->server_entity()->register_hook(#name, [&]() { \
DorisMetrics::instance()->name.set_value(func()); \
});
+#define DEREGISTER_HOOK_METRIC(name) \
+
DorisMetrics::instance()->server_entity()->deregister_metric(&METRIC_##name); \
+ DorisMetrics::instance()->server_entity()->deregister_hook(#name);
+
class DorisMetrics {
public:
- // counters
- METRIC_DEFINE_INT_COUNTER(fragment_requests_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(fragment_request_duration_us,
MetricUnit::MICROSECONDS);
- METRIC_DEFINE_INT_COUNTER(http_requests_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(http_request_send_bytes, MetricUnit::BYTES);
- METRIC_DEFINE_INT_COUNTER(query_scan_bytes, MetricUnit::BYTES);
- METRIC_DEFINE_INT_COUNTER(query_scan_rows, MetricUnit::ROWS);
- METRIC_DEFINE_INT_COUNTER(push_requests_success_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(push_requests_fail_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(push_request_duration_us,
MetricUnit::MICROSECONDS);
- METRIC_DEFINE_INT_COUNTER(push_request_write_bytes, MetricUnit::BYTES);
- METRIC_DEFINE_INT_COUNTER(push_request_write_rows, MetricUnit::ROWS);
- METRIC_DEFINE_INT_COUNTER(create_tablet_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(create_tablet_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(drop_tablet_requests_total,
MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(report_all_tablets_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_all_tablets_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_tablet_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_tablet_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_disk_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_disk_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_task_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(report_task_requests_failed,
MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(schema_change_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(schema_change_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(create_rollup_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(create_rollup_requests_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(storage_migrate_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(delete_requests_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(delete_requests_failed, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(clone_requests_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(clone_requests_failed, MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(finish_task_requests_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(finish_task_requests_failed,
MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(base_compaction_request_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(base_compaction_request_failed,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(cumulative_compaction_request_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(cumulative_compaction_request_failed,
MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(base_compaction_deltas_total,
MetricUnit::ROWSETS);
- METRIC_DEFINE_INT_COUNTER(base_compaction_bytes_total, MetricUnit::BYTES);
- METRIC_DEFINE_INT_COUNTER(cumulative_compaction_deltas_total,
MetricUnit::ROWSETS);
- METRIC_DEFINE_INT_COUNTER(cumulative_compaction_bytes_total,
MetricUnit::BYTES);
-
- METRIC_DEFINE_INT_COUNTER(publish_task_request_total,
MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(publish_task_failed_total, MetricUnit::REQUESTS);
-
- METRIC_DEFINE_INT_COUNTER(meta_write_request_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(meta_write_request_duration_us,
MetricUnit::MICROSECONDS);
- METRIC_DEFINE_INT_COUNTER(meta_read_request_total, MetricUnit::REQUESTS);
- METRIC_DEFINE_INT_COUNTER(meta_read_request_duration_us,
MetricUnit::MICROSECONDS);
+ //METRIC_DEFINE_INT_COUNTER(load_rows_total, MetricUnit::ROWS);
+ //METRIC_DEFINE_INT_COUNTER(load_bytes_total, MetricUnit::BYTES);
+
+ //IntGaugeMetricsMap disks_total_capacity;
+ //IntGaugeMetricsMap disks_avail_capacity;
+ //IntGaugeMetricsMap disks_data_used_capacity;
+ //IntGaugeMetricsMap disks_state;
+
+ IntCounter fragment_requests_total;
+ IntCounter fragment_request_duration_us;
Review comment:
Use 4 space instead of tab
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
