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

Added tags for the server side spans

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-07-11 17:47:24 +02:00
parent db98d82b0f
commit e1cf6b7777
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package org.springframework.cloud.sleuth.instrument.web;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Optional;
import java.util.regex.Pattern;
@@ -19,6 +20,8 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.util.StringUtils;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.reactive.HandlerMapping;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import org.springframework.web.server.WebFilterChain;
@@ -64,7 +67,7 @@ public class TraceWebFilter implements WebFilter, Ordered {
this.skipPattern = skipPattern;
}
@Override public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
@Override public Mono<Void> filter(final ServerWebExchange exchange, WebFilterChain chain) {
ServerHttpRequest request = exchange.getRequest();
ServerHttpResponse response = exchange.getResponse();
String uri = request.getPath().pathWithinApplication().value();
@@ -82,7 +85,35 @@ public class TraceWebFilter implements WebFilter, Ordered {
}).doOnError(t -> {
errorParser().parseErrorTags(tracer().getCurrentSpan(), t);
addResponseTags(response, t);
}).doFinally(t -> detachOrCloseSpans(span)));
}).doFinally(t -> {
HandlerMethod handlerMethod = exchange.getAttribute(HandlerMapping.BEST_MATCHING_HANDLER_ATTRIBUTE);
addClassMethodTag(handlerMethod, span);
addClassNameTag(handlerMethod, span);
detachOrCloseSpans(span);
}));
}
private void addClassMethodTag(Object handler, Span span) {
if (handler instanceof HandlerMethod) {
String methodName = ((HandlerMethod) handler).getMethod().getName();
tracer().addTag(traceKeys().getMvc().getControllerMethod(), methodName);
if (log.isDebugEnabled()) {
log.debug("Adding a method tag with value [" + methodName + "] to a span " + span);
}
}
}
private void addClassNameTag(Object handler, Span span) {
String className;
if (handler instanceof HandlerMethod) {
className = ((HandlerMethod) handler).getBeanType().getSimpleName();
} else {
className = handler.getClass().getSimpleName();
}
if (log.isDebugEnabled()) {
log.debug("Adding a class tag with value [" + className + "] to a span " + span);
}
tracer().addTag(traceKeys().getMvc().getControllerClass(), className);
}
private String sampledHeader(ServerHttpRequest request) {

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

@@ -59,7 +59,9 @@ public class TraceWebFluxTests {
.hasASpanWithLogEqualTo(Span.CLIENT_SEND)
.hasASpanWithLogEqualTo(Span.SERVER_RECV)
.hasASpanWithLogEqualTo(Span.SERVER_SEND)
.hasASpanWithLogEqualTo(Span.CLIENT_RECV);
.hasASpanWithLogEqualTo(Span.CLIENT_RECV)
.hasASpanWithTagEqualTo("mvc.controller.method", "successful")
.hasASpanWithTagEqualTo("mvc.controller.class", "Controller2");
});
} finally {
context.getBean(Tracer.class).close(span);