SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix 2284 issue: ScopeDecorator use CorrelationScopeDecorator.Builder from Spring Context instead of using new operator (#2285)

Browse Source 
Co-authored-by: Artem Krikheli <a.m.krikheli@tinkoff.ru>
This commit is contained in:
Artyom Krikheli
2023-05-09 16:33:43 +03:00
committed by GitHub
parent fc5f26a11f
commit a5eaa0ad6f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/BraveBaggageConfiguration.java
View File

@@ -198,13 +198,14 @@ class BraveBaggageConfiguration {
@ConditionalOnProperty(value = "spring.sleuth.baggage.correlation-enabled", matchIfMissing = true)
ScopeDecorator correlationScopeDecorator(@Qualifier(WHITELISTED_MDC_KEYS) List<String> whiteListedMDCKeys,
SleuthBaggageProperties sleuthBaggageProperties,
CorrelationScopeDecorator.Builder correlationScopeDecoratorBuilder,
@Nullable List<CorrelationScopeCustomizer> correlationScopeCustomizers) {
Set<String> correlationFields = redirectOldPropertyToNew(WHITELISTED_MDC_KEYS, whiteListedMDCKeys,
"spring.sleuth.baggage.correlation-fields", sleuthBaggageProperties.getCorrelationFields());
// Add fields from properties
CorrelationScopeDecorator.Builder builder = MDCScopeDecorator.newBuilder();
CorrelationScopeDecorator.Builder builder = correlationScopeDecoratorBuilder;
for (String field : correlationFields) {
builder.add(SingleCorrelationField.newBuilder(BaggageField.create(field)).build());
}