This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 ac256776d68 Refactor MetricIds (#23553)
ac256776d68 is described below
commit ac256776d68423507e9adcf01d90343aadfa4bcf
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 14 20:37:21 2023 +0800
Refactor MetricIds (#23553)
* Refactor MetricIds
---
.../metrics/core/advice/SQLParserEngineAdvice.java | 44 +++++++-------
.../metrics/core/advice/SQLRouteEngineAdvice.java | 24 ++++----
.../plugin/metrics/core/constant/MetricIds.java | 34 +++++------
.../core/advice/SQLParserEngineAdviceTest.java | 22 +++----
.../core/advice/SQLRouteEngineAdviceTest.java | 16 ++---
.../META-INF/conf/prometheus-metrics.yaml | 68 +++++++++++-----------
...Observability_Apache_ShardingSphere_Agent.en.md | 2 +-
.../observability/_index.cn.md | 36 ++++++------
.../observability/_index.en.md | 34 +++++------
.../test/e2e/agent/metrics/MetricsPluginE2EIT.java | 24 ++++----
10 files changed, 152 insertions(+), 152 deletions(-)
diff --git
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdvice.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdvice.java
index bb7a2e01e61..b49cb2369a4 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdvice.java
+++
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdvice.java
@@ -43,17 +43,17 @@ import java.lang.reflect.Method;
public final class SQLParserEngineAdvice implements InstanceMethodAdvice {
static {
- MetricsPool.create(MetricIds.PARSE_SQL_INSERT);
- MetricsPool.create(MetricIds.PARSE_SQL_DELETE);
- MetricsPool.create(MetricIds.PARSE_SQL_UPDATE);
- MetricsPool.create(MetricIds.PARSE_SQL_SELECT);
- MetricsPool.create(MetricIds.PARSE_SQL_DDL);
- MetricsPool.create(MetricIds.PARSE_SQL_DCL);
- MetricsPool.create(MetricIds.PARSE_SQL_DAL);
- MetricsPool.create(MetricIds.PARSE_SQL_TCL);
- MetricsPool.create(MetricIds.PARSE_DIST_SQL_RQL);
- MetricsPool.create(MetricIds.PARSE_DIST_SQL_RDL);
- MetricsPool.create(MetricIds.PARSE_DIST_SQL_RAL);
+ MetricsPool.create(MetricIds.PARSED_INSERT_SQL);
+ MetricsPool.create(MetricIds.PARSED_DELETE_SQL);
+ MetricsPool.create(MetricIds.PARSED_UPDATE_SQL);
+ MetricsPool.create(MetricIds.PARSED_SELECT_SQL);
+ MetricsPool.create(MetricIds.PARSED_DDL);
+ MetricsPool.create(MetricIds.PARSED_DCL);
+ MetricsPool.create(MetricIds.PARSED_DAL);
+ MetricsPool.create(MetricIds.PARSED_TCL);
+ MetricsPool.create(MetricIds.PARSED_RQL);
+ MetricsPool.create(MetricIds.PARSED_RDL);
+ MetricsPool.create(MetricIds.PARSED_RAL);
}
@Override
@@ -65,31 +65,31 @@ public final class SQLParserEngineAdvice implements
InstanceMethodAdvice {
private void countSQL(final SQLStatement sqlStatement) {
if (sqlStatement instanceof InsertStatement) {
-
MetricsPool.get(MetricIds.PARSE_SQL_INSERT).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_INSERT_SQL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof DeleteStatement) {
-
MetricsPool.get(MetricIds.PARSE_SQL_DELETE).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_DELETE_SQL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof UpdateStatement) {
-
MetricsPool.get(MetricIds.PARSE_SQL_UPDATE).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_UPDATE_SQL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof SelectStatement) {
-
MetricsPool.get(MetricIds.PARSE_SQL_SELECT).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_SELECT_SQL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof DDLStatement) {
-
MetricsPool.get(MetricIds.PARSE_SQL_DDL).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_DDL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof DCLStatement) {
-
MetricsPool.get(MetricIds.PARSE_SQL_DCL).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_DCL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof DALStatement) {
-
MetricsPool.get(MetricIds.PARSE_SQL_DAL).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_DAL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof TCLStatement) {
-
MetricsPool.get(MetricIds.PARSE_SQL_TCL).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_TCL).ifPresent(MetricsWrapper::inc);
}
}
private void countDistSQL(final SQLStatement sqlStatement) {
if (sqlStatement instanceof RQLStatement) {
-
MetricsPool.get(MetricIds.PARSE_DIST_SQL_RQL).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_RQL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof RDLStatement) {
-
MetricsPool.get(MetricIds.PARSE_DIST_SQL_RDL).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_RDL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof RALStatement) {
-
MetricsPool.get(MetricIds.PARSE_DIST_SQL_RAL).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.PARSED_RAL).ifPresent(MetricsWrapper::inc);
}
}
}
diff --git
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdvice.java
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdvice.java
index 87281191ea6..3ad6c2639ad 100644
---
a/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdvice.java
+++
b/agent/plugins/metrics/core/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdvice.java
@@ -41,12 +41,12 @@ import java.util.Collection;
public final class SQLRouteEngineAdvice implements InstanceMethodAdvice {
static {
- MetricsPool.create(MetricIds.ROUTE_SQL_INSERT);
- MetricsPool.create(MetricIds.ROUTE_SQL_DELETE);
- MetricsPool.create(MetricIds.ROUTE_SQL_UPDATE);
- MetricsPool.create(MetricIds.ROUTE_SQL_SELECT);
- MetricsPool.create(MetricIds.ROUTE_DATASOURCE);
- MetricsPool.create(MetricIds.ROUTE_TABLE);
+ MetricsPool.create(MetricIds.ROUTED_INSERT_SQL);
+ MetricsPool.create(MetricIds.ROUTED_DELETE_SQL);
+ MetricsPool.create(MetricIds.ROUTED_UPDATE_SQL);
+ MetricsPool.create(MetricIds.ROUTED_SELECT_SQL);
+ MetricsPool.create(MetricIds.ROUTED_DATA_SOURCES);
+ MetricsPool.create(MetricIds.ROUTED_TABLES);
}
@Override
@@ -54,13 +54,13 @@ public final class SQLRouteEngineAdvice implements
InstanceMethodAdvice {
QueryContext queryContext = (QueryContext) args[1];
SQLStatement sqlStatement =
queryContext.getSqlStatementContext().getSqlStatement();
if (sqlStatement instanceof InsertStatement) {
-
MetricsPool.get(MetricIds.ROUTE_SQL_INSERT).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.ROUTED_INSERT_SQL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof DeleteStatement) {
-
MetricsPool.get(MetricIds.ROUTE_SQL_DELETE).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.ROUTED_DELETE_SQL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof UpdateStatement) {
-
MetricsPool.get(MetricIds.ROUTE_SQL_UPDATE).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.ROUTED_UPDATE_SQL).ifPresent(MetricsWrapper::inc);
} else if (sqlStatement instanceof SelectStatement) {
-
MetricsPool.get(MetricIds.ROUTE_SQL_SELECT).ifPresent(MetricsWrapper::inc);
+
MetricsPool.get(MetricIds.ROUTED_SELECT_SQL).ifPresent(MetricsWrapper::inc);
}
}
@@ -71,8 +71,8 @@ public final class SQLRouteEngineAdvice implements
InstanceMethodAdvice {
Collection<RouteUnit> routeUnits = routeContext.getRouteUnits();
routeUnits.forEach(each -> {
RouteMapper dataSourceMapper = each.getDataSourceMapper();
- MetricsPool.get(MetricIds.ROUTE_DATASOURCE).ifPresent(optional
-> optional.inc(dataSourceMapper.getActualName()));
- each.getTableMappers().forEach(table ->
MetricsPool.get(MetricIds.ROUTE_TABLE).ifPresent(optional ->
optional.inc(table.getActualName())));
+
MetricsPool.get(MetricIds.ROUTED_DATA_SOURCES).ifPresent(optional ->
optional.inc(dataSourceMapper.getActualName()));
+ each.getTableMappers().forEach(table ->
MetricsPool.get(MetricIds.ROUTED_TABLES).ifPresent(optional ->
optional.inc(table.getActualName())));
});
}
}
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 32ac9d537f9..068fb5bd5c2 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
@@ -26,39 +26,39 @@ public final class MetricIds {
public static final String METADATA_INFO = "meta_data_info";
- public static final String PARSE_SQL_INSERT = "parse_sql_dml_insert_total";
+ public static final String PARSED_INSERT_SQL = "parsed_insert_sql_total";
- public static final String PARSE_SQL_UPDATE = "parse_sql_dml_update_total";
+ public static final String PARSED_UPDATE_SQL = "parsed_update_sql_total";
- public static final String PARSE_SQL_DELETE = "parse_sql_dml_delete_total";
+ public static final String PARSED_DELETE_SQL = "parsed_delete_sql_total";
- public static final String PARSE_SQL_SELECT = "parse_sql_dml_select_total";
+ public static final String PARSED_SELECT_SQL = "parsed_select_sql_total";
- public static final String PARSE_SQL_DDL = "parse_sql_ddl_total";
+ public static final String PARSED_DDL = "parsed_ddl_total";
- public static final String PARSE_SQL_DCL = "parse_sql_dcl_total";
+ public static final String PARSED_DCL = "parsed_dcl_total";
- public static final String PARSE_SQL_DAL = "parse_sql_dal_total";
+ public static final String PARSED_DAL = "parsed_dal_total";
- public static final String PARSE_SQL_TCL = "parse_sql_tcl_total";
+ public static final String PARSED_TCL = "parsed_tcl_total";
- public static final String PARSE_DIST_SQL_RQL = "parse_dist_sql_rql_total";
+ public static final String PARSED_RQL = "parsed_rql_total";
- public static final String PARSE_DIST_SQL_RDL = "parse_dist_sql_rdl_total";
+ public static final String PARSED_RDL = "parsed_rdl_total";
- public static final String PARSE_DIST_SQL_RAL = "parse_dist_sql_ral_total";
+ public static final String PARSED_RAL = "parsed_ral_total";
- public static final String ROUTE_SQL_SELECT = "route_sql_select_total";
+ public static final String ROUTED_INSERT_SQL = "routed_insert_sql_total";
- public static final String ROUTE_SQL_UPDATE = "route_sql_update_total";
+ public static final String ROUTED_UPDATE_SQL = "routed_update_sql_total";
- public static final String ROUTE_SQL_DELETE = "route_sql_delete_total";
+ public static final String ROUTED_DELETE_SQL = "routed_delete_sql_total";
- public static final String ROUTE_SQL_INSERT = "route_sql_insert_total";
+ public static final String ROUTED_SELECT_SQL = "routed_select_sql_total";
- public static final String ROUTE_DATASOURCE = "route_datasource_total";
+ public static final String ROUTED_DATA_SOURCES =
"routed_data_sources_total";
- public static final String ROUTE_TABLE = "route_table_total";
+ public static final String ROUTED_TABLES = "routed_tables_total";
public static final String PROXY_INFO = "proxy_info";
diff --git
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdviceTest.java
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdviceTest.java
index 3d3637c2435..cd49cf2820d 100644
---
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdviceTest.java
+++
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLParserEngineAdviceTest.java
@@ -47,57 +47,57 @@ public final class SQLParserEngineAdviceTest extends
MetricsAdviceBaseTest {
@Test
public void assertParseInsertSQL() {
- assertParse(MetricIds.PARSE_SQL_INSERT, new MySQLInsertStatement());
+ assertParse(MetricIds.PARSED_INSERT_SQL, new MySQLInsertStatement());
}
@Test
public void assertParseDeleteSQL() {
- assertParse(MetricIds.PARSE_SQL_DELETE, new MySQLDeleteStatement());
+ assertParse(MetricIds.PARSED_DELETE_SQL, new MySQLDeleteStatement());
}
@Test
public void assertParseUpdateSQL() {
- assertParse(MetricIds.PARSE_SQL_UPDATE, new MySQLUpdateStatement());
+ assertParse(MetricIds.PARSED_UPDATE_SQL, new MySQLUpdateStatement());
}
@Test
public void assertParseSelectSQL() {
- assertParse(MetricIds.PARSE_SQL_SELECT, new MySQLSelectStatement());
+ assertParse(MetricIds.PARSED_SELECT_SQL, new MySQLSelectStatement());
}
@Test
public void assertParseDDL() {
- assertParse(MetricIds.PARSE_SQL_DDL, new
MySQLCreateDatabaseStatement());
+ assertParse(MetricIds.PARSED_DDL, new MySQLCreateDatabaseStatement());
}
@Test
public void assertParseDCL() {
- assertParse(MetricIds.PARSE_SQL_DCL, new MySQLCreateUserStatement());
+ assertParse(MetricIds.PARSED_DCL, new MySQLCreateUserStatement());
}
@Test
public void assertParseDAL() {
- assertParse(MetricIds.PARSE_SQL_DAL, new
MySQLShowDatabasesStatement());
+ assertParse(MetricIds.PARSED_DAL, new MySQLShowDatabasesStatement());
}
@Test
public void assertParseTCL() {
- assertParse(MetricIds.PARSE_SQL_TCL, new MySQLCommitStatement());
+ assertParse(MetricIds.PARSED_TCL, new MySQLCommitStatement());
}
@Test
public void assertParseRQL() {
- assertParse(MetricIds.PARSE_DIST_SQL_RQL, new
ShowStorageUnitsStatement(new DatabaseSegment(0, 0, null), null));
+ assertParse(MetricIds.PARSED_RQL, new ShowStorageUnitsStatement(new
DatabaseSegment(0, 0, null), null));
}
@Test
public void assertParseRDL() {
- assertParse(MetricIds.PARSE_DIST_SQL_RDL, new
RegisterStorageUnitStatement(false, Collections.emptyList()));
+ assertParse(MetricIds.PARSED_RDL, new
RegisterStorageUnitStatement(false, Collections.emptyList()));
}
@Test
public void assertParseRAL() {
- assertParse(MetricIds.PARSE_DIST_SQL_RAL, new
ShowMigrationListStatement());
+ assertParse(MetricIds.PARSED_RAL, new ShowMigrationListStatement());
}
private void assertParse(final String metricIds, final SQLStatement
sqlStatement) {
diff --git
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdviceTest.java
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdviceTest.java
index 86fe338f299..e63f81bcd9c 100644
---
a/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdviceTest.java
+++
b/agent/plugins/metrics/core/src/test/java/org/apache/shardingsphere/agent/plugin/metrics/core/advice/SQLRouteEngineAdviceTest.java
@@ -47,25 +47,25 @@ public final class SQLRouteEngineAdviceTest extends
MetricsAdviceBaseTest {
@Test
public void assertInsertRoute() {
QueryContext queryContext = new QueryContext(new
CommonSQLStatementContext<>(new MySQLInsertStatement()), "",
Collections.emptyList());
- assertRoute(MetricIds.ROUTE_SQL_INSERT, queryContext);
+ assertRoute(MetricIds.ROUTED_INSERT_SQL, queryContext);
}
@Test
public void assertSelectRoute() {
QueryContext queryContext = new QueryContext(new
CommonSQLStatementContext<>(new MySQLSelectStatement()), "",
Collections.emptyList());
- assertRoute(MetricIds.ROUTE_SQL_SELECT, queryContext);
+ assertRoute(MetricIds.ROUTED_SELECT_SQL, queryContext);
}
@Test
public void assertDeleteRoute() {
QueryContext queryContext = new QueryContext(new
CommonSQLStatementContext<>(new MySQLDeleteStatement()), "",
Collections.emptyList());
- assertRoute(MetricIds.ROUTE_SQL_DELETE, queryContext);
+ assertRoute(MetricIds.ROUTED_DELETE_SQL, queryContext);
}
@Test
public void assertUpdateRoute() {
QueryContext queryContext = new QueryContext(new
CommonSQLStatementContext<>(new MySQLUpdateStatement()), "",
Collections.emptyList());
- assertRoute(MetricIds.ROUTE_SQL_UPDATE, queryContext);
+ assertRoute(MetricIds.ROUTED_UPDATE_SQL, queryContext);
}
public void assertRoute(final String metricIds, final QueryContext
queryContext) {
@@ -85,11 +85,11 @@ public final class SQLRouteEngineAdviceTest extends
MetricsAdviceBaseTest {
RouteUnit routeUnit = new RouteUnit(dsMapper,
Collections.singletonList(tbMapper));
routeContext.getRouteUnits().add(routeUnit);
sqlRouteEngineAdvice.afterMethod(targetObject, mock(Method.class), new
Object[]{}, routeContext);
- FixtureWrapper wrapper = (FixtureWrapper)
MetricsPool.get(MetricIds.ROUTE_DATASOURCE).get();
- assertTrue(MetricsPool.get(MetricIds.ROUTE_DATASOURCE).isPresent());
+ FixtureWrapper wrapper = (FixtureWrapper)
MetricsPool.get(MetricIds.ROUTED_DATA_SOURCES).get();
+ assertTrue(MetricsPool.get(MetricIds.ROUTED_DATA_SOURCES).isPresent());
assertThat(wrapper.getFixtureValue(), is(1.0));
- wrapper = (FixtureWrapper)
MetricsPool.get(MetricIds.ROUTE_TABLE).get();
- assertTrue(MetricsPool.get(MetricIds.ROUTE_TABLE).isPresent());
+ wrapper = (FixtureWrapper)
MetricsPool.get(MetricIds.ROUTED_TABLES).get();
+ assertTrue(MetricsPool.get(MetricIds.ROUTED_TABLES).isPresent());
assertThat(wrapper.getFixtureValue(), is(1.0));
}
}
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 503cf4046b2..214ada28af4 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
@@ -29,74 +29,74 @@ metrics:
help: Meta data information. schema_count is logic number of databases;
database_count is actual number of databases
labels:
- name
- - id: parse_sql_dml_insert_total
- name: parse_sql_dml_insert_total
+ - id: parsed_insert_sql_total
+ name: parsed_insert_sql_total
type: COUNTER
help: Total count of parsed INSERT
- - id: parse_sql_dml_update_total
- name: parse_sql_dml_update_total
+ - id: parsed_update_sql_total
+ name: parsed_update_sql_total
type: COUNTER
help: Total count of parsed UPDATE
- - id: parse_sql_dml_delete_total
- name: parse_sql_dml_delete_total
+ - id: parsed_delete_sql_total
+ name: parsed_delete_sql_total
type: COUNTER
help: Total count of parsed DELETE
- - id: parse_sql_dml_select_total
- name: parse_sql_dml_select_total
+ - id: parsed_select_sql_total
+ name: parsed_select_sql_total
type: COUNTER
help: Total count of parsed SELECT
- - id: parse_sql_ddl_total
- name: parse_sql_ddl_total
+ - id: parsed_ddl_total
+ name: parsed_ddl_total
type: COUNTER
help: Total count of parsed DDL
- - id: parse_sql_dcl_total
- name: parse_sql_dcl_total
+ - id: parsed_dcl_total
+ name: parsed_dcl_total
type: COUNTER
help: Total count of parsed DCL
- - id: parse_sql_dal_total
- name: parse_sql_dal_total
+ - id: parsed_dal_total
+ name: parsed_dal_total
type: COUNTER
help: Total count of parsed DAL
- - id: parse_sql_tcl_total
- name: parse_sql_tcl_total
+ - id: parsed_tcl_total
+ name: parsed_tcl_total
type: COUNTER
help: Total count of parsed TCL
- - id: parse_dist_sql_rql_total
- name: parse_dist_sql_rql_total
+ - id: parsed_rql_total
+ name: parsed_rql_total
type: COUNTER
help: Total count of parsed RDL
- - id: parse_dist_sql_rdl_total
- name: parse_dist_sql_rdl_total
+ - id: parsed_rdl_total
+ name: parsed_rdl_total
type: COUNTER
help: Total count of parsed RDL
- - id: parse_dist_sql_ral_total
- name: parse_dist_sql_ral_total
+ - id: parsed_ral_total
+ name: parsed_ral_total
type: COUNTER
help: Total count of parsed RAL
- - id: route_sql_insert_total
- name: route_sql_insert_total
+ - id: routed_insert_sql_total
+ name: routed_insert_sql_total
type: COUNTER
help: Total count of routed INSERT
- - id: route_sql_update_total
- name: route_sql_update_total
+ - id: routed_update_sql_total
+ name: routed_update_sql_total
type: COUNTER
help: Total count of routed UPDATE
- - id: route_sql_delete_total
- name: route_sql_delete_total
+ - id: routed_delete_sql_total
+ name: routed_delete_sql_total
type: COUNTER
help: Total count of routed DELETE
- - id: route_sql_select_total
- name: route_sql_select_total
+ - id: routed_select_sql_total
+ name: routed_select_sql_total
type: COUNTER
help: Total count of routed SELECT
- - id: route_datasource_total
- name: route_datasource_total
+ - id: routed_data_sources_total
+ name: routed_data_sources_total
type: COUNTER
labels:
- name
help: Total count of data source routed
- - id: route_table_total
- name: route_table_total
+ - id: routed_tables_total
+ name: routed_tables_total
type: COUNTER
labels:
- name
diff --git
a/docs/blog/content/material/2022_03_25_A_Deep_Dive_Into_Observability_Apache_ShardingSphere_Agent.en.md
b/docs/blog/content/material/2022_03_25_A_Deep_Dive_Into_Observability_Apache_ShardingSphere_Agent.en.md
index 5e61d9f496c..cb25bd1a5a4 100644
---
a/docs/blog/content/material/2022_03_25_A_Deep_Dive_Into_Observability_Apache_ShardingSphere_Agent.en.md
+++
b/docs/blog/content/material/2022_03_25_A_Deep_Dive_Into_Observability_Apache_ShardingSphere_Agent.en.md
@@ -165,7 +165,7 @@ Query `proxy_info` and get the data results through
Prometheus Web.
- Examine the data results of Prometheus Server and Zipkin Server
-Query `parse_sql_dml_select_total `data results through Prometheus Web.
+Query `parsed_select_sql_total `data results through Prometheus Web.
Query tracing information via Zipkin Web:
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 f6f13835c4e..57c2d8833b0 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
@@ -154,27 +154,27 @@ services:
## Metrics
-| 指标名称 | 指标类型 | 指标描述
|
+| 指标名称 | 指标类型 | 指标描述
|
| :-------------------------------- | :-------- |
:---------------------------------------------------------- |
| build_info | GAUGE | 构建信息
|
| meta_data_info | GAUGE | 元数据信息， schema_count：逻辑库数量，
database_count：数据源数量 |
-| parse_sql_dml_insert_total | COUNTER | INSERT 的解析总数
|
-| parse_sql_dml_update_total | COUNTER | UPDATE 的解析总数
|
-| parse_sql_dml_delete_total | COUNTER | DELETE 的解析总数
|
-| parse_sql_dml_select_total | COUNTER | SELECT 的解析总数
|
-| parse_sql_ddl_total | COUNTER | DDL 的解析总数
|
-| parse_sql_dcl_total | COUNTER | DCL 的解析总数
|
-| parse_sql_dal_total | COUNTER | DAL 的解析总数
|
-| parse_sql_tcl_total | COUNTER | TCL 的解析总数
|
-| parse_dist_sql_rql_total | COUNTER | RQL 的解析总数
|
-| parse_dist_sql_rdl_total | COUNTER | RDL 的解析总数
|
-| parse_dist_sql_ral_total | COUNTER | RAL 的解析总数
|
-| route_sql_insert_total | COUNTER | INSERT 的路由总数
|
-| route_sql_update_total | COUNTER | UPDATE 的路由总数
|
-| route_sql_delete_total | COUNTER | DELETE 的路由总数
|
-| route_sql_select_total | COUNTER | SELECT 的路由总数
|
-| route_datasource_total | COUNTER | 数据源路由总数
|
-| route_table_total | COUNTER | 表路由总数
|
+| parsed_insert_sql_total | COUNTER | INSERT 的解析总数
|
+| parsed_update_sql_total | COUNTER | UPDATE 的解析总数
|
+| parsed_delete_sql_total | COUNTER | DELETE 的解析总数
|
+| parsed_select_sql_total | COUNTER | SELECT 的解析总数
|
+| parsed_ddl_total | COUNTER | DDL 的解析总数
|
+| parsed_dcl_total | COUNTER | DCL 的解析总数
|
+| parsed_dal_total | COUNTER | DAL 的解析总数
|
+| parsed_tcl_total | COUNTER | TCL 的解析总数
|
+| parsed_rql_total | COUNTER | RQL 的解析总数
|
+| parsed_rdl_total | COUNTER | RDL 的解析总数
|
+| parsed_ral_total | COUNTER | RAL 的解析总数
|
+| routed_insert_sql_total | COUNTER | INSERT 的路由总数
|
+| routed_update_sql_total | COUNTER | UPDATE 的路由总数
|
+| routed_delete_sql_total | COUNTER | DELETE 的路由总数
|
+| routed_select_sql_total | COUNTER | SELECT 的路由总数
|
+| routed_data_sources_total | COUNTER | 数据源路由总数
|
+| routed_tables_total | COUNTER | 表路由总数
|
| proxy_info | GAUGE | ShardingSphere-Proxy 状态信息。1
表示正常状态；2 表示熔断状态 |
| proxy_current_connections | GAUGE | ShardingSphere-Proxy 的当前连接数
|
| proxy_requests_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 7e36024ca94..c0173ec77ac 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
@@ -161,23 +161,23 @@ services:
| :-------------------------------- | :-------- |
:-------------------------------------------------------------------------------------------------------------
|
| build_info | GAUGE | Build information
|
| meta_data_info | GAUGE | Meta data information.
schema_count is logic number of databases; database_count is actual number of
databases |
-| parse_sql_dml_insert_total | COUNTER | Total count of parsed INSERT
|
-| parse_sql_dml_update_total | COUNTER | Total count of parsed UPDATE
|
-| parse_sql_dml_delete_total | COUNTER | Total count of parsed DELETE
|
-| parse_sql_dml_select_total | COUNTER | Total count of parsed SELECT
|
-| parse_sql_ddl_total | COUNTER | Total count of parsed DDL
|
-| parse_sql_dcl_total | COUNTER | Total count of parsed DCL
|
-| parse_sql_dal_total | COUNTER | Total count of parsed DAL
|
-| parse_sql_tcl_total | COUNTER | Total count of parsed TCL
|
-| parse_dist_sql_rql_total | COUNTER | Total count of parsed RQL
|
-| parse_dist_sql_rdl_total | COUNTER | Total count of parsed RDL
|
-| parse_dist_sql_ral_total | COUNTER | Total count of parsed RAL
|
-| route_sql_insert_total | COUNTER | Total count of routed INSERT
|
-| route_sql_update_total | COUNTER | Total count of routed UPDATE
|
-| route_sql_delete_total | COUNTER | Total count of routed DELETE
|
-| route_sql_select_total | COUNTER | Total count of routed SELECT
|
-| route_datasource_total | COUNTER | Total count of data source
routed
|
-| route_table_total | COUNTER | Total count of table routed
|
+| parsed_insert_sql_total | COUNTER | Total count of parsed INSERT
|
+| parsed_update_sql_total | COUNTER | Total count of parsed UPDATE
|
+| parsed_delete_sql_total | COUNTER | Total count of parsed DELETE
|
+| parsed_select_sql_total | COUNTER | Total count of parsed SELECT
|
+| parsed_ddl_total | COUNTER | Total count of parsed DDL
|
+| parsed_dcl_total | COUNTER | Total count of parsed DCL
|
+| parsed_dal_total | COUNTER | Total count of parsed DAL
|
+| parsed_tcl_total | COUNTER | Total count of parsed TCL
|
+| parsed_rql_total | COUNTER | Total count of parsed RQL
|
+| parsed_rdl_total | COUNTER | Total count of parsed RDL
|
+| parsed_ral_total | COUNTER | Total count of parsed RAL
|
+| routed_insert_sql_total | COUNTER | Total count of routed INSERT
|
+| routed_update_sql_total | COUNTER | Total count of routed UPDATE
|
+| routed_delete_sql_total | COUNTER | Total count of routed DELETE
|
+| routed_select_sql_total | COUNTER | Total count of routed SELECT
|
+| routed_data_sources_total | COUNTER | Total count of data source
routed
|
+| routed_tables_total | COUNTER | Total count of table routed
|
| proxy_info | GAUGE | Status information of
ShardingSphere-Proxy. 1 is OK; 2 is CIRCUIT BREAK
|
| proxy_current_connections | GAUGE | Current connections of
ShardingSphere-Proxy
|
| proxy_requests_total | COUNTER | Total requests of
ShardingSphere-Proxy
|
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 2ef187f0fca..9a3746796a6 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,17 +38,17 @@ import static org.junit.Assert.assertNotNull;
@Slf4j
public final class MetricsPluginE2EIT extends BasePluginE2EIT {
- public static final String ROUTE_SQL_INSERT = "route_sql_insert_total";
+ public static final String ROUTED_INSERT_SQL = "routed_insert_sql_total";
- public static final String ROUTE_SQL_UPDATE = "route_sql_update_total";
+ public static final String ROUTED_UPDATE_SQL = "routed_update_sql_total";
- public static final String ROUTE_SQL_DELETE = "route_sql_delete_total";
+ public static final String ROUTED_DELETE_SQL = "routed_delete_sql_total";
- public static final String ROUTE_SQL_SELECT = "route_sql_select_total";
+ public static final String ROUTED_SELECT_SQL = "routed_select_sql_total";
- public static final String ROUTE_DATASOURCE = "route_datasource_total";
+ public static final String ROUTED_DATA_SOURCES =
"routed_data_sources_total";
- public static final String ROUTE_TABLE = "route_table_total";
+ public static final String ROUTED_TABLES = "routed_tables_total";
public static final String PROXY_CURRENT_CONNECTIONS =
"proxy_current_connections";
@@ -90,12 +90,12 @@ public final class MetricsPluginE2EIT extends
BasePluginE2EIT {
result.add(PROXY_REQUESTS);
result.add(PROXY_CURRENT_CONNECTIONS);
result.add(PROXY_EXECUTE_LATENCY_MILLIS);
- result.add(ROUTE_SQL_SELECT);
- result.add(ROUTE_SQL_UPDATE);
- result.add(ROUTE_SQL_DELETE);
- result.add(ROUTE_SQL_INSERT);
- result.add(ROUTE_DATASOURCE);
- result.add(ROUTE_TABLE);
+ result.add(ROUTED_SELECT_SQL);
+ result.add(ROUTED_UPDATE_SQL);
+ result.add(ROUTED_DELETE_SQL);
+ result.add(ROUTED_INSERT_SQL);
+ result.add(ROUTED_DATA_SOURCES);
+ result.add(ROUTED_TABLES);
result.add(PROXY_COMMIT_TRANSACTIONS);
result.add(PROXY_ROLLBACK_TRANSACTIONS);
result.add(PROXY_EXECUTE_ERRORS);
