Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: log http response body in debug mode #95

Merged
merged 6 commits into from Sep 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/io/odpf/firehose/metrics/Instrumentation.java
Expand Up @@ -75,6 +75,9 @@ public void logError(String template, Object... t) {
logger.error(template, t);
}

public boolean isDebugEnabled() {
return logger.isDebugEnabled();
}
// ============== FILTER MESSAGES ==============

/**
Expand Down
22 changes: 22 additions & 0 deletions src/main/java/io/odpf/firehose/sink/common/AbstractHttpSink.java
Expand Up @@ -14,12 +14,17 @@
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.util.EntityUtils;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import static io.odpf.firehose.metrics.Metrics.SINK_HTTP_RESPONSE_CODE_TOTAL;

Expand Down Expand Up @@ -49,6 +54,9 @@ public List<Message> execute() throws Exception {
response = httpClient.execute(httpRequest);
List<String> contentStringList = null;
getInstrumentation().logInfo("Response Status: {}", statusCode(response));
if (shouldLogResponse(response)) {
printResponse(response);
}
if (shouldLogRequest(response)) {
contentStringList = readContent(httpRequest);
printRequest(httpRequest, contentStringList);
Expand Down Expand Up @@ -88,6 +96,10 @@ private boolean shouldLogRequest(HttpResponse response) {
return response == null || getRequestLogStatusCodeRanges().containsKey(response.getStatusLine().getStatusCode());
}

private boolean shouldLogResponse(HttpResponse response) {
return getInstrumentation().isDebugEnabled() && response != null;
}

private boolean shouldRetry(HttpResponse response) {
return response == null || getRetryStatusCodeRanges().containsKey(response.getStatusLine().getStatusCode());
}
Expand Down Expand Up @@ -119,6 +131,16 @@ private void printRequest(HttpEntityEnclosingRequestBase httpRequest, List<Strin
getInstrumentation().logInfo(entireRequest);
}

private void printResponse(HttpResponse httpResponse) throws IOException {
try (InputStream inputStream = httpResponse.getEntity().getContent()) {
String responseBody = String.format("Response Body: %s",
Strings.join(new BufferedReader(new InputStreamReader(
inputStream,
StandardCharsets.UTF_8)).lines().collect(Collectors.toList()), "\n"));
getInstrumentation().logDebug(responseBody);
}
}

protected abstract List<String> readContent(HttpEntityEnclosingRequestBase httpRequest) throws IOException;

protected abstract void captureMessageDropCount(HttpResponse response, List<String> contentString) throws IOException;
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/io/odpf/firehose/sink/http/HttpSinkTest.java
Expand Up @@ -407,4 +407,26 @@ public void shouldCaptureResponseStatusCount() throws Exception {

verify(instrumentation, times(1)).captureCountWithTags("firehose_sink_http_response_code_total", 1, "status_code=" + statusLine.getStatusCode(), "url=" + uri.getPath());
}

@Test
public void shouldLogResponseBodyWhenDebugIsEnabledAndNonNullResponse() throws Exception {
when(response.getStatusLine()).thenReturn(statusLine);
when(statusLine.getStatusCode()).thenReturn(200);

List<HttpEntityEnclosingRequestBase> httpRequests = Collections.singletonList(httpPut);

when(httpPut.getMethod()).thenReturn("PUT");
when(httpPut.getURI()).thenReturn(new URI("http://dummy.com"));
when(httpClient.execute(httpPut)).thenReturn(response);
when(response.getEntity()).thenReturn(httpEntity);
when(httpEntity.getContent()).thenReturn(new StringInputStream("[{\"key\":\"value1\"},{\"key\":\"value2\"}]"));
when(request.build(messages)).thenReturn(httpRequests);
when(instrumentation.isDebugEnabled()).thenReturn(true);

HttpSink httpSink = new HttpSink(instrumentation, request, httpClient, stencilClient,
retryStatusCodeRange, requestLogStatusCodeRanges);
httpSink.prepare(messages);
httpSink.execute();
verify(instrumentation, times(1)).logDebug("Response Body: [{\"key\":\"value1\"},{\"key\":\"value2\"}]");
}
}