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

Merge pull request #264 from spring-cloud/zipkin-16

Browse Source 
Updates to zipkin 0.16
This commit is contained in:
Adrian Cole
2016-05-03 18:49:42 +08:00
parent 4a439a1a21 d454641f79
commit 2450a0fd7e
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<aspectj.version>1.8.4</aspectj.version>
<zipkin-java.version>0.15.1</zipkin-java.version>
<zipkin-java.version>0.16.1</zipkin-java.version>
<zipkin-ui.version>1.39.8</zipkin-ui.version>
</properties>
<dependencyManagement>

4
spring-cloud-sleuth-samples/pom.xml
View File

@@ -59,12 +59,12 @@
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin</artifactId>
<version>0.15.1</version>
<version>0.16.1</version>
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-server</artifactId>
<version>0.15.1</version>
<version>0.16.1</version>
</dependency>
</dependencies>
</dependencyManagement>

14
spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java
View File

@@ -10,6 +10,7 @@ import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -37,6 +38,7 @@ import zipkin.Annotation;
import zipkin.AsyncSpanConsumer;
import zipkin.BinaryAnnotation;
import zipkin.BinaryAnnotation.Type;
import zipkin.CollectorMetrics;
import zipkin.CollectorSampler;
import zipkin.Endpoint;
import zipkin.Span.Builder;
@@ -63,8 +65,9 @@ public class ZipkinMessageListener {
/** lazy so transient storage errors don't crash bootstrap */
@Lazy
@Autowired
ZipkinMessageListener(StorageComponent storage, CollectorSampler sampler) {
this.consumer = storage.asyncSpanConsumer(sampler);
ZipkinMessageListener(StorageComponent storage, CollectorSampler sampler,
CollectorMetrics metrics) {
this.consumer = storage.asyncSpanConsumer(sampler, metrics);
}
@ServiceActivator(inputChannel = SleuthSink.INPUT)
@@ -145,10 +148,17 @@ public class ZipkinMessageListener {
float sampleRate = 1.0f;
@Bean
@ConditionalOnMissingBean
CollectorSampler collectorSampler() {
return CollectorSampler.create(this.sampleRate);
}
@Bean
@ConditionalOnMissingBean
CollectorMetrics collectorMetrics() {
return CollectorMetrics.NOOP_METRICS;
}
@Bean
@ConfigurationProperties(DataSourceProperties.PREFIX)
public DataSource dataSource() {