From 4b62513dff4132cb79b1902fc048a51401df32a6 Mon Sep 17 00:00:00 2001 From: conghuhu <56248584+conghuhu@users.noreply.github.com> Date: Fri, 7 Jul 2023 10:22:48 +0800 Subject: [PATCH] chore: add seata sentinel starter & rename tracing starter (#12543) Co-authored-by: Albumen Kevin Co-authored-by: Ken Liu --- .artifacts | 14 +++-- .licenserc.yaml | 16 ++++++ .../dubbo-demo-spring-boot-consumer/pom.xml | 2 +- .../dubbo-demo-spring-boot-provider/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 30 ++++++++++ dubbo-distribution/dubbo-bom/pom.xml | 22 ++++++-- .../dubbo-seata-spring-boot-starter/pom.xml | 56 +++++++++++++++++++ .../pom.xml | 48 ++++++++++++++++ .../observability/autoconfigure/pom.xml | 4 +- .../pom.xml | 6 +- .../pom.xml | 6 +- .../pom.xml | 6 +- .../pom.xml | 6 +- .../observability/pom.xml | 10 ++-- .../dubbo-spring-boot-starters/pom.xml | 2 + dubbo-test/dubbo-dependencies-all/pom.xml | 20 +++++-- 16 files changed, 212 insertions(+), 38 deletions(-) create mode 100644 dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-seata-spring-boot-starter/pom.xml create mode 100644 dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-sentinel-spring-boot-starter/pom.xml rename dubbo-spring-boot/dubbo-spring-boot-starters/observability/{dubbo-spring-boot-observability-starter => dubbo-observability-spring-boot-starter}/pom.xml (90%) rename dubbo-spring-boot/dubbo-spring-boot-starters/observability/{dubbo-spring-boot-tracing-brave-zipkin-starter => dubbo-tracing-brave-zipkin-spring-boot-starter}/pom.xml (90%) rename dubbo-spring-boot/dubbo-spring-boot-starters/observability/{dubbo-spring-boot-tracing-otel-otlp-starter => dubbo-tracing-otel-otlp-spring-boot-starter}/pom.xml (90%) rename dubbo-spring-boot/dubbo-spring-boot-starters/observability/{dubbo-spring-boot-tracing-otel-zipkin-starter => dubbo-tracing-otel-zipkin-spring-boot-starter}/pom.xml (90%) diff --git a/.artifacts b/.artifacts index a12a335e0d..ee20c79788 100644 --- a/.artifacts +++ b/.artifacts @@ -106,18 +106,20 @@ dubbo-spring-boot-actuator-compatible dubbo-spring-boot-autoconfigure dubbo-spring-boot-autoconfigure-compatible dubbo-spring-boot-compatible -dubbo-spring-boot-observability-starters -dubbo-spring-boot-observability-autoconfigure -dubbo-spring-boot-tracing-brave-zipkin-starter -dubbo-spring-boot-tracing-otel-zipkin-starter -dubbo-spring-boot-tracing-otel-otlp-starter -dubbo-spring-boot-observability-starter +dubbo-observability-spring-boot-starters +dubbo-observability-spring-boot-autoconfigure +dubbo-tracing-brave-zipkin-spring-boot-starter +dubbo-tracing-otel-zipkin-spring-boot-starter +dubbo-tracing-otel-otlp-spring-boot-starter +dubbo-observability-spring-boot-starter dubbo-spring-boot-starter dubbo-spring-boot-starters dubbo-spring-boot-interceptor dubbo-nacos-spring-boot-starter dubbo-zookeeper-spring-boot-starter dubbo-zookeeper-curator5-spring-boot-starter +dubbo-sentinel-spring-boot-starter +dubbo-seata-spring-boot-starter dubbo-spring-security dubbo-tracing dubbo-xds diff --git a/.licenserc.yaml b/.licenserc.yaml index ae20d98b7b..22235dda53 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -200,10 +200,26 @@ dependency: license: Apache-2.0 - name: org.sonatype.plexus:plexus-cipher license: Apache-2.0 + - name: com.alibaba.csp:sentinel-apache-dubbo3-adapter + license: Apache-2.0 + - name: com.alibaba.csp:sentinel-transport-simple-http + license: Apache-2.0 + - name: com.alibaba.csp:sentinel-transport-common + license: Apache-2.0 + - name: com.alibaba.csp:sentinel-datasource-extension + license: Apache-2.0 + - name: com.alibaba.csp:sentinel-core + license: Apache-2.0 - name: com.google.protobuf:protobuf-java license: BSD 3-clause - name: com.google.protobuf:protobuf-java-util license: BSD 3-clause + - name: org.antlr:antlr4 + license: BSD 3-clause + - name: org.antlr:antlr-runtime + license: BSD 3-clause + - name: org.antlr:ST4 + license: BSD 3-clause # multi license - name: org.javassist:javassist license: Apache-2.0 diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml index c639ab7319..167793e315 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml @@ -133,7 +133,7 @@ org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${project.version} diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml index 8fb88bc394..a381207d9d 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml @@ -127,7 +127,7 @@ org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${project.version} diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 5f72b4dfa6..8c40df1b80 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -150,6 +150,8 @@ 8.5.87 0.7.5 2.2.4 + 1.8.6 + 1.6.1 1.56.0 0.8.1 1.2.2 @@ -818,6 +820,34 @@ nacos-client ${nacos_version} + + + com.alibaba.csp + sentinel-apache-dubbo3-adapter + ${sentinel.version} + + + com.alibaba.csp + sentinel-transport-simple-http + ${sentinel.version} + + + + io.seata + seata-spring-boot-starter + ${seata.version} + + + io.seata + seata-core + + + + + io.seata + seata-core + ${seata.version} + io.grpc diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml index cbc2e057bc..c6601da12d 100644 --- a/dubbo-distribution/dubbo-bom/pom.xml +++ b/dubbo-distribution/dubbo-bom/pom.xml @@ -631,32 +631,32 @@ org.apache.dubbo - dubbo-spring-boot-observability-starters + dubbo-observability-spring-boot-starters ${project.version} org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-autoconfigure ${project.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${project.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-otlp-starter + dubbo-tracing-otel-otlp-spring-boot-starter ${project.version} org.apache.dubbo - dubbo-spring-boot-tracing-brave-zipkin-starter + dubbo-tracing-brave-zipkin-spring-boot-starter ${project.version} org.apache.dubbo - dubbo-spring-boot-observability-starter + dubbo-observability-spring-boot-starter ${project.version} @@ -674,6 +674,16 @@ dubbo-zookeeper-curator5-spring-boot-starter ${project.version} + + org.apache.dubbo + dubbo-sentinel-spring-boot-starter + ${project.version} + + + org.apache.dubbo + dubbo-seata-spring-boot-starter + ${project.version} + diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-seata-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-seata-spring-boot-starter/pom.xml new file mode 100644 index 0000000000..c5b089d42b --- /dev/null +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-seata-spring-boot-starter/pom.xml @@ -0,0 +1,56 @@ + + + + 4.0.0 + + org.apache.dubbo + dubbo-spring-boot-starters + ${revision} + ../pom.xml + + + dubbo-seata-spring-boot-starter + ${revision} + jar + Apache Dubbo Seata Spring Boot Starter + + + + + + + + io.seata + seata-spring-boot-starter + + + io.seata + seata-core + + + + + + io.seata + seata-core + + + + \ No newline at end of file diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-sentinel-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-sentinel-spring-boot-starter/pom.xml new file mode 100644 index 0000000000..0e6dfd5c9d --- /dev/null +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-sentinel-spring-boot-starter/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + + org.apache.dubbo + dubbo-spring-boot-starters + ${revision} + ../pom.xml + + + dubbo-sentinel-spring-boot-starter + ${revision} + jar + Apache Dubbo Sentinel Spring Boot Starter + + + + + + + com.alibaba.csp + sentinel-apache-dubbo3-adapter + + + com.alibaba.csp + sentinel-transport-simple-http + + + + \ No newline at end of file diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/pom.xml index e8d997bda9..dcbf52ba40 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/pom.xml @@ -19,14 +19,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"> - dubbo-spring-boot-observability-starters + dubbo-observability-spring-boot-starters org.apache.dubbo ${revision} ../pom.xml 4.0.0 - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-autoconfigure diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-observability-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-observability-spring-boot-starter/pom.xml similarity index 90% rename from dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-observability-starter/pom.xml rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-observability-spring-boot-starter/pom.xml index 16c09acabd..ce94cf3ddc 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-observability-starter/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-observability-spring-boot-starter/pom.xml @@ -19,21 +19,21 @@ 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"> - dubbo-spring-boot-observability-starters + dubbo-observability-spring-boot-starters org.apache.dubbo ${revision} ../pom.xml 4.0.0 - dubbo-spring-boot-observability-starter + dubbo-observability-spring-boot-starter jar Apache Dubbo Spring Boot Observability Starter org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-autoconfigure ${project.version} diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-tracing-brave-zipkin-spring-boot-starter/pom.xml similarity index 90% rename from dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-tracing-brave-zipkin-spring-boot-starter/pom.xml index ac619e4302..2567edc06a 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-tracing-brave-zipkin-spring-boot-starter/pom.xml @@ -19,21 +19,21 @@ 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"> - dubbo-spring-boot-observability-starters + dubbo-observability-spring-boot-starters org.apache.dubbo ${revision} ../pom.xml 4.0.0 - dubbo-spring-boot-tracing-brave-zipkin-starter + dubbo-tracing-brave-zipkin-spring-boot-starter jar Apache Dubbo Spring Boot Tracing Brave Zipkin Starter org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-autoconfigure ${project.version} diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-otlp-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-tracing-otel-otlp-spring-boot-starter/pom.xml similarity index 90% rename from dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-otlp-starter/pom.xml rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-tracing-otel-otlp-spring-boot-starter/pom.xml index 57af321b3e..da4909ab61 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-otlp-starter/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-tracing-otel-otlp-spring-boot-starter/pom.xml @@ -20,20 +20,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - dubbo-spring-boot-observability-starters + dubbo-observability-spring-boot-starters org.apache.dubbo ${revision} ../pom.xml - dubbo-spring-boot-tracing-otel-otlp-starter + dubbo-tracing-otel-otlp-spring-boot-starter jar Apache Dubbo Spring Boot Tracing Otel OTLP Starter org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-autoconfigure ${project.version} diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-tracing-otel-zipkin-spring-boot-starter/pom.xml similarity index 90% rename from dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-tracing-otel-zipkin-spring-boot-starter/pom.xml index 97279d2b73..bbe734c042 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-tracing-otel-zipkin-spring-boot-starter/pom.xml @@ -19,21 +19,21 @@ 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"> - dubbo-spring-boot-observability-starters + dubbo-observability-spring-boot-starters org.apache.dubbo ${revision} ../pom.xml 4.0.0 - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter jar Apache Dubbo Spring Boot Tracing Otel Zipkin Starter org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-autoconfigure ${project.version} diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml index 77065023c9..e9f4d7ef97 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml @@ -27,14 +27,14 @@ 4.0.0 pom - dubbo-spring-boot-observability-starters + dubbo-observability-spring-boot-starters autoconfigure - dubbo-spring-boot-tracing-otel-zipkin-starter - dubbo-spring-boot-tracing-brave-zipkin-starter - dubbo-spring-boot-observability-starter - dubbo-spring-boot-tracing-otel-otlp-starter + dubbo-tracing-otel-zipkin-spring-boot-starter + dubbo-tracing-brave-zipkin-spring-boot-starter + dubbo-observability-spring-boot-starter + dubbo-tracing-otel-otlp-spring-boot-starter diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml index 7414f9e786..0049d17307 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml @@ -36,6 +36,8 @@ dubbo-nacos-spring-boot-starter dubbo-zookeeper-spring-boot-starter dubbo-zookeeper-curator5-spring-boot-starter + dubbo-sentinel-spring-boot-starter + dubbo-seata-spring-boot-starter \ No newline at end of file diff --git a/dubbo-test/dubbo-dependencies-all/pom.xml b/dubbo-test/dubbo-dependencies-all/pom.xml index ac58da26e1..9f407a4dbb 100644 --- a/dubbo-test/dubbo-dependencies-all/pom.xml +++ b/dubbo-test/dubbo-dependencies-all/pom.xml @@ -514,27 +514,27 @@ org.apache.dubbo - dubbo-spring-boot-observability-autoconfigure + dubbo-observability-spring-boot-autoconfigure ${project.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-zipkin-starter + dubbo-tracing-otel-zipkin-spring-boot-starter ${project.version} org.apache.dubbo - dubbo-spring-boot-tracing-otel-otlp-starter + dubbo-tracing-otel-otlp-spring-boot-starter ${project.version} org.apache.dubbo - dubbo-spring-boot-tracing-brave-zipkin-starter + dubbo-tracing-brave-zipkin-spring-boot-starter ${project.version} org.apache.dubbo - dubbo-spring-boot-observability-starter + dubbo-observability-spring-boot-starter ${project.version} @@ -552,6 +552,16 @@ dubbo-zookeeper-curator5-spring-boot-starter ${project.version} + + org.apache.dubbo + dubbo-sentinel-spring-boot-starter + ${project.version} + + + org.apache.dubbo + dubbo-seata-spring-boot-starter + ${project.version} +