This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 b4273812ea5 Use prometheus-simpleclient bom (#28851)
b4273812ea5 is described below
commit b4273812ea5067090d99e49ffec0be9b4fff8a6a
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 24 09:42:22 2023 +0800
Use prometheus-simpleclient bom (#28851)
---
agent/plugins/metrics/type/prometheus/pom.xml | 21 +++++++++++++++++----
agent/plugins/tracing/type/opentelemetry/pom.xml | 2 +-
pom.xml | 6 +++---
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/agent/plugins/metrics/type/prometheus/pom.xml
b/agent/plugins/metrics/type/prometheus/pom.xml
index 3134c8c02d9..45b868d6173 100644
--- a/agent/plugins/metrics/type/prometheus/pom.xml
+++ b/agent/plugins/metrics/type/prometheus/pom.xml
@@ -26,6 +26,23 @@
<artifactId>shardingsphere-agent-metrics-prometheus</artifactId>
<name>${project.artifactId}</name>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_bom</artifactId>
+ <version>${prometheus-simpleclient.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.prometheus.jmx</groupId>
+ <artifactId>collector</artifactId>
+ <version>${prometheus-jmx.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -74,22 +91,18 @@
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
- <version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_hotspot</artifactId>
- <version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_httpserver</artifactId>
- <version>${prometheus.version}</version>
</dependency>
<dependency>
<groupId>io.prometheus.jmx</groupId>
<artifactId>collector</artifactId>
- <version>${prometheus.jmx.version}</version>
</dependency>
</dependencies>
diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml
b/agent/plugins/tracing/type/opentelemetry/pom.xml
index bf11374dff2..082f5aa0a05 100644
--- a/agent/plugins/tracing/type/opentelemetry/pom.xml
+++ b/agent/plugins/tracing/type/opentelemetry/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
- <version>${opentelemetry-bom.version}</version>
+ <version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 94aa5bb928a..0a793aef8fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,9 +130,9 @@
<jooq.version>3.14.15</jooq.version>
- <prometheus.version>0.11.0</prometheus.version>
- <prometheus.jmx.version>0.16.1</prometheus.jmx.version>
- <opentelemetry-bom.version>1.31.0</opentelemetry-bom.version>
+
<prometheus-simpleclient.version>0.11.0</prometheus-simpleclient.version>
+ <prometheus-jmx.version>0.16.1</prometheus-jmx.version>
+ <opentelemetry.version>1.31.0</opentelemetry.version>
<kotlin-stdlib.version>1.9.10</kotlin-stdlib.version>
<junit.version>5.10.0</junit.version>