Skip to content

Improved network client logging to include request id #312

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.

Sign up for GitHub

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

Merged
DenverM80 merged 1 commit into from
Aug 2, 2016
Merged

Improved network client logging to include request id #312

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
13 changes: 11 additions & 2 deletions ds3-sdk/src/main/java/com/spectralogic/ds3client/networking/NetworkClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public class NetworkClientImpl implements NetworkClient {
final static private String CONTENT_CRC32C = "Content-CRC32C";
final static private int MAX_CONNECTION_PER_ROUTE = 50;
final static private int MAX_CONNECTION_TOTAL = 100;
final static private String REQUEST_ID_HEADER = "x-amz-request-id";

final private ConnectionDetails connectionDetails;

Expand Down Expand Up @@ -187,13 +188,21 @@ public WebResponse getResponse(final Ds3Request request) throws IOException {
int redirectCount = 0;
do {
final CloseableHttpResponse response = requestExecutor.execute();
String requestId = "Unknown";
if (response.containsHeader(REQUEST_ID_HEADER)) {
requestId = response.getFirstHeader(REQUEST_ID_HEADER).getValue();
}
if (response.getStatusLine().getStatusCode() == HttpStatus.SC_TEMPORARY_REDIRECT) {
redirectCount++;
LOG.info("Performing retry - attempt: {} for request #{}",
redirectCount,
requestId);
response.close();
LOG.info("Performing retry - attempt: {}", redirectCount);
}
else {
LOG.info("Got response from server");
LOG.info("Server responded with {} for request #{}",
response.getStatusLine().getStatusCode(),
requestId);
return new WebResponseImpl(response);
}
} while (redirectCount < this.connectionDetails.getRetries());
Expand Down