From a5eaa0ad6fabf94c60084eba44d7ba6a3401170f Mon Sep 17 00:00:00 2001 From: Artyom Krikheli Date: Tue, 9 May 2023 16:33:43 +0300 Subject: [PATCH] fix 2284 issue: ScopeDecorator use CorrelationScopeDecorator.Builder from Spring Context instead of using new operator (#2285) Co-authored-by: Artem Krikheli --- .../sleuth/autoconfig/brave/BraveBaggageConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/BraveBaggageConfiguration.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/BraveBaggageConfiguration.java index 16d9e03df..62cf39395 100644 --- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/BraveBaggageConfiguration.java +++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/brave/BraveBaggageConfiguration.java @@ -198,13 +198,14 @@ class BraveBaggageConfiguration { @ConditionalOnProperty(value = "spring.sleuth.baggage.correlation-enabled", matchIfMissing = true) ScopeDecorator correlationScopeDecorator(@Qualifier(WHITELISTED_MDC_KEYS) List whiteListedMDCKeys, SleuthBaggageProperties sleuthBaggageProperties, + CorrelationScopeDecorator.Builder correlationScopeDecoratorBuilder, @Nullable List correlationScopeCustomizers) { Set 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()); }