Skip to content
This repository was archived by the owner on Feb 20, 2023. It is now read-only.

[FEATURE] Add provision to show HTTP request body in stageminitor span #489

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FEATURE] Add provision to show HTTP request body in stageminitor span #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion ...emonitor-web-servlet/src/main/java/org/stagemonitor/web/servlet/MonitoredHttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
import org.stagemonitor.web.servlet.useragent.UserAgentParser;
import org.stagemonitor.web.servlet.widget.WidgetAjaxSpanReporter;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.Principal;
Expand All @@ -30,6 +34,7 @@
import java.util.concurrent.Future;
import java.util.concurrent.RejectedExecutionException;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
Expand Down Expand Up @@ -100,10 +105,13 @@ public Span createSpan() {
Tags.PEER_PORT.set(span, httpServletRequest.getRemotePort());
span.setTag("method", httpServletRequest.getMethod());
span.setTag("http.referring_site", getReferringSite());

if("POST".equals(httpServletRequest.getMethod()) && "application/json".equals(httpServletRequest.getContentType())) {
addHTTPBody(span) ;
}
if (servletPlugin.isCollectHttpHeaders()) {
SpanUtils.setHttpHeaders(span, getHeaders(httpServletRequest));
}

SpanContextInformation info = SpanContextInformation.forSpan(span);
info.addRequestAttribute(CONNECTION_ID_ATTRIBUTE, connectionId);
info.addRequestAttribute(MONITORED_HTTP_REQUEST_ATTRIBUTE, this);
Expand All @@ -112,6 +120,14 @@ public Span createSpan() {
}
return span;
}
private void addHTTPBody(Span span){
try {
String requestBody = httpServletRequest.getReader().lines().collect(Collectors.joining());
span.setTag("http.body", requestBody);
}catch (IOException e) {
throw new RuntimeException(e);
}
}

private void parseUserAgentAsync(final Span span, SpanContextInformation info) {
try {
Expand Down
8 changes: 6 additions & 2 deletions ...b-servlet/src/main/java/org/stagemonitor/web/servlet/filter/HttpRequestMonitorFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.stagemonitor.web.servlet.MonitoredHttpRequest;
import org.stagemonitor.web.servlet.MonitoredHttpRequestFactory;
import org.stagemonitor.web.servlet.ServletPlugin;
import org.stagemonitor.web.servlet.util.CachedBodyHttpServletRequest;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down Expand Up @@ -80,15 +81,18 @@ public void initInternal(FilterConfig filterConfig) throws ServletException {
@Override
public final void doFilterInternal(final HttpServletRequest request, final HttpServletResponse response, final FilterChain filterChain)
throws IOException, ServletException {
CachedBodyHttpServletRequest cachedBodyHttpServletRequest =
new CachedBodyHttpServletRequest(request);
if (corePlugin.isStagemonitorActive() && !isInternalRequest(request) &&
request.getDispatcherType() == REQUEST) {
try {
doMonitor(request, response, filterChain);

doMonitor(cachedBodyHttpServletRequest, response, filterChain);
} finally {
spanWrapperCaptor.clear();
}
} else {
filterChain.doFilter(request, response);
filterChain.doFilter(cachedBodyHttpServletRequest, response);
}
}

Expand Down
51 changes: 51 additions & 0 deletions ...servlet/src/main/java/org/stagemonitor/web/servlet/util/CachedBodyHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package org.stagemonitor.web.servlet.util;

import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;

import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;

import org.springframework.util.StreamUtils;

public class CachedBodyHttpServletRequest extends HttpServletRequestWrapper {

private byte[] cachedBody;

public CachedBodyHttpServletRequest(HttpServletRequest request) throws IOException {
super(request);
InputStream requestInputStream = request.getInputStream();
this.cachedBody = StreamUtils.copyToByteArray(requestInputStream);
}

@Override
public ServletInputStream getInputStream() throws IOException {
return new CachedBodyServletInputStream(this.cachedBody);
}

@Override
public BufferedReader getReader() throws IOException {
// Create a reader from cachedContent
// and return it
ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(this.cachedBody);
return new BufferedReader(new InputStreamReader(byteArrayInputStream));
}
}

class CachedBodyServletInputStream extends ServletInputStream {

private InputStream cachedBodyInputStream;

public CachedBodyServletInputStream(byte[] cachedBody) {
this.cachedBodyInputStream = new ByteArrayInputStream(cachedBody);
}

@Override
public int read() throws IOException {
return cachedBodyInputStream.read();
}
}