Skip to content

Setting spring.reactor.context-propagation has no effect when lazy initialization is enabled #45853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Setting spring.reactor.context-propagation has no effect when lazy initialization is enabled #45853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...rc/main/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@

import reactor.core.publisher.Hooks;

import org.springframework.boot.LazyInitializationExcludeFilter;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;

/**
* {@link EnableAutoConfiguration Auto-configuration} for Reactor.
Expand All @@ -40,4 +42,9 @@ public class ReactorAutoConfiguration {
}
}

@Bean
static LazyInitializationExcludeFilter reactorAutoConfigurationLazyInitializationExcludeFilter() {
return LazyInitializationExcludeFilter.forBeanTypes(ReactorAutoConfiguration.class);
}

}
16 changes: 16 additions & 0 deletions ...st/java/org/springframework/boot/autoconfigure/reactor/ReactorAutoConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import reactor.core.publisher.Mono;
import reactor.util.context.Context;

import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

Expand Down Expand Up @@ -90,4 +91,19 @@ void shouldConfigurePropagationIfSetToAuto() {
});
}

@Test
void shouldConfigurePropagationIfSetToAutoAndLazyInitializationIsEnabled() {
AtomicReference<String> threadLocalValue = new AtomicReference<>();
this.contextRunner.withPropertyValues("spring.reactor.context-propagation=AUTO")
.withInitializer((applicationContext) -> applicationContext
.addBeanFactoryPostProcessor(new LazyInitializationBeanFactoryPostProcessor()))
.run((applicationContext) -> {
Mono.just("test")
.doOnNext((element) -> threadLocalValue.set(THREADLOCAL_VALUE.get()))
.contextWrite(Context.of(THREADLOCAL_KEY, "updated"))
.block();
assertThat(threadLocalValue.get()).isEqualTo("updated");
});
}

}