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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-10-03 12:37:41 +02:00
parent be5fa04118 ac7dd52544
commit 4109ce22be
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -18,7 +18,10 @@ package org.springframework.cloud.sleuth.instrument.web.client;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import brave.spring.web.TracingClientHttpRequestInterceptor;
import org.junit.Test;
@@ -79,8 +82,10 @@ public class TraceWebClientAutoConfigurationTests {
int traceInterceptorIndex = -1;
int myInterceptorIndex = -1;
int mySecondInterceptorIndex = -1;
Map<Class, Integer> numberOfInstances = new HashMap<>();
for (int i = 0; i < interceptors.size(); i++) {
ClientHttpRequestInterceptor interceptor = interceptors.get(i);
incrementNumberOfInstances(numberOfInstances, interceptor);
if (interceptor instanceof TracingClientHttpRequestInterceptor
|| interceptor instanceof LazyTracingClientHttpRequestInterceptor) {
traceInterceptorIndex = i;
@@ -94,6 +99,19 @@ public class TraceWebClientAutoConfigurationTests {
}
then(traceInterceptorIndex).isGreaterThanOrEqualTo(0)
.isLessThan(myInterceptorIndex).isLessThan(mySecondInterceptorIndex);
then(numberOfInstances.values())
.as("Can't have duplicate entries for interceptors")
.containsOnlyElementsOf(Collections.singletonList(1));
}
private void incrementNumberOfInstances(Map<Class, Integer> numberOfInstances, ClientHttpRequestInterceptor interceptor) {
Integer no = numberOfInstances.get(interceptor.getClass());
if (no == null) {
numberOfInstances.put(interceptor.getClass(), 1);
}
else {
numberOfInstances.put(interceptor.getClass(), no + 1);
}
}
@Configuration