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

Ensure websockets 1xx response is not treated as an error

Browse Source
This commit is contained in:
Dave Syer
2016-11-15 11:29:19 +00:00
committed by Marcin Grzejszczak
parent 06ab758d69
commit ea9553cef7
2 changed files with 4 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/instrument/web/TraceFilter.java
View File

@@ -251,7 +251,7 @@ public class TraceFilter extends GenericFilterBean {
return false;
}
HttpStatus httpStatus = HttpStatus.valueOf(response.getStatus());
return httpStatus.is2xxSuccessful() || httpStatus.is3xxRedirection();
return httpStatus.is1xxInformational() || httpStatus.is2xxSuccessful() || httpStatus.is3xxRedirection();
}
private Span getSpanFromAttribute(HttpServletRequest request) {

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTracer.java
View File

@@ -140,7 +140,9 @@ public class DefaultTracer implements Tracer {
}
SpanContextHolder.close(new SpanContextHolder.SpanFunction() {
@Override public void apply(Span span) {
DefaultTracer.this.spanLogger.logStoppedSpan(savedSpan, span);
if (span!=null) {
DefaultTracer.this.spanLogger.logStoppedSpan(savedSpan, span);
}
}
});
}