[dubbo] branch 3.2 updated: fix: fix observ-starter some bugs (#12046)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new 6841306146 fix: fix observ-starter some bugs (#12046)
6841306146 is described below

commit 6841306146711162085228d3060049fc75ce7b3b
Author: conghuhu <56248584+congh...@users.noreply.github.com>
AuthorDate: Tue Apr 11 09:28:12 2023 +0800

    fix: fix observ-starter some bugs (#12046)
---
 .../autoconfigure/DubboObservationAutoConfiguration.java             | 5 ++---
 .../autoconfigure/otel/OpenTelemetryAutoConfiguration.java           | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/dubbo-spring-boot/dubbo-spring-boot-observability-starter/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java
 
b/dubbo-spring-boot/dubbo-spring-boot-observability-starter/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java
index 6b349d23a0..f87c7787a8 100644
--- 
a/dubbo-spring-boot/dubbo-spring-boot-observability-starter/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java
+++ 
b/dubbo-spring-boot/dubbo-spring-boot-observability-starter/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java
@@ -18,7 +18,6 @@ package 
org.apache.dubbo.spring.boot.observability.autoconfigure;
 
 import io.micrometer.core.instrument.MeterRegistry;
 
-import io.micrometer.tracing.Tracer;
 import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.qos.protocol.QosProtocolWrapper;
@@ -83,9 +82,9 @@ public class DubboObservationAutoConfiguration implements 
BeanFactoryAware, Smar
 
     @Override
     public void afterSingletonsInstantiated() {
-
         try {
-            Tracer bean = beanFactory.getBean(Tracer.class);
+            
applicationModel.getBeanFactory().registerBean(beanFactory.getBean(io.micrometer.observation.ObservationRegistry.class));
+            io.micrometer.tracing.Tracer bean = 
beanFactory.getBean(io.micrometer.tracing.Tracer.class);
             applicationModel.getBeanFactory().registerBean(bean);
         } catch (NoSuchBeanDefinitionException e) {
             logger.info("Please use a version of micrometer higher than 1.10.0 
：{}" + e.getMessage());
diff --git 
a/dubbo-spring-boot/dubbo-spring-boot-observability-starter/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java
 
b/dubbo-spring-boot/dubbo-spring-boot-observability-starter/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java
index 4d8d58c81e..b17e2cdb47 100644
--- 
a/dubbo-spring-boot/dubbo-spring-boot-observability-starter/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java
+++ 
b/dubbo-spring-boot/dubbo-spring-boot-observability-starter/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
 @AutoConfiguration(before = DubboMicrometerTracingAutoConfiguration.class, 
afterName = 
"org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryAutoConfiguration")
 @ConditionalOnDubboTracingEnable
 @ConditionalOnClass(name = {"io.micrometer.tracing.otel.bridge.OtelTracer",
-    "io.opentelemetry.sdk.trace.SdkTracerProvider", "e 
io.opentelemetry.api.OpenTelemetry"
+    "io.opentelemetry.sdk.trace.SdkTracerProvider", 
"io.opentelemetry.api.OpenTelemetry"
     , "io.micrometer.tracing.SpanCustomizer"})
 @EnableConfigurationProperties(DubboConfigurationProperties.class)
 public class OpenTelemetryAutoConfiguration {