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

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-03-29 09:57:12 +02:00
parent 80b78bcc32 1c1b963862
commit eedff746d6
1 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,32 +59,40 @@ class ZipkinRestTemplateSenderConfiguration {
@Configuration
@ConditionalOnMissingClass("org.springframework.cloud.client.loadbalancer.LoadBalancerClient")
@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "false")
static class DefaultZipkinUrlExtractorConfiguration {
@Autowired(required = false) LoadBalancerClient client;
@Bean
@ConditionalOnMissingBean
ZipkinLoadBalancer noOpLoadBalancer(final ZipkinProperties zipkinProperties) {
return new ZipkinLoadBalancer() {
@Override public URI instance() {
return URI.create(zipkinProperties.getBaseUrl());
}
};
return new NoOpZipkinLoadBalancer(zipkinProperties);
}
}
@Configuration
@ConditionalOnClass(LoadBalancerClient.class)
@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "true", matchIfMissing = true)
static class DiscoveryClientZipkinUrlExtractorConfiguration {
@Autowired(required = false) LoadBalancerClient client;
@Configuration
@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "true", matchIfMissing = true)
static class ZipkinClientLoadBalancedConfiguration {
@Autowired(required = false) LoadBalancerClient client;
@Bean
@ConditionalOnMissingBean
ZipkinLoadBalancer loadBalancerClientZipkinLoadBalancer(ZipkinProperties zipkinProperties) {
return new LoadBalancerClientZipkinLoadBalancer(this.client, zipkinProperties);
@Bean
@ConditionalOnMissingBean
ZipkinLoadBalancer loadBalancerClientZipkinLoadBalancer(ZipkinProperties zipkinProperties) {
return new LoadBalancerClientZipkinLoadBalancer(this.client, zipkinProperties);
}
}
@Configuration
@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "false")
static class ZipkinClientNoOpConfiguration {
@Bean
@ConditionalOnMissingBean
ZipkinLoadBalancer noOpLoadBalancer(final ZipkinProperties zipkinProperties) {
return new NoOpZipkinLoadBalancer(zipkinProperties);
}
}
}
@@ -149,3 +157,16 @@ class ZipkinRestTemplateWrapper extends RestTemplate {
interface ZipkinUrlExtractor {
URI zipkinUrl(ZipkinProperties zipkinProperties);
}
class NoOpZipkinLoadBalancer implements ZipkinLoadBalancer {
private final ZipkinProperties zipkinProperties;
NoOpZipkinLoadBalancer(ZipkinProperties zipkinProperties) {
this.zipkinProperties = zipkinProperties;
}
@Override public URI instance() {
return URI.create(this.zipkinProperties.getBaseUrl());
}
}