This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a0b86fbb548 Rename metrics id from proxy_request_total to
proxy_requests_total (#23483)
a0b86fbb548 is described below
commit a0b86fbb548855742a0afee6b52a1ec42c6bf2fc
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jan 11 00:38:44 2023 +0800
Rename metrics id from proxy_request_total to proxy_requests_total (#23483)
---
.../shardingsphere/agent/plugin/metrics/core/constant/MetricIds.java | 2 +-
.../src/main/resources/META-INF/conf/prometheus-metrics.yaml | 4 ++--
.../src/test/resources/META-INF/conf/prometheus-metrics.yaml | 2 +-
.../user-manual/shardingsphere-proxy/observability/_index.cn.md | 4 ++--
.../user-manual/shardingsphere-proxy/observability/_index.en.md | 4 ++--
.../shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/constant/MetricIds.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/constant/MetricIds.java
index 36204e36c69..3377e283b58 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/constant/MetricIds.java
+++
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/constant/MetricIds.java
@@ -22,7 +22,7 @@ package
org.apache.shardingsphere.agent.plugin.metrics.core.constant;
*/
public final class MetricIds {
- public static final String PROXY_REQUESTS = "proxy_request_total";
+ public static final String PROXY_REQUESTS = "proxy_requests_total";
public static final String CURRENT_PROXY_CONNECTIONS =
"current_proxy_connections";
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/conf/prometheus-metrics.yaml
b/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/conf/prometheus-metrics.yaml
index 815e91cd1c9..a17ca0f7d2f 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/conf/prometheus-metrics.yaml
+++
b/agent/plugins/metrics/type/prometheus/src/main/resources/META-INF/conf/prometheus-metrics.yaml
@@ -16,9 +16,9 @@
#
metrics:
- - id: proxy_request_total
+ - id: proxy_requests_total
type: COUNTER
- name: proxy_request_total
+ name: proxy_requests_total
help: the total requests of ShardingSphere-Proxy
- id: current_proxy_connections
type: GAUGE
diff --git
a/agent/plugins/metrics/type/prometheus/src/test/resources/META-INF/conf/prometheus-metrics.yaml
b/agent/plugins/metrics/type/prometheus/src/test/resources/META-INF/conf/prometheus-metrics.yaml
index bcf1937c8db..fb5becacbd8 100644
---
a/agent/plugins/metrics/type/prometheus/src/test/resources/META-INF/conf/prometheus-metrics.yaml
+++
b/agent/plugins/metrics/type/prometheus/src/test/resources/META-INF/conf/prometheus-metrics.yaml
@@ -18,7 +18,7 @@
metrics:
- id: a
type: COUNTER
- name: proxy_request_total
+ name: proxy_requests_total
help: the total requests of ShardingSphere-Proxy
- id: b
type: GAUGE
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.cn.md
index 9226204b4bf..fcec790fcd1 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.cn.md
@@ -155,8 +155,8 @@ services:
## Metrics
| 指标名称 | 类型 | 描述
|
-| :------------------------------- |:---------
|:-------------------------------------------------------------- |
-| proxy_request_total | COUNTER | ShardingSphere-Proxy 的接受请求总合
|
+| :------------------------------- | :-------- |
:------------------------------------------------------------- |
+| proxy_requests_total | COUNTER | ShardingSphere-Proxy 的接受请求总合
|
| current_proxy_connections | GAUGE | ShardingSphere-Proxy 的当前连接数
|
| proxy_execute_latency_millis | HISTOGRAM | ShardingSphere-Proxy 的执行耗时毫秒
|
| proxy_execute_error_total | COUNTER | ShardingSphere-Proxy 的执行异常总数
|
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.en.md
index 4c5aff82b4e..2ac67eba421 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/observability/_index.en.md
@@ -158,8 +158,8 @@ services:
## Metrics
| name | type | description
|
-| :------------------------------- |:---------
|:---------------------------------------------------------------------------------------------------------
|
-| proxy_request_total | COUNTER | total requests of
ShardingSphere-Proxy
|
+| :------------------------------- | :-------- |
:--------------------------------------------------------------------------------------------------------
|
+| proxy_requests_total | COUNTER | total requests of
ShardingSphere-Proxy
|
| current_proxy_connections | GAUGE | the current connections of
ShardingSphere-Proxy |
| proxy_execute_latency_millis | HISTOGRAM | the executor latency millis
of ShardingSphere-Proxy |
| proxy_execute_error_total | COUNTER | proxy executor error total
|
diff --git
a/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
b/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
index 21b58f6726e..5415d6f1205 100644
---
a/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
+++
b/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
@Slf4j
public final class MetricsPluginE2EIT extends BasePluginE2EIT {
- public static final String TOTAL_PROXY_REQUESTS = "proxy_request_total";
+ public static final String TOTAL_PROXY_REQUESTS = "proxy_requests_total";
public static final String CURRENT_PROXY_CONNECTIONS =
"current_proxy_connections";
