GH-1211 polishing actuator changes

Resolves #1244
This commit is contained in:
Oleg Zhurakousky
2018-02-26 23:02:09 -05:00
parent bf69f467e3
commit a381f818dd

View File

@@ -47,15 +47,13 @@ import org.springframework.context.annotation.Configuration;
@AutoConfigureBefore(SimpleMetricsExportAutoConfiguration.class)
@AutoConfigureAfter(MetricsAutoConfiguration.class)
@ConditionalOnClass({ Binder.class, MetricsAutoConfiguration.class })
@ConditionalOnProperty("spring.cloud.stream.bindings."
+ MetersPublisherBinding.APPLICATION_METRICS + ".destination")
@ConditionalOnProperty("spring.cloud.stream.bindings." + MetersPublisherBinding.APPLICATION_METRICS + ".destination")
@EnableConfigurationProperties(ApplicationMetricsProperties.class)
public class DestinationPublishingMetricsAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public MetricsPublisherConfig metricsPublisherConfig(
ApplicationMetricsProperties metersPublisherProperties) {
public MetricsPublisherConfig metricsPublisherConfig(ApplicationMetricsProperties metersPublisherProperties) {
return new MetricsPublisherConfig(metersPublisherProperties);
}
@@ -65,22 +63,17 @@ public class DestinationPublishingMetricsAutoConfiguration {
ApplicationMetricsProperties applicationMetricsProperties,
MetersPublisherBinding publisherBinding,
MetricsPublisherConfig metricsPublisherConfig, Clock clock) {
return new DefaultDestinationPublishingMeterRegistry(applicationMetricsProperties,
publisherBinding, metricsPublisherConfig, clock);
return new DefaultDestinationPublishingMeterRegistry(applicationMetricsProperties, publisherBinding, metricsPublisherConfig, clock);
}
@Bean
public BeanFactoryPostProcessor metersPublisherBindingRegistrant() {
return new BeanFactoryPostProcessor() {
@Override
public void postProcessBeanFactory(
ConfigurableListableBeanFactory beanFactory) throws BeansException {
RootBeanDefinition emitterBindingDefinition = new RootBeanDefinition(
BindableProxyFactory.class);
emitterBindingDefinition.getConstructorArgumentValues()
.addGenericArgumentValue(MetersPublisherBinding.class);
((DefaultListableBeanFactory) beanFactory).registerBeanDefinition(
MetersPublisherBinding.class.getName(), emitterBindingDefinition);
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
RootBeanDefinition emitterBindingDefinition = new RootBeanDefinition(BindableProxyFactory.class);
emitterBindingDefinition.getConstructorArgumentValues().addGenericArgumentValue(MetersPublisherBinding.class);
((DefaultListableBeanFactory) beanFactory).registerBeanDefinition(MetersPublisherBinding.class.getName(), emitterBindingDefinition);
}
};
}