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

Fixed the build

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-02-15 17:51:06 +01:00
parent 64b5cb6072
commit e50005e5f6
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceFilter.java
View File

@@ -253,9 +253,9 @@ public class TraceFilter extends GenericFilterBean {
}
if (!httpStatusSuccessful(response) && !hasErrorController()) {
tracer().close(span);
}
if (exception == null || !hasErrorController()) {
} else if (exception == null || !hasErrorController()) {
clearTraceAttribute(request);
tracer().close(span);
}
} else if (tracer().isTracing()) {
if (log.isDebugEnabled()) {

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

@@ -25,6 +25,7 @@ import org.springframework.cloud.sleuth.assertions.ListOfSpans;
import org.springframework.cloud.sleuth.instrument.DefaultTestAutoConfiguration;
import org.springframework.cloud.sleuth.instrument.web.common.AbstractMvcIntegrationTest;
import org.springframework.cloud.sleuth.sampler.AlwaysSampler;
import org.springframework.cloud.sleuth.trace.TestSpanContextHolder;
import org.springframework.cloud.sleuth.util.ArrayListSpanAccumulator;
import org.springframework.cloud.sleuth.util.ExceptionUtils;
import org.springframework.context.annotation.Bean;
@@ -74,6 +75,7 @@ public class TraceFilterIntegrationTests extends AbstractMvcIntegrationTest {
.hasLoggedAnEvent(Span.SERVER_SEND);
then(ExceptionUtils.getLastException()).isNull();
then(new ListOfSpans(this.spanAccumulator.getSpans())).hasServerSideSpansInProperOrder();
then(this.tracer.getCurrentSpan()).isNull();
}
@Test
@@ -85,6 +87,7 @@ public class TraceFilterIntegrationTests extends AbstractMvcIntegrationTest {
// we don't want to respond with any tracing data
then(notSampledHeaderIsPresent(mvcResult)).isEqualTo(false);
then(ExceptionUtils.getLastException()).isNull();
then(this.tracer.getCurrentSpan()).isNull();
}
@Test
@@ -95,6 +98,7 @@ public class TraceFilterIntegrationTests extends AbstractMvcIntegrationTest {
MvcResult mvcResult = whenSentPingWithTraceId(expectedTraceId);
then(ExceptionUtils.getLastException()).isNull();
then(this.tracer.getCurrentSpan()).isNull();
}
@Test
@@ -105,6 +109,7 @@ public class TraceFilterIntegrationTests extends AbstractMvcIntegrationTest {
then(MDC.getCopyOfContextMap()).isEmpty();
then(ExceptionUtils.getLastException()).isNull();
then(this.tracer.getCurrentSpan()).isNull();
}
@Test
@@ -135,6 +140,7 @@ public class TraceFilterIntegrationTests extends AbstractMvcIntegrationTest {
then(taggedSpan.get()).hasATag("mvc.controller.class", "TestController");
then(ExceptionUtils.getLastException()).isNull();
then(new ListOfSpans(this.spanAccumulator.getSpans())).hasServerSideSpansInProperOrder();
then(this.tracer.getCurrentSpan()).isNull();
}
@Test
@@ -163,6 +169,7 @@ public class TraceFilterIntegrationTests extends AbstractMvcIntegrationTest {
// the ErrorController would close the span
then(this.tracer.getCurrentSpan()).isNotNull();
this.tracer.close(this.tracer.getCurrentSpan());
then(this.tracer.getCurrentSpan()).isNull();
then(this.spanAccumulator.getSpans()).hasSize(1);
then(this.spanAccumulator.getSpans().get(0).tags())
.containsKey("error");
@@ -192,6 +199,7 @@ public class TraceFilterIntegrationTests extends AbstractMvcIntegrationTest {
then(ExceptionUtils.getLastException()).isNull();
then(mvcResult.getResponse().getHeader("ZIPKIN-TRACE-ID")).isEqualTo(Span.idToHex(expectedTraceId));
then(new ListOfSpans(this.spanAccumulator.getSpans())).hasASpanWithTagEqualTo("custom", "tag");
then(this.tracer.getCurrentSpan()).isNull();
}
@Override

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

@@ -17,7 +17,6 @@
package org.springframework.cloud.sleuth.instrument.web;
import java.util.ArrayList;
import java.util.Optional;
import java.util.Random;
import java.util.regex.Pattern;