Merge branch 'refs/heads/apache-3.2' into apache-3.3

# Conflicts: # dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/TripleServerStream.java
apache · Sep 7, 2024 · 1fb4dc8 · 1fb4dc8
2 parents a25b21f + 08c74b7
commit 1fb4dc8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1-bug.yml b/.github/ISSUE_TEMPLATE/1-bug.yml
@@ -71,6 +71,7 @@ body:
       - "Java Integration Cases (apache/dubbo-integration-cases)"
       - "Java SPI Extensions (apache/dubbo-spi-extensions)"
       - "Java Benchmark (apache/dubbo-benchmark)"
+      - "Python SDK (apache/dubbo-python)"
   validations:
     required: true
 

diff --git a/.github/ISSUE_TEMPLATE/2-feature.yml b/.github/ISSUE_TEMPLATE/2-feature.yml
@@ -66,6 +66,7 @@ body:
       - "Java Integration Cases (apache/dubbo-integration-cases)"
       - "Java SPI Extensions (apache/dubbo-spi-extensions)"
       - "Java Benchmark (apache/dubbo-benchmark)"
+      - "Python SDK (apache/dubbo-python)"
   validations:
     required: true
 

diff --git a/...rg/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java b/...rg/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java
@@ -271,6 +271,7 @@ brave.baggage.CorrelationScopeDecorator.Builder mdcCorrelationScopeDecoratorBuil
                 prefix = ObservabilityUtils.DUBBO_TRACING_BAGGAGE_CORRELATION,
                 name = "enabled",
                 matchIfMissing = true)
+        @ConditionalOnMissingBean
         brave.baggage.CorrelationScopeCustomizer correlationFieldsCorrelationScopeCustomizer() {
             return (builder) -> {
                 List<String> correlationFields = this.dubboConfigProperties