diff --git a/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml b/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml index d38991331cb24..4a298cc721bf5 100644 --- a/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml +++ b/agent/distribution/src/main/assembly/shardingsphere-agent-binary-distribution.xml @@ -40,7 +40,7 @@ - ../plugins/logging/target/plugins + ../plugins/logging/base/target/plugins ./plugins **.jar @@ -48,17 +48,14 @@ - ../plugins/tracing/target/plugins + ../plugins/tracing/type/target/plugins ./plugins **.jar - - shardingsphere-agent-tracing-test-${project.version}.jar - - ../plugins/metrics/target/plugins + ../plugins/metrics/type/target/plugins ./plugins **.jar @@ -72,7 +69,7 @@ - ../plugins/metrics/target/lib + ../plugins/metrics/core/target/lib ./lib **.jar diff --git a/agent/plugins/logging/base/pom.xml b/agent/plugins/logging/base/pom.xml index cfbad00fd4c5b..720404746a993 100644 --- a/agent/plugins/logging/base/pom.xml +++ b/agent/plugins/logging/base/pom.xml @@ -26,4 +26,47 @@ shardingsphere-agent-logging-base ${project.artifactId} + + + ${project.basedir}/target/plugins + + + + + + maven-shade-plugin + + true + false + ${target.directory}/${project.build.finalName}.jar + + + + + shade + + package + + + + org.slf4j + ${shade.package}.org.slf4j + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + diff --git a/agent/plugins/logging/pom.xml b/agent/plugins/logging/pom.xml index 487e071ff7b72..1d1533c4a2b21 100644 --- a/agent/plugins/logging/pom.xml +++ b/agent/plugins/logging/pom.xml @@ -32,10 +32,6 @@ base - - ${project.basedir}/../target/plugins - - org.apache.shardingsphere @@ -44,15 +40,4 @@ provided - - - - - maven-shade-plugin - - ${target.directory}/${project.build.finalName}.jar - - - - diff --git a/agent/plugins/metrics/core/pom.xml b/agent/plugins/metrics/core/pom.xml index b4ec8969a2f84..9192f1d36a60c 100644 --- a/agent/plugins/metrics/core/pom.xml +++ b/agent/plugins/metrics/core/pom.xml @@ -28,7 +28,7 @@ ${project.artifactId} - ${project.basedir}/../target/lib + ${project.basedir}/target/lib @@ -57,8 +57,40 @@ maven-shade-plugin + true + false ${target.directory}/${project.build.finalName}.jar + + + + shade + + package + + + + com.google.common + ${shade.package}.com.google.common + + + net.bytebuddy + ${shade.package}.net.bytebuddy + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + diff --git a/agent/plugins/metrics/type/pom.xml b/agent/plugins/metrics/type/pom.xml index 2a10e6299dc80..a65de84a1e524 100644 --- a/agent/plugins/metrics/type/pom.xml +++ b/agent/plugins/metrics/type/pom.xml @@ -31,19 +31,4 @@ prometheus - - - ${project.basedir}/../../target/plugins - - - - - - maven-shade-plugin - - ${target.directory}/${project.build.finalName}.jar - - - - diff --git a/agent/plugins/metrics/type/prometheus/pom.xml b/agent/plugins/metrics/type/prometheus/pom.xml index 5ff53433bd872..72acfc59945ad 100644 --- a/agent/plugins/metrics/type/prometheus/pom.xml +++ b/agent/plugins/metrics/type/prometheus/pom.xml @@ -28,6 +28,7 @@ ${project.artifactId} + ${project.basedir}/../target/plugins 0.11.0 0.16.1 @@ -91,8 +92,60 @@ maven-shade-plugin + true + false ${target.directory}/${project.build.finalName}.jar + + + + shade + + package + + + + com.google.common + ${shade.package}.com.google.common + + + net.bytebuddy + ${shade.package}.net.bytebuddy + + + org.yaml.snakeyaml + ${shade.package}.org.yaml.snakeyaml + + + io.prometheus.client + ${shade.package}.io.prometheus.client + + + org.checkerframework + ${shade.package}.org.checkerframework + + + org.slf4j + ${shade.package}.org.slf4j + + + com.google.errorprone.annotations + ${shade.package}.com.google.errorprone.annotations + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + diff --git a/agent/plugins/pom.xml b/agent/plugins/pom.xml index fb6c327e8e148..70e5bf1ad5e85 100644 --- a/agent/plugins/pom.xml +++ b/agent/plugins/pom.xml @@ -54,70 +54,4 @@ provided - - - - - maven-shade-plugin - - - - shade - - package - - true - false - false - true - - - com.google.errorprone:error_prone_annotations:jar: - com.google.code.findbugs:jsr305:jar: - com.google.guava:listenablefuture:jar:* - com.google.j2objc:j2objc-annotations:jar:* - org.checkerframework:checker-qual:jar: - com.h2database:h2:jar: - org.slf4j:* - org.apache.commons:logging:* - - - - - com.google - ${shade.package}.com.google - - - net.bytebuddy - ${shade.package}.net.bytebuddy - - - org.yaml - ${shade.package}.org.yaml - - - org.apache.commons.logging - ${shade.package}.org.apache.commons.logging - - - io.netty - ${shade.package}.io.netty - - - - - *:* - - META-INF/*.DSA - META-INF/*.SF - META-INF/*.RSA - - - - - - - - - diff --git a/agent/plugins/tracing/pom.xml b/agent/plugins/tracing/pom.xml index 96d9088ede3e2..dc7b673d31644 100644 --- a/agent/plugins/tracing/pom.xml +++ b/agent/plugins/tracing/pom.xml @@ -35,8 +35,6 @@ 0.31.0 - - ${project.basedir}/../target/plugins @@ -69,15 +67,4 @@ provided - - - - - maven-shade-plugin - - ${target.directory}/${project.build.finalName}.jar - - - - diff --git a/agent/plugins/tracing/type/jaeger/pom.xml b/agent/plugins/tracing/type/jaeger/pom.xml index 45cbef7639bce..994cfcd3bb62f 100644 --- a/agent/plugins/tracing/type/jaeger/pom.xml +++ b/agent/plugins/tracing/type/jaeger/pom.xml @@ -51,4 +51,79 @@ ${jaeger-client.version} + + + + + maven-shade-plugin + + true + false + ${target.directory}/${project.build.finalName}.jar + + + + + shade + + package + + + + com.google.common + ${shade.package}.com.google.common + + + net.bytebuddy + ${shade.package}.net.bytebuddy + + + io.opentracing + ${shade.package}.io.opentracing + + + io.jaegertracing + ${shade.package}.io.jaegertracing + + + com.google.gson + ${shade.package}.com.google.gson + + + okhttp3 + ${shade.package}.okhttp3 + + + okio + ${shade.package}.okio + + + org.slf4j + ${shade.package}.org.slf4j + + + org.apache.thrift + ${shade.package}.org.apache.thrift + + + com.twitter.zipkin.thriftjava + ${shade.package}.com.twitter.zipkin.thriftjava + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + diff --git a/agent/plugins/tracing/type/opentelemetry/pom.xml b/agent/plugins/tracing/type/opentelemetry/pom.xml index 05e2b4dbf90af..7110831f6156c 100644 --- a/agent/plugins/tracing/type/opentelemetry/pom.xml +++ b/agent/plugins/tracing/type/opentelemetry/pom.xml @@ -71,4 +71,83 @@ test + + + + + maven-shade-plugin + + true + false + ${target.directory}/${project.build.finalName}.jar + + + + + shade + + package + + + + com.google.common + ${shade.package}.com.google.common + + + net.bytebuddy + ${shade.package}.net.bytebuddy + + + io.grpc + ${shade.package}.io.grpc + + + io.opentelemetry + ${shade.package}.io.opentelemetry + + + io.opentelemetry + ${shade.package}.io.opentelemetry + + + okhttp3 + ${shade.package}.okhttp3 + + + okio + ${shade.package}.okio + + + zipkin2 + ${shade.package}.zipkin2 + + + com.google + ${shade.package}.com.google + + + org.codehaus.mojo.animal_sniffer + ${shade.package}.org.codehaus.mojo.animal_sniffer + + + org.checkerframework + ${shade.package}.org.checkerframework + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + diff --git a/agent/plugins/tracing/type/opentracing/pom.xml b/agent/plugins/tracing/type/opentracing/pom.xml index 4d40248d3011d..e7fb3f9c8ca7a 100644 --- a/agent/plugins/tracing/type/opentracing/pom.xml +++ b/agent/plugins/tracing/type/opentracing/pom.xml @@ -41,4 +41,55 @@ opentracing-mock + + + + + maven-shade-plugin + + true + false + ${target.directory}/${project.build.finalName}.jar + + + + + shade + + package + + + + com.google + ${shade.package}.com.google + + + net.bytebuddy + ${shade.package}.net.bytebuddy + + + io.opentracing + ${shade.package}.io.opentracing + + + org.checkerframework + ${shade.package}.org.checkerframework + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + diff --git a/agent/plugins/tracing/type/pom.xml b/agent/plugins/tracing/type/pom.xml index 00a1a7aa2bbb3..28f588035ea98 100644 --- a/agent/plugins/tracing/type/pom.xml +++ b/agent/plugins/tracing/type/pom.xml @@ -36,7 +36,7 @@ - ${project.basedir}/../../target/plugins + ${project.basedir}/../target/plugins @@ -54,15 +54,4 @@ test - - - - - maven-shade-plugin - - ${target.directory}/${project.build.finalName}.jar - - - - diff --git a/agent/plugins/tracing/type/zipkin/pom.xml b/agent/plugins/tracing/type/zipkin/pom.xml index 710cedf5fe5fe..ac1e4aad7a2f3 100644 --- a/agent/plugins/tracing/type/zipkin/pom.xml +++ b/agent/plugins/tracing/type/zipkin/pom.xml @@ -55,4 +55,63 @@ ${zipkin-reporter.version} + + + + + maven-shade-plugin + + true + false + ${target.directory}/${project.build.finalName}.jar + + + + + shade + + package + + + + com.google + ${shade.package}.com.google + + + net.bytebuddy + ${shade.package}.net.bytebuddy + + + okhttp3 + ${shade.package}.okhttp3 + + + okio + ${shade.package}.okio + + + zipkin2 + ${shade.package}.zipkin2 + + + brave + ${shade.package}.brave + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + diff --git a/test/e2e/agent/plugins/opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml b/test/e2e/agent/plugins/opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml index 4378358c708ff..1d124af10341e 100644 --- a/test/e2e/agent/plugins/opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml +++ b/test/e2e/agent/plugins/opentelemetry/src/test/assembly/shardingsphere-proxy-agent-opentelemetry-assembly.xml @@ -25,7 +25,7 @@ - ${project.basedir}/../../../../../agent/plugins/tracing/target/plugins + ${project.basedir}/../../../../../agent/plugins/tracing/type/target/plugins ./agent/plugins shardingsphere-agent-tracing-opentelemetry-*.jar