Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Adding sessionId to the MDC logging to make debugging simpler

Browse Source
This commit is contained in:
Arpit Mohan 2020-03-04 18:14:11 +05:30
parent dfdd44674b
commit f53a444635
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/server/appsmith-server/src/main/java/com/appsmith/server/filters/MDCFilter.java
View File

@ -29,6 +29,8 @@ public class MDCFilter implements WebFilter {
private static final String MDC_HEADER_PREFIX = "X-MDC-";
private static final String REQUEST_ID_HEADER = "X-REQUEST-ID";
private static final String REQUEST_ID_LOG = "requestId";
private static final String SESSION_ID_LOG = "sessionId";
private static final String SESSION = "SESSION";
@Override
public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
@ -49,6 +51,7 @@ public class MDCFilter implements WebFilter {
.collect(toMap(v -> v.getKey().substring((MDC_HEADER_PREFIX.length())), Map.Entry::getValue));
contextMap.put(REQUEST_ID_LOG, getOrCreateRequestId(request));
contextMap.put(SESSION_ID_LOG, getSessionId(request));
// Set the MDC context here for regular non-reactive logs
MDC.setContextMap(contextMap);
@ -77,6 +80,14 @@ public class MDCFilter implements WebFilter {
}).then();
}
private String getSessionId(final ServerHttpRequest request) {
if (request.getCookies().get(SESSION) != null && !request.getCookies().get(SESSION).isEmpty()) {
return request.getCookies().get(SESSION).get(0).getValue();
}
return "";
}
private String getOrCreateRequestId(final ServerHttpRequest request) {
if (!request.getHeaders().containsKey(REQUEST_ID_HEADER)) {
request.mutate().header(REQUEST_ID_HEADER, UUID.randomUUID().toString()).build();