chore: add seata sentinel starter & rename tracing starter (#12543)

Co-authored-by: Albumen Kevin <[email protected]> Co-authored-by: Ken Liu <[email protected]>
apache · Jul 7, 2023 · 4b62513 · 4b62513
1 parent 9bbf762
commit 4b62513
Show file tree

Hide file tree

Showing 16 changed files with 212 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/dubbo-seata-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-seata-spring-boot-starter/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<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-starters</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <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>
+
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
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
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<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-starters</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>dubbo-sentinel-spring-boot-starter</artifactId>
+    <version>${revision}</version>
+    <packaging>jar</packaging>
+    <description>Apache Dubbo Sentinel Spring Boot Starter</description>
+
+    <properties>
+    </properties>
+
+    <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>
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
@@ -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/...spring-boot-observability-starter/pom.xml → ...observability-spring-boot-starter/pom.xml b/...spring-boot-observability-starter/pom.xml → ...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/...boot-tracing-brave-zipkin-starter/pom.xml → ...-brave-zipkin-spring-boot-starter/pom.xml b/...boot-tracing-brave-zipkin-starter/pom.xml → ...-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/...ng-boot-tracing-otel-otlp-starter/pom.xml → ...ing-otel-otlp-spring-boot-starter/pom.xml b/...ng-boot-tracing-otel-otlp-starter/pom.xml → ...ing-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/...-boot-tracing-otel-zipkin-starter/pom.xml → ...g-otel-zipkin-spring-boot-starter/pom.xml b/...-boot-tracing-otel-zipkin-starter/pom.xml → ...g-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>