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

Upgrade to brave 3.0.0-rc-1

Browse Source 
fixes gh-33
This commit is contained in:
Spencer Gibb
2015-08-31 18:47:51 -06:00
parent 69751ae63e
commit 78b60b605c
6 changed files with 14 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -108,17 +108,17 @@
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-client</artifactId>
<artifactId>brave-core</artifactId>
<version>${brave.version}</version>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-impl</artifactId>
<artifactId>brave-http</artifactId>
<version>${brave.version}</version>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-impl-spring</artifactId>
<artifactId>brave-core-spring</artifactId>
<version>${brave.version}</version>
</dependency>
<dependency>
@@ -196,7 +196,7 @@
</dependencyManagement>
<properties>
<brave.version>2.4.2</brave.version>
<brave.version>3.0.0-rc-1</brave.version>
<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<aspectj.version>1.8.4</aspectj.version>
<spock.version>1.0-groovy-2.4</spock.version>

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/main/java/sample/SampleMessagingApplication.java
View File

@@ -29,7 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.github.kristofa.brave.LoggingSpanCollectorImpl;
import com.github.kristofa.brave.LoggingSpanCollector;
import com.github.kristofa.brave.SpanCollector;
/**
@@ -74,7 +74,7 @@ public class SampleMessagingApplication {
@Bean
@ConditionalOnProperty(value="sample.zipkin.enabled", havingValue="false")
public SpanCollector spanCollector() {
return new LoggingSpanCollectorImpl();
return new LoggingSpanCollector();
}
}

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/java/sample/SampleRibbonApplication.java
View File

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.EnableAsync;
import com.github.kristofa.brave.LoggingSpanCollectorImpl;
import com.github.kristofa.brave.LoggingSpanCollector;
import com.github.kristofa.brave.SpanCollector;
/**
@@ -51,7 +51,7 @@ public class SampleRibbonApplication {
@Bean
@ConditionalOnProperty(value="sample.zipkin.enabled", havingValue="false")
public SpanCollector spanCollector() {
return new LoggingSpanCollectorImpl();
return new LoggingSpanCollector();
}
}

4
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleZipkinApplication.java
View File

@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.scheduling.annotation.EnableAsync;
import com.github.kristofa.brave.LoggingSpanCollectorImpl;
import com.github.kristofa.brave.LoggingSpanCollector;
import com.github.kristofa.brave.SpanCollector;
/**
@@ -51,7 +51,7 @@ public class SampleZipkinApplication {
@Bean
@ConditionalOnProperty(value="sample.zipkin.enabled", havingValue="false")
public SpanCollector spanCollector() {
return new LoggingSpanCollectorImpl();
return new LoggingSpanCollector();
}
}

6
spring-cloud-sleuth-zipkin/pom.xml
View File

@@ -49,15 +49,15 @@
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-client</artifactId>
<artifactId>brave-core</artifactId>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-impl</artifactId>
<artifactId>brave-http</artifactId>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-impl-spring</artifactId>
<artifactId>brave-core-spring</artifactId>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>

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

@@ -16,43 +16,23 @@
package org.springframework.cloud.sleuth.zipkin;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import com.github.kristofa.brave.AnnotationSubmitterConfig;
import com.github.kristofa.brave.ClientTracer;
import com.github.kristofa.brave.ClientTracerConfig;
import com.github.kristofa.brave.EndPointSubmitterConfig;
import com.github.kristofa.brave.FixedSampleRateTraceFilter;
import com.github.kristofa.brave.ServerSpanThreadBinderConfig;
import com.github.kristofa.brave.ServerTracerConfig;
import com.github.kristofa.brave.SpanCollector;
import com.github.kristofa.brave.TraceFilter;
import com.github.kristofa.brave.TraceFilters;
import com.github.kristofa.brave.client.ClientRequestInterceptor;
import com.github.kristofa.brave.client.ClientResponseInterceptor;
import com.github.kristofa.brave.client.spanfilter.SpanNameFilter;
import com.github.kristofa.brave.zipkin.ZipkinSpanCollector;
import com.google.common.base.Optional;
/**
* @author Spencer Gibb
*/
@Configuration
@EnableConfigurationProperties
@ConditionalOnClass(ServerTracerConfig.class)
@ConditionalOnClass(ZipkinSpanCollector.class)
@ConditionalOnProperty(value = "spring.sleuth.zipkin.enabled", matchIfMissing = true)
@Import({ AnnotationSubmitterConfig.class, ClientTracerConfig.class,
EndPointSubmitterConfig.class, ServerSpanThreadBinderConfig.class,
ServerTracerConfig.class })
public class ZipkinAutoConfiguration {
@Bean
@@ -67,43 +47,10 @@ public class ZipkinAutoConfiguration {
return new ZipkinProperties();
}
@Bean
public FixedSampleRateTraceFilter fixedSampleRateTraceFilter() {
return new FixedSampleRateTraceFilter(zipkinProperties().getFixedSampleRate());
}
@Bean
@ConditionalOnMissingBean
public TraceFilters traceFilters(List<TraceFilter> traceFilters) {
return new TraceFilters(traceFilters);
}
@Bean
// @ConditionalOnProperty(value = "spring.sleuth.zipkin.braveTracer.enabled", havingValue = "false")
public ZipkinSpanListener sleuthTracer(SpanCollector spanCollector) {
return new ZipkinSpanListener(spanCollector);
}
@Configuration
protected static class InterceptorConfig {
@Autowired
private ClientTracer clientTracer;
@Autowired(required = false)
private SpanNameFilter spanNameFilter;
@Bean
@ConditionalOnMissingBean
public ClientRequestInterceptor clientRequestInterceptor() {
return new ClientRequestInterceptor(this.clientTracer,
Optional.fromNullable(this.spanNameFilter));
}
@Bean
@ConditionalOnMissingBean
public ClientResponseInterceptor clientResponseInterceptor() {
return new ClientResponseInterceptor(this.clientTracer);
}
}
}