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

Fixing ConcurrentModificationException

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-10-04 14:02:00 +02:00
parent d1cb4b2990
commit 7289212868
2 changed files with 2 additions and 2 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/util/ArrayListSpanAccumulator.java
View File

@@ -34,7 +34,7 @@ public class ArrayListSpanAccumulator implements SpanReporter {
public List<Span> getSpans() { public List<Span> getSpans() {
synchronized (this.spans) { synchronized (this.spans) {
return new ArrayList<>(this.spans); return this.spans;
} }
} }

2
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java
View File

@@ -113,7 +113,7 @@ public class WebClientTests {
then(getHeader(response, Span.TRACE_ID_NAME)).isNull(); then(getHeader(response, Span.TRACE_ID_NAME)).isNull();
then(getHeader(response, Span.SPAN_ID_NAME)).isNull(); then(getHeader(response, Span.SPAN_ID_NAME)).isNull();
then(this.listener.getSpans()).isNotEmpty(); then(this.listener.getSpans()).isNotEmpty();
Optional<Span> noTraceSpan = this.listener.getSpans().stream().filter(span -> Optional<Span> noTraceSpan = new ArrayList<>(this.listener.getSpans()).stream().filter(span ->
"http:/notrace".equals(span.getName()) && !span.tags().isEmpty()).findFirst(); "http:/notrace".equals(span.getName()) && !span.tags().isEmpty()).findFirst();
then(noTraceSpan.isPresent()).isTrue(); then(noTraceSpan.isPresent()).isTrue();
// TODO: matches cause there is an issue with Feign not providing the full URL at the interceptor level // TODO: matches cause there is an issue with Feign not providing the full URL at the interceptor level