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

Trace IDs of sessions created downstream of trace filter

Browse Source 
Closes gh-11717
This commit is contained in:
Andy Wilkinson
2018-01-29 15:24:24 +00:00
parent 7ae39eaebf
commit 9da6ddb253
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
package org.springframework.boot.actuate.trace;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.security.Principal;
@@ -28,6 +27,9 @@ import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
@@ -105,19 +107,16 @@ public class WebRequestTraceFilterTests {
MockHttpServletResponse response = new MockHttpServletResponse();
response.addHeader("Content-Type", "application/json");
response.addHeader("Set-Cookie", "a=b");
this.filter.doFilterInternal(request, response, new FilterChain() {
this.filter.doFilterInternal(request, response,
new MockFilterChain(new HttpServlet() {
@Override
public void doFilter(ServletRequest request, ServletResponse response)
throws IOException, ServletException {
BufferedReader bufferedReader = request.getReader();
while (bufferedReader.readLine() != null) {
// read the contents as normal (forces cache to fill up)
}
response.getWriter().println("Goodbye, World!");
}
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getSession(true);
}
});
}));
assertThat(this.repository.findAll()).hasSize(1);
Map<String, Object> trace = this.repository.findAll().iterator().next().getInfo();
Map<String, Object> map = (Map<String, Object>) trace.get("headers");
@@ -136,6 +135,7 @@ public class WebRequestTraceFilterTests {
assertThat(trace.get("authType")).isEqualTo("authType");
assertThat(map.get("request").toString())
.isEqualTo("{Accept=application/json, Cookie=testCookie=testValue;}");
assertThat(trace).containsKey("sessionId");
}
@Test