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

Update auto-configuration to use @Configuration(proxyBeanMethods=false)

Browse Source 
fixes gh-1245
This commit is contained in:
Marcin Grzejszczak
2019-10-24 13:42:00 +02:00
parent 4bfa08bb1c
commit 34f61908fd
36 changed files with 104 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinAutoConfiguration.java
View File

@@ -67,7 +67,7 @@ import org.springframework.web.client.RestTemplate;
* @see ZipkinRestTemplateCustomizer
* @see DefaultZipkinRestTemplateCustomizer
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(ZipkinProperties.class)
@ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" },
matchIfMissing = true)
@@ -142,7 +142,7 @@ public class ZipkinAutoConfiguration {
return new DefaultZipkinRestTemplateCustomizer(zipkinProperties);
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(EndpointLocator.class)
@ConditionalOnProperty(value = "spring.zipkin.locator.discovery.enabled",
havingValue = "false", matchIfMissing = true)
@@ -168,7 +168,7 @@ public class ZipkinAutoConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(Registration.class)
@ConditionalOnMissingBean(EndpointLocator.class)
@ConditionalOnProperty(value = "spring.zipkin.locator.discovery.enabled",

2
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java
View File

@@ -57,7 +57,7 @@ import org.springframework.util.Assert;
* @see ZipkinAutoConfiguration
* @deprecated left for backward compatibility
*/
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" },
matchIfMissing = true)
@AutoConfigureBefore(ZipkinAutoConfiguration.class)

4
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinActiveMqSenderConfiguration.java
View File

@@ -32,7 +32,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ActiveMQConnectionFactory.class)
@ConditionalOnMissingBean(name = ZipkinAutoConfiguration.SENDER_BEAN_NAME)
@Conditional(ZipkinSenderCondition.class)
@@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration;
@AutoConfigureAfter(ActiveMQAutoConfiguration.class)
class ZipkinActiveMqSenderConfiguration {
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(ActiveMQConnectionFactory.class)
static class ZipkinActiveMqSenderBeanConfiguration {

4
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinKafkaSenderConfiguration.java
View File

@@ -34,14 +34,14 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(ByteArraySerializer.class)
@ConditionalOnMissingBean(name = ZipkinAutoConfiguration.SENDER_BEAN_NAME)
@Conditional(ZipkinSenderCondition.class)
@ConditionalOnProperty(value = "spring.zipkin.sender.type", havingValue = "kafka")
class ZipkinKafkaSenderConfiguration {
@Configuration
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(KafkaProperties.class)
static class ZipkinKafkaSenderBeanConfiguration {

2
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRabbitSenderConfiguration.java
View File

@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils;
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(CachingConnectionFactory.class)
@ConditionalOnMissingBean(name = ZipkinAutoConfiguration.SENDER_BEAN_NAME)
@Conditional(ZipkinSenderCondition.class)

10
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java
View File

@@ -46,7 +46,7 @@ import org.springframework.web.client.ResponseExtractor;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(name = ZipkinAutoConfiguration.SENDER_BEAN_NAME)
@Conditional(ZipkinSenderCondition.class)
@EnableConfigurationProperties(ZipkinSenderProperties.class)
@@ -125,7 +125,7 @@ class ZipkinRestTemplateSenderConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingClass("org.springframework.cloud.client.loadbalancer.LoadBalancerClient")
static class DefaultZipkinUrlExtractorConfiguration {
@@ -140,11 +140,11 @@ class ZipkinRestTemplateSenderConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(LoadBalancerClient.class)
static class DiscoveryClientZipkinUrlExtractorConfiguration {
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled",
havingValue = "true", matchIfMissing = true)
static class ZipkinClientLoadBalancedConfiguration {
@@ -162,7 +162,7 @@ class ZipkinRestTemplateSenderConfiguration {
}
@Configuration
@Configuration(proxyBeanMethods = false)
@ConditionalOnProperty(value = "spring.zipkin.discovery-client-enabled",
havingValue = "false")
static class ZipkinClientNoOpConfiguration {