This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 336ad2b21f8 [fix](fe) Fix fe prometheus metric rest api npt (#34756)
(#35401)
336ad2b21f8 is described below
commit 336ad2b21f82055f45f3a14e453b92da3fc44f4a
Author: Kang <kxiao.ti...@gmail.com>
AuthorDate: Sun May 26 20:24:23 2024 +0800
[fix](fe) Fix fe prometheus metric rest api npt (#34756) (#35401)
---
.../java/org/apache/doris/metric/GaugeMetricImpl.java | 3 ++-
.../main/java/org/apache/doris/metric/MetricRepo.java | 19 ++++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/metric/GaugeMetricImpl.java
b/fe/fe-core/src/main/java/org/apache/doris/metric/GaugeMetricImpl.java
index a66bc4f02d8..1a46c9ff99e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/metric/GaugeMetricImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/metric/GaugeMetricImpl.java
@@ -19,8 +19,9 @@ package org.apache.doris.metric;
public class GaugeMetricImpl<T> extends GaugeMetric<T> {
- public GaugeMetricImpl(String name, MetricUnit unit, String description) {
+ public GaugeMetricImpl(String name, MetricUnit unit, String description, T
defaultValue) {
super(name, unit, description);
+ this.value = defaultValue;
}
private T value;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java
b/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java
index dfd772f5fd2..f1d186e5a45 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java
@@ -263,19 +263,15 @@ public final class MetricRepo {
// qps, rps and error rate
// these metrics should be set an init value, in case that metric
calculator is not running
- GAUGE_QUERY_PER_SECOND = new GaugeMetricImpl<>("qps",
MetricUnit.NOUNIT, "query per second");
- GAUGE_QUERY_PER_SECOND.setValue(0.0);
+ GAUGE_QUERY_PER_SECOND = new GaugeMetricImpl<>("qps",
MetricUnit.NOUNIT, "query per second", 0.0);
DORIS_METRIC_REGISTER.addMetrics(GAUGE_QUERY_PER_SECOND);
- GAUGE_REQUEST_PER_SECOND = new GaugeMetricImpl<>("rps",
MetricUnit.NOUNIT, "request per second");
- GAUGE_REQUEST_PER_SECOND.setValue(0.0);
+ GAUGE_REQUEST_PER_SECOND = new GaugeMetricImpl<>("rps",
MetricUnit.NOUNIT, "request per second", 0.0);
DORIS_METRIC_REGISTER.addMetrics(GAUGE_REQUEST_PER_SECOND);
- GAUGE_QUERY_ERR_RATE = new GaugeMetricImpl<>("query_err_rate",
MetricUnit.NOUNIT, "query error rate");
+ GAUGE_QUERY_ERR_RATE = new GaugeMetricImpl<>("query_err_rate",
MetricUnit.NOUNIT, "query error rate", 0.0);
DORIS_METRIC_REGISTER.addMetrics(GAUGE_QUERY_ERR_RATE);
- GAUGE_QUERY_ERR_RATE.setValue(0.0);
GAUGE_MAX_TABLET_COMPACTION_SCORE = new
GaugeMetricImpl<>("max_tablet_compaction_score", MetricUnit.NOUNIT,
- "max tablet compaction score of all backends");
+ "max tablet compaction score of all backends", 0L);
DORIS_METRIC_REGISTER.addMetrics(GAUGE_MAX_TABLET_COMPACTION_SCORE);
- GAUGE_MAX_TABLET_COMPACTION_SCORE.setValue(0L);
// query
COUNTER_REQUEST_ALL = new LongCounterMetric("request_total",
MetricUnit.REQUESTS, "total request");
@@ -317,7 +313,7 @@ public final class MetricRepo {
"number of query instance begin"));
USER_GAUGE_QUERY_INSTANCE_NUM = addLabeledMetrics("user", () ->
new GaugeMetricImpl<>("query_instance_num", MetricUnit.NOUNIT,
- "number of running query instances of current user"));
+ "number of running query instances of current user", 0L));
GaugeMetric<Long> queryInstanceNum = new
GaugeMetric<Long>("query_instance_num",
MetricUnit.NOUNIT, "number of query instances of all current
users") {
@Override
@@ -451,7 +447,7 @@ public final class MetricRepo {
};
DORIS_METRIC_REGISTER.addMetrics(txnNum);
DB_GAUGE_TXN_NUM = addLabeledMetrics("db", () ->
- new GaugeMetricImpl<>("txn_num", MetricUnit.NOUNIT, "number of
running transactions"));
+ new GaugeMetricImpl<>("txn_num", MetricUnit.NOUNIT, "number of
running transactions", 0L));
GaugeMetric<Long> publishTxnNum = new
GaugeMetric<Long>("publish_txn_num", MetricUnit.NOUNIT,
"number of publish transactions") {
@Override
@@ -461,7 +457,8 @@ public final class MetricRepo {
};
DORIS_METRIC_REGISTER.addMetrics(publishTxnNum);
DB_GAUGE_PUBLISH_TXN_NUM = addLabeledMetrics("db",
- () -> new GaugeMetricImpl<>("publish_txn_num",
MetricUnit.NOUNIT, "number of publish transactions"));
+ () -> new GaugeMetricImpl<>("publish_txn_num",
MetricUnit.NOUNIT,
+ "number of publish transactions", 0L));
COUNTER_ROUTINE_LOAD_ROWS = new LongCounterMetric("routine_load_rows",
MetricUnit.ROWS,
"total rows of routine load");
DORIS_METRIC_REGISTER.addMetrics(COUNTER_ROUTINE_LOAD_ROWS);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
