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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2019-10-04 05:29:40 +00:00
parent 9361cf2017
commit 2a046e0a0b
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/pom.xml
View File

@@ -33,7 +33,7 @@
<sonar.skip>true</sonar.skip>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<spring-boot.version>2.2.0.BUILD-SNAPSHOT</spring-boot.version>
<spring-boot.version>2.2.0.RC1</spring-boot.version>
<brave.version>5.8.0</brave.version>
</properties>

3
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
View File

@@ -237,7 +237,8 @@ class RestTemplateInterceptorInjector {
private boolean hasTraceInterceptor(RestTemplate restTemplate) {
for (ClientHttpRequestInterceptor interceptor : restTemplate.getInterceptors()) {
if (interceptor instanceof TracingClientHttpRequestInterceptor || interceptor instanceof LazyTracingClientHttpRequestInterceptor) {
if (interceptor instanceof TracingClientHttpRequestInterceptor
|| interceptor instanceof LazyTracingClientHttpRequestInterceptor) {
return true;
}
}

3
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java
View File

@@ -104,7 +104,8 @@ public class TraceWebClientAutoConfigurationTests {
.containsOnlyElementsOf(Collections.singletonList(1));
}
private void incrementNumberOfInstances(Map<Class, Integer> numberOfInstances, ClientHttpRequestInterceptor interceptor) {
private void incrementNumberOfInstances(Map<Class, Integer> numberOfInstances,
ClientHttpRequestInterceptor interceptor) {
Integer no = numberOfInstances.get(interceptor.getClass());
if (no == null) {
numberOfInstances.put(interceptor.getClass(), 1);