Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make handler Object available to WebMvcTagsProvider.httpRequestTags

Browse Source 
Closes gh-11088
This commit is contained in:
Andy Wilkinson
2017-11-20 13:18:48 +00:00
parent 417c98304d
commit 331c7a1c56
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/DefaultWebMvcTagsProvider.java
View File

@@ -45,12 +45,13 @@ public class DefaultWebMvcTagsProvider implements WebMvcTagsProvider {
/**
* Supplies default tags to the Web MVC server programming model.
* @param request The HTTP request.
* @param handler the Spring MVC handler for the request
* @param response The HTTP response.
* @param ex The current exception, if any
* @return A set of tags added to every Spring MVC HTTP request.
*/
@Override
public Iterable<Tag> httpRequestTags(HttpServletRequest request,
public Iterable<Tag> httpRequestTags(HttpServletRequest request, Object handler,
HttpServletResponse response, Throwable ex) {
return Arrays.asList(WebMvcTags.method(request),
WebMvcTags.uri(request, response), WebMvcTags.exception(ex),

9
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcMetrics.java
View File

@@ -45,6 +45,7 @@ import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.ParameterizableViewController;
import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
/**
@@ -144,16 +145,18 @@ public class WebMvcMetrics {
Throwable thrown) {
// record Timer values
timed(handler).forEach((config) -> {
Timer.Builder builder = getTimerBuilder(request, response, thrown, config);
Timer.Builder builder = getTimerBuilder(request, handler, response, thrown,
config);
long amount = endTime - startTime;
builder.register(this.registry).record(amount, TimeUnit.NANOSECONDS);
});
}
private Timer.Builder getTimerBuilder(HttpServletRequest request,
private Timer.Builder getTimerBuilder(HttpServletRequest request, Object handler,
HttpServletResponse response, Throwable thrown, TimerConfig config) {
Timer.Builder builder = Timer.builder(config.getName())
.tags(this.tagsProvider.httpRequestTags(request, response, thrown))
.tags(this.tagsProvider.httpRequestTags(request, handler, response,
thrown))
.tags(config.getExtraTags()).description("Timer of servlet request")
.publishPercentileHistogram(config.isHistogram());
if (config.getPercentiles().length > 0) {

5
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/servlet/WebMvcTagsProvider.java
View File

@@ -41,13 +41,14 @@ public interface WebMvcTagsProvider {
/**
* Provides tags to be associated with metrics for the given {@code request} and
* {@code response} exchange.
* {@code response} exchange. The request was handled by the given {@code handler}.
* @param request the request
* @param handler the handler
* @param response the response
* @param ex the current exception, if any
* @return tags to associate with metrics for the request and response exchange
*/
Iterable<Tag> httpRequestTags(HttpServletRequest request,
Iterable<Tag> httpRequestTags(HttpServletRequest request, Object handler,
HttpServletResponse response, Throwable ex);
}