From 6325a765bcf3dc4457c9e99a753b418c4657019b Mon Sep 17 00:00:00 2001
From: conghuhu <56248584+conghuhu@users.noreply.github.com>
Date: Mon, 12 Jun 2023 12:23:55 +0800
Subject: [PATCH] feat: add springboot-starter for nacos and zookeeper (#12488)
---
.artifacts | 3 +
dubbo-distribution/dubbo-bom/pom.xml | 15 +++
.../dubbo-nacos-spring-boot-starter/pom.xml | 44 +++++++
.../pom.xml | 115 ++++++++++++++++++
.../pom.xml | 48 ++++++++
.../observability}/autoconfigure/pom.xml | 0
...bboMicrometerTracingAutoConfiguration.java | 0
.../DubboObservationAutoConfiguration.java | 0
.../autoconfigure/ObservabilityUtils.java | 0
.../ObservationHandlerGrouping.java | 0
.../ObservationRegistryPostProcessor.java | 0
.../ConditionalOnDubboTracingEnable.java | 0
.../brave/BraveAutoConfiguration.java | 0
.../exporter/otlp/OtlpAutoConfiguration.java | 0
.../exporter/zipkin/HttpSender.java | 0
.../zipkin/ZipkinAutoConfiguration.java | 0
.../exporter/zipkin/ZipkinConfigurations.java | 0
.../zipkin/ZipkinRestTemplateSender.java | 0
.../zipkin/ZipkinWebClientSender.java | 0
.../ZipkinRestTemplateBuilderCustomizer.java | 0
.../ZipkinWebClientBuilderCustomizer.java | 0
.../otel/OpenTelemetryAutoConfiguration.java | 0
.../main/resources/META-INF/spring.factories | 0
...ot.autoconfigure.AutoConfiguration.imports | 0
...crometerTracingAutoConfigurationTests.java | 0
.../pom.xml | 0
.../pom.xml | 0
.../pom.xml | 0
.../pom.xml | 0
.../observability}/pom.xml | 2 +-
.../dubbo-spring-boot-starters/pom.xml | 41 +++++++
dubbo-spring-boot/pom.xml | 2 +-
32 files changed, 268 insertions(+), 2 deletions(-)
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-nacos-spring-boot-starter/pom.xml
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboMicrometerTracingAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservabilityUtils.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationHandlerGrouping.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationRegistryPostProcessor.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/otlp/OtlpAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinRestTemplateBuilderCustomizer.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinWebClientBuilderCustomizer.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/resources/META-INF/spring.factories (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/dubbo-spring-boot-observability-starter/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/dubbo-spring-boot-tracing-otel-otlp-starter/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml (100%)
rename dubbo-spring-boot/{dubbo-spring-boot-observability-starters => dubbo-spring-boot-starters/observability}/pom.xml (98%)
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml
diff --git a/.artifacts b/.artifacts
index 8a62716f73..a4fd1eb340 100644
--- a/.artifacts
+++ b/.artifacts
@@ -109,5 +109,8 @@ dubbo-spring-boot-tracing-otel-zipkin-starter
dubbo-spring-boot-tracing-otel-otlp-starter
dubbo-spring-boot-observability-starter
dubbo-spring-boot-starter
+dubbo-nacos-spring-boot-starter
+dubbo-zookeeper-spring-boot-starter
+dubbo-zookeeper-curator5-spring-boot-starter
dubbo-spring-security
dubbo-xds
diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml
index 2e6deddfac..50978767f3 100644
--- a/dubbo-distribution/dubbo-bom/pom.xml
+++ b/dubbo-distribution/dubbo-bom/pom.xml
@@ -532,6 +532,21 @@
dubbo-spring-boot-observability-starter
${project.version}
+
+ org.apache.dubbo
+ dubbo-nacos-spring-boot-starter
+ ${project.version}
+
+
+ org.apache.dubbo
+ dubbo-zookeeper-spring-boot-starter
+ ${project.version}
+
+
+ org.apache.dubbo
+ dubbo-zookeeper-curator5-spring-boot-starter
+ ${project.version}
+
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-nacos-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-nacos-spring-boot-starter/pom.xml
new file mode 100644
index 0000000000..7f4df2957a
--- /dev/null
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-nacos-spring-boot-starter/pom.xml
@@ -0,0 +1,44 @@
+
+
+
+
+ org.apache.dubbo
+ dubbo-spring-boot-starters
+ ${revision}
+ ../pom.xml
+
+ 4.0.0
+
+ dubbo-nacos-spring-boot-starter
+ ${revision}
+ jar
+ Apache Dubbo Nacos Spring Boot Starter
+
+
+
+
+
+
+ com.alibaba.nacos
+ nacos-client
+
+
+
+
\ No newline at end of file
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml
new file mode 100644
index 0000000000..2cd0feb699
--- /dev/null
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-curator5-spring-boot-starter/pom.xml
@@ -0,0 +1,115 @@
+
+
+
+
+ org.apache.dubbo
+ dubbo-spring-boot-starters
+ ${revision}
+ ../pom.xml
+
+ 4.0.0
+
+ dubbo-zookeeper-curator5-spring-boot-starter
+ ${revision}
+ jar
+ Apache Dubbo Zookeeper Curator5 Spring Boot Starter
+
+
+ 5.1.0
+ 3.8.1
+
+
+
+
+
+ org.apache.zookeeper
+ parent
+ ${zookeeper_version}
+ pom
+ import
+
+
+
+
+
+
+ org.apache.curator
+ curator-x-discovery
+ ${curator5_version}
+
+
+ org.apache.zookeeper
+ zookeeper
+ ${zookeeper_version}
+
+
+ io.netty
+ netty-handler
+
+
+ io.netty
+ netty-transport-native-epoll
+
+
+
+
+
+ com.github.spotbugs
+ spotbugs-annotations
+ true
+
+
+
+ commons-cli
+ commons-cli
+
+
+
+ org.eclipse.jetty
+ jetty-server
+
+
+
+ org.eclipse.jetty
+ jetty-servlet
+
+
+
+ org.eclipse.jetty
+ jetty-client
+
+
+
+ jline
+ jline
+
+
+
+ io.dropwizard.metrics
+ metrics-core
+
+
+
+ org.xerial.snappy
+ snappy-java
+
+
+
+
\ No newline at end of file
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml
new file mode 100644
index 0000000000..189443c440
--- /dev/null
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/dubbo-zookeeper-spring-boot-starter/pom.xml
@@ -0,0 +1,48 @@
+
+
+
+ 4.0.0
+
+ org.apache.dubbo
+ dubbo-spring-boot-starters
+ ${revision}
+ ../pom.xml
+
+
+ dubbo-zookeeper-spring-boot-starter
+ ${revision}
+ jar
+ Apache Dubbo Zookeeper Spring Boot Starter
+
+
+
+
+
+
+ org.apache.curator
+ curator-x-discovery
+
+
+ org.apache.zookeeper
+ zookeeper
+
+
+
+
\ No newline at end of file
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/pom.xml
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/pom.xml
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/pom.xml
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboMicrometerTracingAutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboMicrometerTracingAutoConfiguration.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboMicrometerTracingAutoConfiguration.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboMicrometerTracingAutoConfiguration.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservabilityUtils.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservabilityUtils.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservabilityUtils.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservabilityUtils.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationHandlerGrouping.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationHandlerGrouping.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationHandlerGrouping.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationHandlerGrouping.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationRegistryPostProcessor.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationRegistryPostProcessor.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationRegistryPostProcessor.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationRegistryPostProcessor.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/otlp/OtlpAutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/otlp/OtlpAutoConfiguration.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/otlp/OtlpAutoConfiguration.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/otlp/OtlpAutoConfiguration.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinRestTemplateBuilderCustomizer.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinRestTemplateBuilderCustomizer.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinRestTemplateBuilderCustomizer.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinRestTemplateBuilderCustomizer.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinWebClientBuilderCustomizer.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinWebClientBuilderCustomizer.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinWebClientBuilderCustomizer.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinWebClientBuilderCustomizer.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/resources/META-INF/spring.factories b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/resources/META-INF/spring.factories
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/resources/META-INF/spring.factories
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-observability-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-observability-starter/pom.xml
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-observability-starter/pom.xml
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-observability-starter/pom.xml
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-tracing-otel-otlp-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-otlp-starter/pom.xml
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-tracing-otel-otlp-starter/pom.xml
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-otlp-starter/pom.xml
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml
similarity index 100%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml
diff --git a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
similarity index 98%
rename from dubbo-spring-boot/dubbo-spring-boot-observability-starters/pom.xml
rename to dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
index 01d7d6fa21..adb9dda980 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
org.apache.dubbo
- dubbo-spring-boot
+ dubbo-spring-boot-starters
${revision}
../pom.xml
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml
new file mode 100644
index 0000000000..7414f9e786
--- /dev/null
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/pom.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+ org.apache.dubbo
+ dubbo-spring-boot
+ ${revision}
+ ../pom.xml
+
+ 4.0.0
+
+ dubbo-spring-boot-starters
+ pom
+ Apache Dubbo Spring Boot Starters
+
+
+ observability
+ dubbo-nacos-spring-boot-starter
+ dubbo-zookeeper-spring-boot-starter
+ dubbo-zookeeper-curator5-spring-boot-starter
+
+
+
\ No newline at end of file
diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml
index 49cebf9b27..65eadbd7fc 100644
--- a/dubbo-spring-boot/pom.xml
+++ b/dubbo-spring-boot/pom.xml
@@ -36,7 +36,7 @@
dubbo-spring-boot-autoconfigure
dubbo-spring-boot-compatible
dubbo-spring-boot-starter
- dubbo-spring-boot-observability-starters
+ dubbo-spring-boot-starters