diff --git a/agent/plugins/metrics/type/prometheus/pom.xml b/agent/plugins/metrics/type/prometheus/pom.xml index b91b1a145509f..49b6edcb8b141 100644 --- a/agent/plugins/metrics/type/prometheus/pom.xml +++ b/agent/plugins/metrics/type/prometheus/pom.xml @@ -27,6 +27,11 @@ shardingsphere-agent-metrics-prometheus ${project.artifactId} + + 0.11.0 + 0.16.1 + + org.apache.shardingsphere @@ -55,18 +60,22 @@ io.prometheus simpleclient + ${prometheus.version} io.prometheus simpleclient_hotspot + ${prometheus.version} io.prometheus simpleclient_httpserver + ${prometheus.version} io.prometheus.jmx collector + ${prometheus.jmx.version} diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java index 19b39fc9beff7..0d7ed761f043c 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/PrometheusPluginBootService.java @@ -61,13 +61,13 @@ private void startServer(final PluginConfiguration pluginConfig, final boolean i } } - private void registerCollector(final boolean isEnableCollectJVMInformation, final boolean isEnhancedForProxy) { + private void registerCollector(final boolean isCollectJVMInformation, final boolean isEnhancedForProxy) { new BuildInfoCollector(isEnhancedForProxy).register(); if (isEnhancedForProxy) { new ProxyInfoCollector().register(); new MetaDataInfoCollector().register(); } - if (isEnableCollectJVMInformation) { + if (isCollectJVMInformation) { DefaultExports.initialize(); } } diff --git a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollector.java b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollector.java index 1d73459d3d091..4bf18bce74d71 100644 --- a/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollector.java +++ b/agent/plugins/metrics/type/prometheus/src/main/java/org/apache/shardingsphere/agent/metrics/prometheus/collector/BuildInfoCollector.java @@ -32,8 +32,8 @@ /** * Build information collector. */ -@Slf4j @RequiredArgsConstructor +@Slf4j public final class BuildInfoCollector extends Collector { private static final String PROXY_BOOTSTRAP_CLASS = "org.apache.shardingsphere.proxy.Bootstrap"; diff --git a/pom.xml b/pom.xml index 9c23042067322..1b6f565845099 100644 --- a/pom.xml +++ b/pom.xml @@ -88,8 +88,6 @@ 3.0.2 - 0.11.0 - 0.16.1 0.31.0 0.31.0 5.13.2 @@ -429,26 +427,6 @@ - - io.prometheus - simpleclient - ${prometheus.version} - - - io.prometheus - simpleclient_hotspot - ${prometheus.version} - - - io.prometheus - simpleclient_httpserver - ${prometheus.version} - - - io.prometheus.jmx - collector - ${prometheus.jmx.version} - io.opentracing opentracing-api