diff --git a/4-governance/dubbo-samples-metrics-spring-boot/README.md b/4-governance/dubbo-samples-metrics-spring-boot/README.md
index c557eff5d..2ba253e52 100644
--- a/4-governance/dubbo-samples-metrics-spring-boot/README.md
+++ b/4-governance/dubbo-samples-metrics-spring-boot/README.md
@@ -6,7 +6,7 @@ Dubbo 支持通过两种方式对外暴露 Metrics 指标给 Prometheus,具体
* Spring-boot-actuator,即通过标准的 Spring boot actuator 端口在特定的 endpoint 将 Dubbo 监控指标暴露出去
* dubbo qos,即通过 Dubbo 内置的 qos 端口将 Dubbo 监控指标暴露出去
-本示例中,我们使用 spring-boot-actuator 的方式透出 Dubbo 指标信息,请注意本示例使用的 Dubbo 版本必须为 3.2.0-beta.6 以上。
+本示例基于 **Spring Boot 3 / JDK 17**,使用 spring-boot-actuator 的方式透出 Dubbo 指标信息,请注意本示例使用的 Dubbo 版本必须为 3.3.0 以上。
### Metrics 相关示例配置
@@ -14,6 +14,7 @@ Dubbo 支持通过两种方式对外暴露 Metrics 指标给 Prometheus,具体
# ......
management.server.port=18081
management.endpoints.web.base-path=/management
+management.prometheus.metrics.export.enabled=true
dubbo.metrics.protocol=prometheus
# 如果不使用 spring-boot-actuator,可使用下面配置开启 qos 配置
diff --git a/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf b/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf
index 3f8888d8e..82aeb4560 100644
--- a/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf
+++ b/4-governance/dubbo-samples-metrics-spring-boot/case-versions.conf
@@ -20,6 +20,6 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=[>=3.3.0]
-spring.version=5.*
-java.version= [>= 8]
+dubbo.version=3.3.*
+spring.version=6.*
+java.version= [>= 17]
diff --git a/4-governance/dubbo-samples-metrics-spring-boot/pom.xml b/4-governance/dubbo-samples-metrics-spring-boot/pom.xml
index 8bc9dfbd6..a9ba2cdbe 100644
--- a/4-governance/dubbo-samples-metrics-spring-boot/pom.xml
+++ b/4-governance/dubbo-samples-metrics-spring-boot/pom.xml
@@ -21,7 +21,7 @@
org.apache
apache
- 23
+ 31
4.0.0
@@ -34,16 +34,14 @@
Dubbo Samples Metrics
- 1.8
- 1.8
+ 17
+ 17
UTF-8
3.3.1
- 2.7.18
+ 3.2.3
4.5.13
4.13.1
-
- 3.7.0
@@ -64,16 +62,12 @@
org.springframework.boot
- spring-boot-starter-logging
+ spring-boot-starter
${spring-boot.version}
- logback-classic
- ch.qos.logback
-
-
- log4j-to-slf4j
- org.apache.logging.log4j
+ spring-boot-starter-logging
+ org.springframework.boot
@@ -96,18 +90,14 @@
org.apache.dubbo
dubbo
-
-
- org.apache.dubbo
- dubbo-observability-spring-boot-starter
+ org.apache.dubbo
+ dubbo-observability-spring-boot-starter
-
- org.apache.dubbo
- dubbo-zookeeper-curator5-spring-boot-starter
+ org.apache.dubbo
+ dubbo-zookeeper-curator5-spring-boot-starter
-
org.apache.dubbo
dubbo-spring-boot-starter
@@ -116,27 +106,22 @@
org.apache.dubbo
dubbo-spring-boot-actuator
-
- io.micrometer
- micrometer-registry-prometheus
-
-
- io.prometheus
- simpleclient
-
-
- io.prometheus
- simpleclient_pushgateway
-
+
+ io.micrometer
+ micrometer-registry-prometheus
+
+
+ io.prometheus
+ simpleclient
+
+
+ io.prometheus
+ simpleclient_pushgateway
+
+
org.springframework.boot
spring-boot-starter
-
-
- spring-boot-starter-logging
- org.springframework.boot
-
-
org.springframework.boot
@@ -151,11 +136,6 @@
spring-boot-starter-web
-
- com.alibaba
- fastjson
- 1.2.83
-
org.apache.httpcomponents
httpclient
@@ -164,10 +144,8 @@
junit
junit
- ${junit.version}
test
-
org.springframework
spring-test
@@ -178,21 +156,6 @@
spring-boot-test
test
-
- io.swagger
- swagger-jaxrs
- 1.5.19
-
-
- javax.validation
- validation-api
-
-
-
-
- org.springframework
- spring-core
-
@@ -205,40 +168,27 @@
snappy-java
1.1.10.5
-
- org.awaitility
- awaitility
-
+
+ org.awaitility
+ awaitility
+
-
-
-
- javax.annotation
-
- [1.11,)
-
-
-
- javax.annotation
- javax.annotation-api
- 1.3.2
-
-
-
-
-
org.apache.maven.plugins
maven-compiler-plugin
- ${maven-compiler-plugin.version}
+
+
+ -proc:none
+
+
org.springframework.boot
spring-boot-maven-plugin
- 2.6.8
+ ${spring-boot.version}
diff --git a/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.yaml b/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.yaml
index 10d8152aa..0e5b34b1a 100644
--- a/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.yaml
+++ b/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.yaml
@@ -2,8 +2,9 @@ management:
metrics:
tags:
application: dubbo-samples-metrics-spring-boot
- export:
- prometheus:
+ prometheus:
+ metrics:
+ export:
enabled: true
server:
port: 18081
@@ -11,9 +12,18 @@ management:
web:
base-path: /management
exposure:
- include: info,health,env,prometheus
+ include:
+ - health
+ - info
+ - env
+ - prometheus
endpoint:
- metrics:
+ health:
+ enabled: true
+ show-details: always
+ info:
+ enabled: true
+ env:
enabled: true
prometheus:
enabled: true
@@ -21,6 +31,10 @@ management:
spring:
main:
allow-circular-references: true
+ info:
+ app:
+ name: dubbo-samples-metrics-spring-boot
+ description: Dubbo metrics sample on Spring Boot 3
server:
port: 18080