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

Fixed tests for snapshot brave

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-03-02 09:20:17 +01:00
parent 237593224a
commit 5676f3369a
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -459,14 +459,15 @@ public class TraceFilterTests {
filter.doFilter(this.request, this.response, this.filterChain);
then(Tracing.current().tracer().currentSpan()).isNull();
// Brave doesn't work like Sleuth. No trace will be created for an invalid span
// where invalid means that there is no trace id
then(this.reporter.getSpans()).isEmpty();
// It is ok to go without a trace ID, if sampling or debug is set
then(this.reporter.getSpans())
.hasSize(1)
.extracting("id").isNotEqualTo(SpanUtil.idToHex(10L));
}
@SuppressWarnings("Duplicates")
@Test
public void samplesWhenDebugFlagIsSetTo1AndTraceIdIsAlsoSet() throws Exception {
public void usesSamplingMechanismWhenIncomingTraceIsMalformed() throws Exception {
this.request = builder()
.header(SPAN_FLAGS, 1)
.header(TRACE_ID_NAME, SpanUtil.idToHex(10L))
@@ -476,11 +477,7 @@ public class TraceFilterTests {
filter.doFilter(this.request, this.response, this.filterChain);
then(Tracing.current().tracer().currentSpan()).isNull();
then(this.reporter.getSpans())
.hasSize(1);
// Brave creates a new trace if there was no span id
then(this.reporter.getSpans().get(0).traceId())
.isNotEqualTo(SpanUtil.idToHex(10L));
then(this.reporter.getSpans()).isEmpty();
}
// #668