[AMORO-2797] Improve ams metrics module naming

amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/pom.xml → amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/pom.xml

@@ -20,14 +20,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>amoro-ams-metric-reporter</artifactId>
+        <artifactId>amoro-ams-metrics</artifactId>
         <groupId>org.apache.amoro</groupId>
         <version>0.7-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>prometheus-reporter</artifactId>
+    <artifactId>amoro-metrics-prometheus</artifactId>
     <name>Amoro Project AMS Prometheus Reporter</name>
     <url>https://amoro.apache.org</url>
 

amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/MetricCollector.java → amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricsCollector.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.amoro.metrics.reporter.promethues;
+package org.apache.amoro.metrics.promethues;
 
 import io.prometheus.client.Collector;
 import org.apache.amoro.api.metrics.Counter;
@@ -37,14 +37,14 @@
 import java.util.stream.Collectors;
 
 /** Metric type converter for prometheus api */
-public class MetricCollector extends Collector {
-  private static final Logger LOGGER = LoggerFactory.getLogger(MetricCollector.class);
+public class MetricsCollector extends Collector {
+  private static final Logger LOGGER = LoggerFactory.getLogger(MetricsCollector.class);
   private static final String PREFIX = "amoro_";
   private static final Pattern NAME_PATTERN = Pattern.compile("[a-zA-Z_:][a-zA-Z0-9_:]*");
   private static final Pattern LABEL_PATTERN = Pattern.compile("[a-zA-Z_][a-zA-Z0-9_]*");
   MetricSet metrics;
 
-  public MetricCollector(MetricSet metrics) {
+  public MetricsCollector(MetricSet metrics) {
     this.metrics = metrics;
   }
 

amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/PrometheusExporterMetricReporter.java → amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/PrometheusMetricsReporter.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.amoro.metrics.reporter.promethues;
+package org.apache.amoro.metrics.promethues;
 
 import io.prometheus.client.exporter.HTTPServer;
 import org.apache.amoro.api.metrics.MetricReporter;
@@ -27,22 +27,21 @@
 import java.util.Optional;
 
 /** Prometheus exporter */
-public class PrometheusExporterMetricReporter implements MetricReporter {
+public class PrometheusMetricsReporter implements MetricReporter {
 
   public static final String PORT = "port";
 
-  private int port;
   private HTTPServer server;
 
   @Override
   public void open(Map<String, String> properties) {
-    this.port =
+    int port =
         Optional.ofNullable(properties.get(PORT))
             .map(Integer::valueOf)
             .orElseThrow(() -> new IllegalArgumentException("Lack required property: " + PORT));
 
     try {
-      this.server = new HTTPServer(this.port);
+      this.server = new HTTPServer(port);
     } catch (IOException e) {
       throw new RuntimeException("Start prometheus exporter server failed.", e);
     }
@@ -60,7 +59,7 @@ public String name() {
 
   @Override
   public void setGlobalMetricSet(MetricSet globalMetricSet) {
-    MetricCollector collector = new MetricCollector(globalMetricSet);
+    MetricsCollector collector = new MetricsCollector(globalMetricSet);
     collector.register();
   }
 }

amoro-ams/amoro-ams-metric-reporter/pom.xml → amoro-ams/amoro-ams-metrics/pom.xml

@@ -27,13 +27,13 @@
         <version>0.7-SNAPSHOT</version>
     </parent>
 
-    <artifactId>amoro-ams-metric-reporter</artifactId>
+    <artifactId>amoro-ams-metrics</artifactId>
     <packaging>pom</packaging>
     <name>Amoro Project AMS Metric Reporter Parent</name>
     <url>https://amoro.apache.org</url>
 
     <modules>
-        <module>prometheus-reporter</module>
+        <module>amoro-metrics-prometheus</module>
     </modules>
 
 </project>

amoro-ams/dist/pom.xml

@@ -60,7 +60,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.amoro</groupId>
-            <artifactId>prometheus-reporter</artifactId>
+            <artifactId>amoro-metrics-prometheus</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

amoro-ams/dist/src/main/assemblies/bin.xml

@@ -46,7 +46,7 @@
         </file>
         <file>
             <source>
-                ../amoro-ams-metric-reporter/prometheus-reporter/target/prometheus-reporter-${project.version}-jar-with-dependencies.jar
+                ../amoro-ams-metrics/amoro-metrics-prometheus/target/amoro-metrics-prometheus-${project.version}-jar-with-dependencies.jar
             </source>
             <outputDirectory>plugin/metrics-reporter</outputDirectory>
             <destName>prometheus-reporter.jar</destName>

amoro-ams/pom.xml

@@ -37,7 +37,7 @@
         <module>amoro-ams-server</module>
         <module>amoro-ams-dashboard</module>
         <module>amoro-ams-optimizer</module>
-        <module>amoro-ams-metric-reporter</module>
+        <module>amoro-ams-metrics</module>
         <module>dist</module>
     </modules>