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

Updates to Brave 5

Browse Source
This commit is contained in:
Adrian Cole
2018-05-22 16:55:13 +09:00
committed by Adrian Cole
parent c801228015
commit 70ff3afc7b
5 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -272,7 +272,7 @@
<spring-cloud-stream.version>Elmhurst.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-netflix.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
<brave.version>4.19.2</brave.version>
<brave.version>5.0.0</brave.version>
<spring-security-boot-autoconfigure.version>2.0.0.RELEASE</spring-security-boot-autoconfigure.version>
</properties>

8
spring-cloud-sleuth-core/pom.xml
View File

@@ -209,14 +209,6 @@
<artifactId>spring-security-oauth2-autoconfigure</artifactId>
<optional>true</optional>
</dependency>
<!-- to compile against Span.remoteEndpoint(zipkin.Span) -->
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin</artifactId>
<!-- misaligned intentionally https://github.com/spring-projects/spring-boot/issues/10778-->
<version>2.8.0</version>
<optional>true</optional>
</dependency>
<!-- BRAVE -->
<dependency>
<groupId>org.springframework.boot</groupId>

4
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SleuthHttpClientParserTests.java
View File

@@ -90,8 +90,4 @@ class TestSpanCustomizer implements SpanCustomizer {
@Override public SpanCustomizer annotate(String value) {
return this;
}
@Override public SpanCustomizer annotate(long timestamp, String value) {
return this;
}
}

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

@@ -30,7 +30,7 @@
<name>spring-cloud-sleuth-dependencies</name>
<description>Spring Cloud Sleuth Dependencies</description>
<properties>
<brave.opentracing.version>0.30.3</brave.opentracing.version>
<brave.opentracing.version>0.31.0</brave.opentracing.version>
</properties>
<dependencyManagement>
<dependencies>

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

@@ -73,7 +73,7 @@
<dependency>
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin</artifactId>
<version>2.8.1</version>
<version>2.8.4</version>
</dependency>
</dependencies>
</dependencyManagement>