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

Fix HookRegisteringBeanFactoryPostProcessor to work with native. (#2055)

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2021-11-09 11:56:17 +01:00
committed by GitHub
parent acaf6ce039
commit 2282d7b1cd
3 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/reactor/TraceReactorAutoConfiguration.java
View File

@@ -30,10 +30,10 @@ import reactor.core.publisher.Hooks;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -47,6 +47,8 @@ import org.springframework.cloud.sleuth.TraceContext;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration;
import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -64,6 +66,7 @@ import static org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth.
*
* @author Stephane Maldini
* @author Marcin Grzejszczak
* @author Olga Maciaszek-Sharma
* @since 2.0.0
*/
@Configuration(proxyBeanMethods = false)
@@ -91,12 +94,11 @@ public class TraceReactorAutoConfiguration {
@Bean
@ConditionalOnMissingBean
HookRegisteringBeanDefinitionRegistryPostProcessor traceHookRegisteringBeanDefinitionRegistryPostProcessor(
ConfigurableApplicationContext context) {
HookRegisteringBeanFactoryPostProcessor traceHookRegisteringBeanFactoryPostProcessor() {
if (log.isTraceEnabled()) {
log.trace("Registering bean definition registry post processor for context [" + context + "]");
log.trace("Registering HookRegisteringBeanFactoryPostProcessor");
}
return new HookRegisteringBeanDefinitionRegistryPostProcessor(context);
return new HookRegisteringBeanFactoryPostProcessor();
}
private static boolean isQueueWrapperOnTheClasspath() {
@@ -147,7 +149,7 @@ class HooksRefresher implements ApplicationListener<RefreshScopeRefreshedEvent>
if (log.isTraceEnabled()) {
log.trace("Adding queue wrapper instrumentation");
}
HookRegisteringBeanDefinitionRegistryPostProcessor.addQueueWrapper(context);
HookRegisteringBeanFactoryPostProcessor.addQueueWrapper(context);
Hooks.onLastOperator(SLEUTH_TRACE_REACTOR_KEY, ReactorSleuth.scopePassingSpanOperator(this.context));
Schedulers.onScheduleHook(TraceReactorAutoConfiguration.SLEUTH_REACTOR_EXECUTOR_SERVICE_KEY,
ReactorSleuth.scopePassingOnScheduleHook(this.context));
@@ -177,23 +179,17 @@ class HooksRefresher implements ApplicationListener<RefreshScopeRefreshedEvent>
}
class HookRegisteringBeanDefinitionRegistryPostProcessor implements BeanDefinitionRegistryPostProcessor, Closeable {
class HookRegisteringBeanFactoryPostProcessor implements BeanFactoryPostProcessor, Closeable, ApplicationContextAware {
private static final Log log = LogFactory.getLog(HookRegisteringBeanDefinitionRegistryPostProcessor.class);
private static final Log log = LogFactory.getLog(HookRegisteringBeanFactoryPostProcessor.class);
final ConfigurableApplicationContext springContext;
HookRegisteringBeanDefinitionRegistryPostProcessor(ConfigurableApplicationContext springContext) {
this.springContext = springContext;
}
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) {
}
private ConfigurableApplicationContext springContext;
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
setupHooks(this.springContext);
if (springContext != null) {
setupHooks(springContext);
}
}
static void setupHooks(ConfigurableApplicationContext springContext) {
@@ -354,6 +350,21 @@ class HookRegisteringBeanDefinitionRegistryPostProcessor implements BeanDefiniti
};
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
if (log.isTraceEnabled()) {
log.trace("Setting context for HookRegisteringBeanFactoryPostProcessor: [" + applicationContext + "]");
}
if (!(applicationContext instanceof ConfigurableApplicationContext)) {
if (log.isErrorEnabled()) {
log.error("Cannot set up tracing hooks for non-configurable application context: [" + applicationContext
+ "]");
}
return;
}
springContext = (ConfigurableApplicationContext) applicationContext;
}
static class Envelope {
final Object body;

4
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/reactor/TraceReactorAutoConfigurationAccessorConfiguration.java
View File

@@ -39,7 +39,7 @@ public final class TraceReactorAutoConfigurationAccessorConfiguration {
log.trace("Cleaning up hooks");
}
try {
new HookRegisteringBeanDefinitionRegistryPostProcessor(null).close();
new HookRegisteringBeanFactoryPostProcessor().close();
}
catch (IOException e) {
throw new IllegalStateException(e);
@@ -50,7 +50,7 @@ public final class TraceReactorAutoConfigurationAccessorConfiguration {
if (log.isTraceEnabled()) {
log.trace("Setting up hooks");
}
HookRegisteringBeanDefinitionRegistryPostProcessor.setupHooks(context);
HookRegisteringBeanFactoryPostProcessor.setupHooks(context);
}
}

14
tests/common/src/main/java/org/springframework/cloud/sleuth/autoconfig/instrument/reactor/Issue866Configuration.java
View File

@@ -21,7 +21,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -41,10 +40,9 @@ public class Issue866Configuration {
public static TestHook hook;
@Bean
HookRegisteringBeanDefinitionRegistryPostProcessor overridingProcessorForTests(
ConfigurableApplicationContext context) {
log.info("Registering a HookRegisteringBeanDefinitionRegistryPostProcessor for context [" + context + "]");
TestHook hook = new TestHook(context);
HookRegisteringBeanFactoryPostProcessor overridingProcessorForTests() {
log.info("Registering a HookRegisteringBeanDefinitionRegistryPostProcessor.");
TestHook hook = new TestHook();
Issue866Configuration.hook = hook;
return hook;
}
@@ -52,15 +50,15 @@ public class Issue866Configuration {
/**
* Test Hook.
*/
public static class TestHook extends HookRegisteringBeanDefinitionRegistryPostProcessor {
public static class TestHook extends HookRegisteringBeanFactoryPostProcessor {
/**
* Whether the hook was called.
*/
public boolean executed = false;
public TestHook(ConfigurableApplicationContext context) {
super(context);
public TestHook() {
super();
}
@Override