root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Add response headers to Trace

This commit is contained in:
Dave Syer 2013-09-08 14:49:03 +01:00
parent 7a6131c466
commit ba4a81510b
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java
View File

@ -90,7 +90,6 @@ public class WebRequestTraceFilter implements Filter, Ordered {
HttpServletResponse response = (HttpServletResponse) res; HttpServletResponse response = (HttpServletResponse) res;
Map<String, Object> trace = getTrace(request); Map<String, Object> trace = getTrace(request);
this.traceRepository.add(trace);
if (this.logger.isTraceEnabled()) { if (this.logger.isTraceEnabled()) {
this.logger.trace("Processing request " + request.getMethod() + " " this.logger.trace("Processing request " + request.getMethod() + " "
+ request.getRequestURI()); + request.getRequestURI());
@ -108,12 +107,29 @@ public class WebRequestTraceFilter implements Filter, Ordered {
} }
} }
chain.doFilter(request, response); try {
chain.doFilter(request, response);
}
finally {
enhanceTrace(trace, response);
this.traceRepository.add(trace);
}
}
protected void enhanceTrace(Map<String, Object> trace, HttpServletResponse response) {
Map<String, String> headers = new LinkedHashMap<String, String>();
for (String header : response.getHeaderNames()) {
String value = response.getHeader(header);
headers.put(header, value);
}
@SuppressWarnings("unchecked")
Map<String, Object> allHeaders = (Map<String, Object>) trace.get("headers");
allHeaders.put("response", headers);
} }
protected Map<String, Object> getTrace(HttpServletRequest request) { protected Map<String, Object> getTrace(HttpServletRequest request) {
Map<String, Object> map = new LinkedHashMap<String, Object>(); Map<String, Object> headers = new LinkedHashMap<String, Object>();
Enumeration<String> names = request.getHeaderNames(); Enumeration<String> names = request.getHeaderNames();
while (names.hasMoreElements()) { while (names.hasMoreElements()) {
@ -126,13 +142,15 @@ public class WebRequestTraceFilter implements Filter, Ordered {
else if (values.isEmpty()) { else if (values.isEmpty()) {
value = ""; value = "";
} }
map.put(name, value); headers.put(name, value);
} }
Map<String, Object> trace = new LinkedHashMap<String, Object>(); Map<String, Object> trace = new LinkedHashMap<String, Object>();
Map<String, Object> allHeaders = new LinkedHashMap<String, Object>();
allHeaders.put("request", headers);
trace.put("method", request.getMethod()); trace.put("method", request.getMethod());
trace.put("path", request.getRequestURI()); trace.put("path", request.getRequestURI());
trace.put("headers", map); trace.put("headers", allHeaders);
return trace; return trace;
} }

19
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java
View File

@ -19,9 +19,8 @@ package org.springframework.boot.actuate.trace;
import java.util.Map; import java.util.Map;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.actuate.trace.InMemoryTraceRepository;
import org.springframework.boot.actuate.trace.WebRequestTraceFilter;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -42,6 +41,20 @@ public class WebRequestTraceFilterTests {
Map<String, Object> trace = this.filter.getTrace(request); Map<String, Object> trace = this.filter.getTrace(request);
assertEquals("GET", trace.get("method")); assertEquals("GET", trace.get("method"));
assertEquals("/foo", trace.get("path")); assertEquals("/foo", trace.get("path"));
assertEquals("{Accept=application/json}", trace.get("headers").toString()); @SuppressWarnings("unchecked")
Map<String, Object> map = (Map<String, Object>) trace.get("headers");
assertEquals("{Accept=application/json}", map.get("request").toString());
}
@Test
public void filterDumpsResponse() {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
MockHttpServletResponse response = new MockHttpServletResponse();
response.addHeader("Content-Type", "application/json");
Map<String, Object> trace = this.filter.getTrace(request);
this.filter.enhanceTrace(trace, response);
@SuppressWarnings("unchecked")
Map<String, Object> map = (Map<String, Object>) trace.get("headers");
assertEquals("{Content-Type=application/json}", map.get("response").toString());
} }
} }