You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/12/18 06:57:51 UTC
[shardingsphere] branch master updated: Move tracing dependency to tracing agent only (#22951)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 532a26718f3 Move tracing dependency to tracing agent only (#22951)
532a26718f3 is described below
commit 532a26718f3de0dcc9c28a43b15dbf460eacc560
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 18 14:57:43 2022 +0800
Move tracing dependency to tracing agent only (#22951)
* Move Prometheus dependency to Prometheus agent only
* Move zipkin dependency to zipkin agent only
* Move jaeger dependency to jaeger agent only
* Move opentelemetry dependency to opentelemetry agent only
* Move opentracing dependency to opentracing agent only
---
agent/plugins/tracing/pom.xml | 23 +++++++
agent/plugins/tracing/type/jaeger/pom.xml | 5 ++
agent/plugins/tracing/type/opentelemetry/pom.xml | 14 ++++
agent/plugins/tracing/type/zipkin/pom.xml | 14 ++++
pom.xml | 86 ------------------------
5 files changed, 56 insertions(+), 86 deletions(-)
diff --git a/agent/plugins/tracing/pom.xml b/agent/plugins/tracing/pom.xml
index c5313940f78..d7d89aa4bf4 100644
--- a/agent/plugins/tracing/pom.xml
+++ b/agent/plugins/tracing/pom.xml
@@ -35,9 +35,32 @@
</modules>
<properties>
+ <opentracing.version>0.31.0</opentracing.version>
+
<target.directory>${project.basedir}/../target/plugins</target.directory>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ <version>${opentracing.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-util</artifactId>
+ <version>${opentracing.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-mock</artifactId>
+ <version>${opentracing.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<plugins>
<plugin>
diff --git a/agent/plugins/tracing/type/jaeger/pom.xml b/agent/plugins/tracing/type/jaeger/pom.xml
index 9b0def7bba0..6de09e58519 100644
--- a/agent/plugins/tracing/type/jaeger/pom.xml
+++ b/agent/plugins/tracing/type/jaeger/pom.xml
@@ -27,6 +27,10 @@
<artifactId>shardingsphere-agent-tracing-jaeger</artifactId>
<name>${project.artifactId}</name>
+ <properties>
+ <jaeger-client.version>0.31.0</jaeger-client.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -57,6 +61,7 @@
<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-client</artifactId>
+ <version>${jaeger-client.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml b/agent/plugins/tracing/type/opentelemetry/pom.xml
index 9f75dbcaf35..039a0fa30f7 100644
--- a/agent/plugins/tracing/type/opentelemetry/pom.xml
+++ b/agent/plugins/tracing/type/opentelemetry/pom.xml
@@ -27,6 +27,11 @@
<artifactId>shardingsphere-agent-tracing-opentelemetry</artifactId>
<name>${project.artifactId}</name>
+ <properties>
+ <opentelemetry.version>1.3.0</opentelemetry.version>
+ <opentelemetry-autoconfigure.version>1.3.0-alpha</opentelemetry-autoconfigure.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -44,30 +49,39 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
+ <version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
+ <version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
+ <version>${opentelemetry-autoconfigure.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-jaeger</artifactId>
+ <version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-zipkin</artifactId>
+ <version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp-trace</artifactId>
+ <version>${opentelemetry.version}</version>
</dependency>
+
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
+ <version>${opentelemetry.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/agent/plugins/tracing/type/zipkin/pom.xml b/agent/plugins/tracing/type/zipkin/pom.xml
index 3bf594b9eac..9030b7947b6 100644
--- a/agent/plugins/tracing/type/zipkin/pom.xml
+++ b/agent/plugins/tracing/type/zipkin/pom.xml
@@ -27,6 +27,11 @@
<artifactId>shardingsphere-agent-tracing-zipkin</artifactId>
<name>${project.artifactId}</name>
+ <properties>
+ <zipkin-brave.version>5.13.2</zipkin-brave.version>
+ <zipkin-reporter.version>2.16.2</zipkin-reporter.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -44,14 +49,23 @@
<dependency>
<groupId>io.zipkin.brave</groupId>
<artifactId>brave</artifactId>
+ <version>${zipkin-brave.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.zipkin.reporter2</groupId>
+ <artifactId>zipkin-reporter-brave</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter-brave</artifactId>
+ <version>${zipkin-reporter.version}</version>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-okhttp3</artifactId>
+ <version>${zipkin-reporter.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 1b6f5658450..cbe4574cd7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,13 +88,6 @@
<elasticjob.version>3.0.2</elasticjob.version>
- <opentracing.version>0.31.0</opentracing.version>
- <jaeger-client.version>0.31.0</jaeger-client.version>
- <zipkin-brave.version>5.13.2</zipkin-brave.version>
- <zipkin-reporter.version>2.16.2</zipkin-reporter.version>
- <opentelemetry.version>1.3.0</opentelemetry.version>
- <opentelemetry-autoconfigure.version>1.3.0-alpha</opentelemetry-autoconfigure.version>
-
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
@@ -427,85 +420,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-api</artifactId>
- <version>${opentracing.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-util</artifactId>
- <version>${opentracing.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentracing</groupId>
- <artifactId>opentracing-mock</artifactId>
- <version>${opentracing.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.jaegertracing</groupId>
- <artifactId>jaeger-client</artifactId>
- <version>${jaeger-client.version}</version>
- </dependency>
- <dependency>
- <groupId>io.zipkin.brave</groupId>
- <artifactId>brave</artifactId>
- <version>${zipkin-brave.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.zipkin.reporter2</groupId>
- <artifactId>zipkin-reporter-brave</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter2</groupId>
- <artifactId>zipkin-reporter-brave</artifactId>
- <version>${zipkin-reporter.version}</version>
- </dependency>
- <dependency>
- <groupId>io.zipkin.reporter2</groupId>
- <artifactId>zipkin-sender-okhttp3</artifactId>
- <version>${zipkin-reporter.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry</groupId>
- <artifactId>opentelemetry-api</artifactId>
- <version>${opentelemetry.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry</groupId>
- <artifactId>opentelemetry-sdk</artifactId>
- <version>${opentelemetry.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry</groupId>
- <artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
- <version>${opentelemetry-autoconfigure.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry</groupId>
- <artifactId>opentelemetry-exporter-jaeger</artifactId>
- <version>${opentelemetry.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry</groupId>
- <artifactId>opentelemetry-exporter-zipkin</artifactId>
- <version>${opentelemetry.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry</groupId>
- <artifactId>opentelemetry-exporter-otlp-trace</artifactId>
- <version>${opentelemetry.version}</version>
- </dependency>
- <dependency>
- <groupId>io.opentelemetry</groupId>
- <artifactId>opentelemetry-sdk-testing</artifactId>
- <version>${opentelemetry.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>