Move package name of PrometheusWrapper (apache#22954)

* Remove MetricsUtil * Refactor PrometheusPluginBootService * Move package name of PrometheusWrapper * Move package name of PrometheusWrapper
Byeongcheol-Kim · Dec 18, 2022 · 21851ee · 21851ee
1 parent 7a5123c
commit 21851ee
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 9 deletions.
diff --git a/.../org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactory.java b/.../org/apache/shardingsphere/agent/metrics/prometheus/wrapper/PrometheusWrapperFactory.java
@@ -24,6 +24,10 @@
 import io.prometheus.client.Summary;
 import org.apache.shardingsphere.agent.metrics.core.MetricsWrapper;
 import org.apache.shardingsphere.agent.metrics.core.MetricsWrapperFactory;
+import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type.CounterWrapper;
+import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type.GaugeWrapper;
+import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type.HistogramWrapper;
+import org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type.SummaryWrapper;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.InputStream;
@@ -35,7 +39,7 @@
 /**
  * Prometheus metrics wrapper factory.
  */
-public class PrometheusWrapperFactory implements MetricsWrapperFactory {
+public final class PrometheusWrapperFactory implements MetricsWrapperFactory {
 
     private static List<Map<String, Object>> metrics;
 

diff --git a/...cs/prometheus/wrapper/CounterWrapper.java → ...ometheus/wrapper/type/CounterWrapper.java b/...cs/prometheus/wrapper/CounterWrapper.java → ...ometheus/wrapper/type/CounterWrapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.agent.metrics.prometheus.wrapper;
+package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
 
 import io.prometheus.client.Counter;
 import lombok.RequiredArgsConstructor;

diff --git a/...rics/prometheus/wrapper/GaugeWrapper.java → ...prometheus/wrapper/type/GaugeWrapper.java b/...rics/prometheus/wrapper/GaugeWrapper.java → ...prometheus/wrapper/type/GaugeWrapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.agent.metrics.prometheus.wrapper;
+package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
 
 import io.prometheus.client.Gauge;
 import lombok.RequiredArgsConstructor;

diff --git a/.../prometheus/wrapper/HistogramWrapper.java → ...etheus/wrapper/type/HistogramWrapper.java b/.../prometheus/wrapper/HistogramWrapper.java → ...etheus/wrapper/type/HistogramWrapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.agent.metrics.prometheus.wrapper;
+package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
 
 import io.prometheus.client.Histogram;
 import lombok.RequiredArgsConstructor;

diff --git a/...cs/prometheus/wrapper/SummaryWrapper.java → ...ometheus/wrapper/type/SummaryWrapper.java b/...cs/prometheus/wrapper/SummaryWrapper.java → ...ometheus/wrapper/type/SummaryWrapper.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.agent.metrics.prometheus.wrapper;
+package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
 
 import io.prometheus.client.Summary;
 import lombok.RequiredArgsConstructor;

diff --git a/...rometheus/wrapper/CounterWrapperTest.java → ...heus/wrapper/type/CounterWrapperTest.java b/...rometheus/wrapper/CounterWrapperTest.java → ...heus/wrapper/type/CounterWrapperTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.agent.metrics.prometheus.wrapper;
+package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
 
 import io.prometheus.client.Counter;
 import org.apache.shardingsphere.infra.util.reflect.ReflectiveUtil;

diff --git a/.../prometheus/wrapper/GaugeWrapperTest.java → ...etheus/wrapper/type/GaugeWrapperTest.java b/.../prometheus/wrapper/GaugeWrapperTest.java → ...etheus/wrapper/type/GaugeWrapperTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.agent.metrics.prometheus.wrapper;
+package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
 
 import io.prometheus.client.Gauge;
 import org.apache.shardingsphere.infra.util.reflect.ReflectiveUtil;

diff --git a/...metheus/wrapper/HistogramWrapperTest.java → ...us/wrapper/type/HistogramWrapperTest.java b/...metheus/wrapper/HistogramWrapperTest.java → ...us/wrapper/type/HistogramWrapperTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.agent.metrics.prometheus.wrapper;
+package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
 
 import io.prometheus.client.Histogram;
 import org.apache.shardingsphere.infra.util.reflect.ReflectiveUtil;

diff --git a/...rometheus/wrapper/SummaryWrapperTest.java → ...heus/wrapper/type/SummaryWrapperTest.java b/...rometheus/wrapper/SummaryWrapperTest.java → ...heus/wrapper/type/SummaryWrapperTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.agent.metrics.prometheus.wrapper;
+package org.apache.shardingsphere.agent.metrics.prometheus.wrapper.type;
 
 import io.prometheus.client.Summary;
 import org.apache.shardingsphere.infra.util.reflect.ReflectiveUtil;