You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2023/07/07 02:22:54 UTC
[dubbo] branch 3.3 updated: chore: add seata sentinel starter & rename tracing starter (#12543)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 4b62513dff chore: add seata sentinel starter & rename tracing starter (#12543)
4b62513dff is described below
commit 4b62513dff4132cb79b1902fc048a51401df32a6
Author: conghuhu <56...@users.noreply.github.com>
AuthorDate: Fri Jul 7 10:22:48 2023 +0800
chore: add seata sentinel starter & rename tracing starter (#12543)
Co-authored-by: Albumen Kevin <jh...@gmail.com>
Co-authored-by: Ken Liu <ke...@gmail.com>
---
.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 | 39 +++++++++++++++-------
.../pom.xml | 31 ++++++++++-------
.../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, 154 insertions(+), 62 deletions(-)
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 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-tracing-otel-zipkin-starter</artifactId>
+ <artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
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 @@
<!-- Observability -->
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-tracing-otel-zipkin-starter</artifactId>
+ <artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
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 @@
<tomcat_embed_version>8.5.87</tomcat_embed_version>
<jetcd_version>0.7.5</jetcd_version>
<nacos_version>2.2.4</nacos_version>
+ <sentinel.version>1.8.6</sentinel.version>
+ <seata.version>1.6.1</seata.version>
<grpc.version>1.56.0</grpc.version>
<grpc_contrib_verdion>0.8.1</grpc_contrib_verdion>
<jprotoc_version>1.2.2</jprotoc_version>
@@ -818,6 +820,34 @@
<artifactId>nacos-client</artifactId>
<version>${nacos_version}</version>
</dependency>
+ <!-- sentinel related dependencies -->
+ <dependency>
+ <groupId>com.alibaba.csp</groupId>
+ <artifactId>sentinel-apache-dubbo3-adapter</artifactId>
+ <version>${sentinel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba.csp</groupId>
+ <artifactId>sentinel-transport-simple-http</artifactId>
+ <version>${sentinel.version}</version>
+ </dependency>
+ <!-- seata related dependencies -->
+ <dependency>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-spring-boot-starter</artifactId>
+ <version>${seata.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-core</artifactId>
+ <version>${seata.version}</version>
+ </dependency>
<!-- grpc related dependencies -->
<dependency>
<groupId>io.grpc</groupId>
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 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-observability-starters</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starters</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
+ <artifactId>dubbo-observability-spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-tracing-otel-zipkin-starter</artifactId>
+ <artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-tracing-otel-otlp-starter</artifactId>
+ <artifactId>dubbo-tracing-otel-otlp-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-tracing-brave-zipkin-starter</artifactId>
+ <artifactId>dubbo-tracing-brave-zipkin-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-observability-starter</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -674,6 +674,16 @@
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-sentinel-spring-boot-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-seata-spring-boot-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- test -->
<dependency>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-seata-spring-boot-starter/pom.xml
similarity index 59%
copy from dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml
copy to dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-seata-spring-boot-starter/pom.xml
index 7414f9e786..c5b089d42b 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-seata-spring-boot-starter/pom.xml
@@ -18,24 +18,39 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
-
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot</artifactId>
+ <artifactId>dubbo-spring-boot-starters</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>dubbo-spring-boot-starters</artifactId>
- <packaging>pom</packaging>
- <description>Apache Dubbo Spring Boot Starters</description>
+ <artifactId>dubbo-seata-spring-boot-starter</artifactId>
+ <version>${revision}</version>
+ <packaging>jar</packaging>
+ <description>Apache Dubbo Seata Spring Boot Starter</description>
+
+ <properties>
+ </properties>
+
+ <dependencies>
+ <!-- seata dependency -->
+ <dependency>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <modules>
- <module>observability</module>
- <module>dubbo-nacos-spring-boot-starter</module>
- <module>dubbo-zookeeper-spring-boot-starter</module>
- <module>dubbo-zookeeper-curator5-spring-boot-starter</module>
- </modules>
+ <dependency>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-core</artifactId>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-sentinel-spring-boot-starter/pom.xml
similarity index 65%
copy from dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml
copy to dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-sentinel-spring-boot-starter/pom.xml
index 7414f9e786..0e6dfd5c9d 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-sentinel-spring-boot-starter/pom.xml
@@ -18,24 +18,31 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
-
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot</artifactId>
+ <artifactId>dubbo-spring-boot-starters</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>dubbo-spring-boot-starters</artifactId>
- <packaging>pom</packaging>
- <description>Apache Dubbo Spring Boot Starters</description>
+ <artifactId>dubbo-sentinel-spring-boot-starter</artifactId>
+ <version>${revision}</version>
+ <packaging>jar</packaging>
+ <description>Apache Dubbo Sentinel Spring Boot Starter</description>
+
+ <properties>
+ </properties>
- <modules>
- <module>observability</module>
- <module>dubbo-nacos-spring-boot-starter</module>
- <module>dubbo-zookeeper-spring-boot-starter</module>
- <module>dubbo-zookeeper-curator5-spring-boot-starter</module>
- </modules>
+ <dependencies>
+ <dependency>
+ <groupId>com.alibaba.csp</groupId>
+ <artifactId>sentinel-apache-dubbo3-adapter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba.csp</groupId>
+ <artifactId>sentinel-transport-simple-http</artifactId>
+ </dependency>
+ </dependencies>
</project>
\ 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">
<parent>
- <artifactId>dubbo-spring-boot-observability-starters</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starters</artifactId>
<groupId>org.apache.dubbo</groupId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
+ <artifactId>dubbo-observability-spring-boot-autoconfigure</artifactId>
<dependencies>
<!-- micrometer -->
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">
<parent>
- <artifactId>dubbo-spring-boot-observability-starters</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starters</artifactId>
<groupId>org.apache.dubbo</groupId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>dubbo-spring-boot-observability-starter</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starter</artifactId>
<packaging>jar</packaging>
<description>Apache Dubbo Spring Boot Observability Starter</description>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
+ <artifactId>dubbo-observability-spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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">
<parent>
- <artifactId>dubbo-spring-boot-observability-starters</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starters</artifactId>
<groupId>org.apache.dubbo</groupId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>dubbo-spring-boot-tracing-brave-zipkin-starter</artifactId>
+ <artifactId>dubbo-tracing-brave-zipkin-spring-boot-starter</artifactId>
<packaging>jar</packaging>
<description>Apache Dubbo Spring Boot Tracing Brave Zipkin Starter</description>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
+ <artifactId>dubbo-observability-spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dubbo-spring-boot-observability-starters</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starters</artifactId>
<groupId>org.apache.dubbo</groupId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>dubbo-spring-boot-tracing-otel-otlp-starter</artifactId>
+ <artifactId>dubbo-tracing-otel-otlp-spring-boot-starter</artifactId>
<packaging>jar</packaging>
<description>Apache Dubbo Spring Boot Tracing Otel OTLP Starter</description>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
+ <artifactId>dubbo-observability-spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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">
<parent>
- <artifactId>dubbo-spring-boot-observability-starters</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starters</artifactId>
<groupId>org.apache.dubbo</groupId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>dubbo-spring-boot-tracing-otel-zipkin-starter</artifactId>
+ <artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
<packaging>jar</packaging>
<description>Apache Dubbo Spring Boot Tracing Otel Zipkin Starter</description>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
+ <artifactId>dubbo-observability-spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
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 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>dubbo-spring-boot-observability-starters</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starters</artifactId>
<modules>
<module>autoconfigure</module>
- <module>dubbo-spring-boot-tracing-otel-zipkin-starter</module>
- <module>dubbo-spring-boot-tracing-brave-zipkin-starter</module>
- <module>dubbo-spring-boot-observability-starter</module>
- <module>dubbo-spring-boot-tracing-otel-otlp-starter</module>
+ <module>dubbo-tracing-otel-zipkin-spring-boot-starter</module>
+ <module>dubbo-tracing-brave-zipkin-spring-boot-starter</module>
+ <module>dubbo-observability-spring-boot-starter</module>
+ <module>dubbo-tracing-otel-otlp-spring-boot-starter</module>
</modules>
<properties>
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 @@
<module>dubbo-nacos-spring-boot-starter</module>
<module>dubbo-zookeeper-spring-boot-starter</module>
<module>dubbo-zookeeper-curator5-spring-boot-starter</module>
+ <module>dubbo-sentinel-spring-boot-starter</module>
+ <module>dubbo-seata-spring-boot-starter</module>
</modules>
</project>
\ 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 @@
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
+ <artifactId>dubbo-observability-spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-tracing-otel-zipkin-starter</artifactId>
+ <artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-tracing-otel-otlp-starter</artifactId>
+ <artifactId>dubbo-tracing-otel-otlp-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-tracing-brave-zipkin-starter</artifactId>
+ <artifactId>dubbo-tracing-brave-zipkin-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-observability-starter</artifactId>
+ <artifactId>dubbo-observability-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -552,6 +552,16 @@
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-sentinel-spring-boot-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-seata-spring-boot-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- test -->
<dependency>