From 71ab4297221d19e63b6b97bb2cf2b2eedeac6f96 Mon Sep 17 00:00:00 2001
From: songxiaosheng <songxiaosheng@elastic.link>
Date: Mon, 29 May 2023 19:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20add=20bootstarter=20and=20fix=20?=
 =?UTF-8?q?endpoints=20bug=20(#12408)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* degist-concurrency-bugfix

* stytle opt

* fix i++

* revert demo

* fix sonar

* remove apache licence

* add licence

* add testcase&& fix notice

* add notice

* add notice

* add notice

* add notice

* fix ci timeout

* fix ci timeout

* remove testcase because of timeout

* remove testcase because of timeout

* remove testcase because of timeout

* fix ci

* fix sonar

* :fire: remove metricsPort config

* :fire: remove metricsPath config

* observer starter add actuator starter

* :bug: add bootstarter and fix endpoints bug

---------

Co-authored-by: wxbty <wxb_101@163.com>
Co-authored-by: x-shadow-man <1494445739@qq.com>
---
 .../spring/boot/actuate/mertics/DubboMetricsBinder.java    | 2 ++
 .../dubbo-spring-boot-observability-starter/pom.xml        | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dubbo-spring-boot/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/mertics/DubboMetricsBinder.java b/dubbo-spring-boot/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/mertics/DubboMetricsBinder.java
index e670303fbd..dbb8ce349c 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/mertics/DubboMetricsBinder.java
+++ b/dubbo-spring-boot/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/mertics/DubboMetricsBinder.java
@@ -34,6 +34,8 @@ public class DubboMetricsBinder implements ApplicationListener<ApplicationStarte
     public void onApplicationEvent(ApplicationStartedEvent applicationStartedEvent) {
         if (meterRegistry instanceof CompositeMeterRegistry) {
             MetricsGlobalRegistry.setCompositeRegistry((CompositeMeterRegistry) meterRegistry);
+        }else{
+            MetricsGlobalRegistry.getCompositeRegistry().add(meterRegistry);
         }
     }
 
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-observability-starters/dubbo-spring-boot-observability-starter/pom.xml
index 030298ed0d..16c09acabd 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-observability-starter/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-observability-starters/dubbo-spring-boot-observability-starter/pom.xml
@@ -36,5 +36,10 @@
             <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-spring-boot-actuator</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>