WIP

Author: marcingrzejszczak

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java

@@ -316,10 +316,10 @@ CorrelationScopeDecorator.Builder correlationScopeDecoratorBuilder() {
 			ScopeDecorator correlationScopeDecorator(
 					TracingProperties properties, ObjectProvider<List<CorrelationScopeCustomizer>> correlationScopeCustomizers) {
 				List<String> correlationFields = properties.getBaggage().getCorrelationFields();
-				// Add fields from properties
 				CorrelationScopeDecorator.Builder builder = MDCScopeDecorator.newBuilder();
 				for (String field : correlationFields) {
-					builder.add(CorrelationScopeConfig.SingleCorrelationField.newBuilder(BaggageField.create(field)).build());
+					builder.add(CorrelationScopeConfig.SingleCorrelationField.newBuilder(BaggageField.create(field))
+									.flushOnUpdate().build());
 				}
 				correlationScopeCustomizers.ifAvailable(customizers -> customizers.forEach(customizer -> customizer.customize(builder)));
 				return builder.build();

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryConfigurationsMicrometerConfigurationTests.java

@@ -28,6 +28,7 @@
 
 import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryConfigurations.MicrometerConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.context.FilteredClassLoader;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
@@ -44,7 +45,8 @@
 class OpenTelemetryConfigurationsMicrometerConfigurationTests {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
-			.withConfiguration(AutoConfigurations.of(MicrometerConfiguration.class));
+			.withConfiguration(AutoConfigurations.of(MicrometerConfiguration.class))
+			.withUserConfiguration(PropertiesConfiguration.class);
 
 	@Test
 	void shouldSupplyBeans() {
@@ -99,6 +101,12 @@ void shouldBackOffOnCustomBeans() {
 		});
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@EnableConfigurationProperties(TracingProperties.class)
+	private static class PropertiesConfiguration {
+
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	private static class CustomConfiguration {