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

Assuming 500 status code when an exception was thrown in the controller; fixes gh-1880

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-03-30 14:06:48 +02:00
parent dad3d80408
commit bd47e12614
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import reactor.util.context.Context;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.core.Ordered;
import org.springframework.http.HttpStatus;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.web.method.HandlerMethod;
@@ -422,9 +423,11 @@ public final class TraceWebFilter implements WebFilter, Ordered {
@Override
public int statusCode() {
if (this.throwable != null
&& this.throwable instanceof ResponseStatusException) {
return ((ResponseStatusException) this.throwable).getStatus().value();
if (!this.delegate.isCommitted() && this.throwable != null) {
if (this.throwable instanceof ResponseStatusException) {
return ((ResponseStatusException) this.throwable).getStatus().value();
}
return HttpStatus.INTERNAL_SERVER_ERROR.value();
}
return delegate.getStatusCode() != null ? delegate.getStatusCode().value()
: 0;

20
tests/spring-cloud-sleuth-instrumentation-webflux-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java
View File

@@ -88,6 +88,12 @@ public class TraceWebFluxTests {
thenSpanWith404StatusCodeWasReported(spans, response);
spans.clear();
// when
response = whenRequestIsSent(port, "/exception");
// then
thenSpanWithExceptionWasReported(spans, response);
spans.clear();
// when
ClientResponse nonSampledResponse = whenNonSampledRequestIsSent(port);
// then
@@ -151,6 +157,15 @@ public class TraceWebFluxTests {
value -> then(value).isEqualTo("404"));
}
private void thenSpanWithExceptionWasReported(TestSpanHandler spans,
ClientResponse response) {
Awaitility.await()
.untilAsserted(() -> then(response.statusCode().value()).isEqualTo(500));
then(spans).hasSize(1);
then(spans.get(0).tags()).hasEntrySatisfying("http.status_code",
value -> then(value).isEqualTo("500"));
}
private void thenNoSpanWasReported(TestSpanHandler spans, ClientResponse response,
Controller2 controller2) {
Awaitility.await().untilAsserted(() -> {
@@ -252,6 +267,11 @@ public class TraceWebFluxTests {
return Flux.just(sampled.toString());
}
@GetMapping("/exception")
public Flux<Void> exception() {
throw new RuntimeException("Exception");
}
}
}