Skip to content

Commit 1fb4dc8

Browse files
committed
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
2 parents a25b21f + 08c74b7 commit 1fb4dc8

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

.github/ISSUE_TEMPLATE/1-bug.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ body:
7171
- "Java Integration Cases (apache/dubbo-integration-cases)"
7272
- "Java SPI Extensions (apache/dubbo-spi-extensions)"
7373
- "Java Benchmark (apache/dubbo-benchmark)"
74+
- "Python SDK (apache/dubbo-python)"
7475
validations:
7576
required: true
7677

.github/ISSUE_TEMPLATE/2-feature.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ body:
6666
- "Java Integration Cases (apache/dubbo-integration-cases)"
6767
- "Java SPI Extensions (apache/dubbo-spi-extensions)"
6868
- "Java Benchmark (apache/dubbo-benchmark)"
69+
- "Python SDK (apache/dubbo-python)"
6970
validations:
7071
required: true
7172

dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ brave.baggage.CorrelationScopeDecorator.Builder mdcCorrelationScopeDecoratorBuil
271271
prefix = ObservabilityUtils.DUBBO_TRACING_BAGGAGE_CORRELATION,
272272
name = "enabled",
273273
matchIfMissing = true)
274+
@ConditionalOnMissingBean
274275
brave.baggage.CorrelationScopeCustomizer correlationFieldsCorrelationScopeCustomizer() {
275276
return (builder) -> {
276277
List<String> correlationFields = this.dubboConfigProperties

0 commit comments

Comments
 (0)