This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 e16a21a7c55 Merge metrics id and name in yaml config (#23562)
e16a21a7c55 is described below
commit e16a21a7c5578a22680a76fbe2a0e151f4c7ec69
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 15 18:29:10 2023 +0800
Merge metrics id and name in yaml config (#23562)
---
.../wrapper/PrometheusWrapperFactory.java | 12 +++++-----
.../META-INF/conf/prometheus-metrics.yaml | 26 ----------------------
.../META-INF/conf/prometheus-metrics.yaml | 8 -------
3 files changed, 6 insertions(+), 40 deletions(-)
diff --git
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactory.java
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactory.java
index 1aeef537d28..6452ecdc5ba 100644
---
a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactory.java
+++
b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/plugin/metrics/prometheus/wrapper/PrometheusWrapperFactory.java
@@ -84,7 +84,7 @@ public final class PrometheusWrapperFactory implements
MetricsWrapperFactory {
}
private MetricsWrapper createCounter(final YamlMetricConfiguration
metricConfig) {
- Counter.Builder builder =
Counter.build().name(metricConfig.getName()).help(metricConfig.getHelp());
+ Counter.Builder builder =
Counter.build().name(metricConfig.getId()).help(metricConfig.getHelp());
List<String> metricLabels = (List<String>) metricConfig.getLabels();
if (null != metricLabels) {
builder.labelNames(metricLabels.toArray(new String[0]));
@@ -93,7 +93,7 @@ public final class PrometheusWrapperFactory implements
MetricsWrapperFactory {
}
private MetricsWrapper createGauge(final YamlMetricConfiguration
metricConfig) {
- Gauge.Builder builder =
Gauge.build().name(metricConfig.getName()).help(metricConfig.getHelp());
+ Gauge.Builder builder =
Gauge.build().name(metricConfig.getId()).help(metricConfig.getHelp());
Collection<String> metricLabels = metricConfig.getLabels();
if (null != metricLabels) {
builder.labelNames(metricLabels.toArray(new String[0]));
@@ -102,7 +102,7 @@ public final class PrometheusWrapperFactory implements
MetricsWrapperFactory {
}
private MetricsWrapper createHistogram(final YamlMetricConfiguration
metricConfig) {
- Histogram.Builder builder =
Histogram.build().name(metricConfig.getName()).help(metricConfig.getHelp());
+ Histogram.Builder builder =
Histogram.build().name(metricConfig.getId()).help(metricConfig.getHelp());
Collection<String> metricLabels = metricConfig.getLabels();
if (null != metricLabels) {
builder.labelNames(metricLabels.toArray(new String[0]));
@@ -134,7 +134,7 @@ public final class PrometheusWrapperFactory implements
MetricsWrapperFactory {
}
private MetricsWrapper createSummary(final YamlMetricConfiguration
metricConfig) {
- Summary.Builder builder =
Summary.build().name(metricConfig.getName()).help(metricConfig.getHelp());
+ Summary.Builder builder =
Summary.build().name(metricConfig.getId()).help(metricConfig.getHelp());
Collection<String> metricLabels = metricConfig.getLabels();
if (null != metricLabels) {
builder.labelNames(metricLabels.toArray(new String[0]));
@@ -160,7 +160,7 @@ public final class PrometheusWrapperFactory implements
MetricsWrapperFactory {
private GaugeMetricFamily createGaugeMetricFamily(final
YamlMetricConfiguration metricConfig) {
Collection<String> labels = metricConfig.getLabels();
return null == labels
- ? new GaugeMetricFamily(metricConfig.getName(),
metricConfig.getHelp(), 1d)
- : new GaugeMetricFamily(metricConfig.getName(),
metricConfig.getHelp(), new ArrayList<>(labels));
+ ? new GaugeMetricFamily(metricConfig.getId(),
metricConfig.getHelp(), 1d)
+ : new GaugeMetricFamily(metricConfig.getId(),
metricConfig.getHelp(), new ArrayList<>(labels));
}
}
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 214ada28af4..b4af9a2bd28 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
@@ -17,115 +17,90 @@
metrics:
- id: build_info
- name: build_info
type: GaugeMetricFamily
help: Build information
labels:
- version
- name
- id: meta_data_info
- name: meta_data_info
type: GaugeMetricFamily
help: Meta data information. schema_count is logic number of databases;
database_count is actual number of databases
labels:
- name
- id: parsed_insert_sql_total
- name: parsed_insert_sql_total
type: COUNTER
help: Total count of parsed INSERT
- id: parsed_update_sql_total
- name: parsed_update_sql_total
type: COUNTER
help: Total count of parsed UPDATE
- id: parsed_delete_sql_total
- name: parsed_delete_sql_total
type: COUNTER
help: Total count of parsed DELETE
- id: parsed_select_sql_total
- name: parsed_select_sql_total
type: COUNTER
help: Total count of parsed SELECT
- id: parsed_ddl_total
- name: parsed_ddl_total
type: COUNTER
help: Total count of parsed DDL
- id: parsed_dcl_total
- name: parsed_dcl_total
type: COUNTER
help: Total count of parsed DCL
- id: parsed_dal_total
- name: parsed_dal_total
type: COUNTER
help: Total count of parsed DAL
- id: parsed_tcl_total
- name: parsed_tcl_total
type: COUNTER
help: Total count of parsed TCL
- id: parsed_rql_total
- name: parsed_rql_total
type: COUNTER
help: Total count of parsed RDL
- id: parsed_rdl_total
- name: parsed_rdl_total
type: COUNTER
help: Total count of parsed RDL
- id: parsed_ral_total
- name: parsed_ral_total
type: COUNTER
help: Total count of parsed RAL
- id: routed_insert_sql_total
- name: routed_insert_sql_total
type: COUNTER
help: Total count of routed INSERT
- id: routed_update_sql_total
- name: routed_update_sql_total
type: COUNTER
help: Total count of routed UPDATE
- id: routed_delete_sql_total
- name: routed_delete_sql_total
type: COUNTER
help: Total count of routed DELETE
- id: routed_select_sql_total
- name: routed_select_sql_total
type: COUNTER
help: Total count of routed SELECT
- id: routed_data_sources_total
- name: routed_data_sources_total
type: COUNTER
labels:
- name
help: Total count of data source routed
- id: routed_tables_total
- name: routed_tables_total
type: COUNTER
labels:
- name
help: Total count of table routed
- id: proxy_info
- name: proxy_info
type: GaugeMetricFamily
help: Status information of ShardingSphere-Proxy. 1 is OK; 2 is CIRCUIT
BREAK
labels:
- name
- id: proxy_current_connections
type: GAUGE
- name: proxy_current_connections
help: Current connections of ShardingSphere-Proxy
- id: proxy_requests_total
type: COUNTER
- name: proxy_requests_total
help: Total requests of ShardingSphere-Proxy
- id: proxy_commit_transactions_total
- name: proxy_commit_transactions_total
type: COUNTER
help: Total commit transactions of ShardingSphere-Proxy
- id: proxy_rollback_transactions_total
- name: proxy_rollback_transactions_total
type: COUNTER
help: Total rollback transactions of ShardingSphere-Proxy
- id: proxy_execute_latency_millis
type: HISTOGRAM
- name: proxy_execute_latency_millis
help: Execute latency millis histogram of ShardingSphere-Proxy
props:
buckets:
@@ -135,5 +110,4 @@ metrics:
count: 13
- id: proxy_execute_errors_total
type: COUNTER
- name: proxy_execute_errors_total
help: Total execute errors of ShardingSphere-Proxy
\ No newline at end of file
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 2a2435747e1..79ad5c31517 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,15 +18,12 @@
metrics:
- id: a
type: COUNTER
- name: proxy_requests_total
help: Total requests of ShardingSphere-Proxy
- id: b
type: GAUGE
- name: proxy_current_connections
help: Current connections of ShardingSphere-Proxy
- id: c
type: HISTOGRAM
- name: proxy_execute_latency_millis
help: Executor latency millis of ShardingSphere-Proxy
labels:
- name
@@ -40,7 +37,6 @@ metrics:
- value
- id: d
type: HISTOGRAM
- name: proxy_execute_latency_seconds
props:
buckets:
type: linear
@@ -49,24 +45,20 @@ metrics:
count: 10
- id: e
type: SUMMARY
- name: proxy_execute_latency_mins
help: proxy execute latency mins
props:
- id: proxy_info
- name: proxy_info
type: GaugeMetricFamily
help: proxy information
labels:
- name
- id: build_info
- name: build_info
type: GaugeMetricFamily
help: build information
labels:
- version
- name
- id: meta_data_info
- name: meta_data_info
type: GaugeMetricFamily
help: meta data information
labels:
