This is an automated email from the ASF dual-hosted git repository.
jinsongzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new cf1b2b00c [AMORO-2797] Improve ams metrics module naming (#2798)
cf1b2b00c is described below
commit cf1b2b00cf3e1fd906e344dca6f310784eaab428
Author: majin1102 <[email protected]>
AuthorDate: Thu May 16 19:42:05 2024 +0800
[AMORO-2797] Improve ams metrics module naming (#2798)
* Optimize metrics module, package and class naming
* mvn spotless apply
* rename to amoro-metrics-prometheus
* Update bin.xml
---
.../amoro-metrics-prometheus}/pom.xml | 4 ++--
.../apache/amoro/metrics/promethues/MetricsCollector.java} | 8 ++++----
.../amoro/metrics/promethues/PrometheusMetricsReporter.java} | 11 +++++------
.../{amoro-ams-metric-reporter => amoro-ams-metrics}/pom.xml | 4 ++--
amoro-ams/dist/pom.xml | 2 +-
amoro-ams/dist/src/main/assemblies/bin.xml | 2 +-
amoro-ams/pom.xml | 2 +-
7 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/pom.xml
b/amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/pom.xml
similarity index 96%
rename from amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/pom.xml
rename to amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/pom.xml
index 28aef6118..1439a58d6 100644
--- a/amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/pom.xml
+++ b/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>
diff --git
a/amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/MetricCollector.java
b/amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricsCollector.java
similarity index 96%
rename from
amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/MetricCollector.java
rename to
amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/MetricsCollector.java
index 520d8c75a..c875fc12b 100644
---
a/amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/MetricCollector.java
+++
b/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.regex.Pattern;
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;
}
diff --git
a/amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/PrometheusExporterMetricReporter.java
b/amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/PrometheusMetricsReporter.java
similarity index 86%
rename from
amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/PrometheusExporterMetricReporter.java
rename to
amoro-ams/amoro-ams-metrics/amoro-metrics-prometheus/src/main/java/org/apache/amoro/metrics/promethues/PrometheusMetricsReporter.java
index 60b462ebb..f636ca686 100644
---
a/amoro-ams/amoro-ams-metric-reporter/prometheus-reporter/src/main/java/org/apache/amoro/metrics/reporter/promethues/PrometheusExporterMetricReporter.java
+++
b/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.Map;
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 class PrometheusExporterMetricReporter implements
MetricReporter {
@Override
public void setGlobalMetricSet(MetricSet globalMetricSet) {
- MetricCollector collector = new MetricCollector(globalMetricSet);
+ MetricsCollector collector = new MetricsCollector(globalMetricSet);
collector.register();
}
}
diff --git a/amoro-ams/amoro-ams-metric-reporter/pom.xml
b/amoro-ams/amoro-ams-metrics/pom.xml
similarity index 93%
rename from amoro-ams/amoro-ams-metric-reporter/pom.xml
rename to amoro-ams/amoro-ams-metrics/pom.xml
index c02e516a6..b9ab83fd3 100644
--- a/amoro-ams/amoro-ams-metric-reporter/pom.xml
+++ b/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>
diff --git a/amoro-ams/dist/pom.xml b/amoro-ams/dist/pom.xml
index 659c3c065..d93153e96 100644
--- a/amoro-ams/dist/pom.xml
+++ b/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>
diff --git a/amoro-ams/dist/src/main/assemblies/bin.xml
b/amoro-ams/dist/src/main/assemblies/bin.xml
index abae8d681..b662220aa 100644
--- a/amoro-ams/dist/src/main/assemblies/bin.xml
+++ b/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>
diff --git a/amoro-ams/pom.xml b/amoro-ams/pom.xml
index a5af5f895..f56daf7b0 100644
--- a/amoro-ams/pom.xml
+++ b/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>
