Skip to content

Commit

Permalink
Add response headers to logging
Browse files Browse the repository at this point in the history
  • Loading branch information
gdeluna-branch committed Jun 19, 2024
1 parent c8b152d commit ebe245a
Showing 1 changed file with 15 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.net.TrafficStats;
import android.os.NetworkOnMainThreadException;
import android.util.Base64;
import android.util.Log;

import androidx.annotation.NonNull;

Expand Down Expand Up @@ -53,6 +52,7 @@ public BranchRemoteInterfaceUrlConnection(@NonNull Branch branch) {

private int lastResponseCode = -1;
private String lastResponseMessage = "";
private String lastResponseHeaders = "";
private String lastRequestId = "";
private PrefHelper prefHelper;
private int retryLimit;
Expand Down Expand Up @@ -210,7 +210,9 @@ private BranchResponse doRestfulPost(String url, JSONObject payload, int retryNu
int responseCode = connection.getResponseCode();
lastResponseCode = responseCode;
lastResponseMessage = connection.getResponseMessage(); // If we have the response code, this will not invoke any more data transfer
lastResponseHeaders = connection.getHeaderFields() != null ? connection.getHeaderFields().toString() : "";
BranchLogger.d("lastResponseMessage " + lastResponseMessage);
BranchLogger.d("lastResponseHeaders " + lastResponseHeaders);

if (responseCode >= HttpsURLConnection.HTTP_INTERNAL_ERROR && retryNumber < retryLimit) {
try {
Expand All @@ -226,8 +228,15 @@ private BranchResponse doRestfulPost(String url, JSONObject payload, int retryNu
BranchResponse result;
try {
if (responseCode != HttpsURLConnection.HTTP_OK && connection.getErrorStream() != null) {
BranchLogger.e("Branch Networking Error: " + "\nURL: " + url + "" + "\nResponse Code: " + lastResponseCode + "\nResponse Message: " + lastResponseMessage + "\nRetry number: " + retryNumber + "\nFinal attempt: true" + // no retry on 4XX errors
"\nrequestId: " + lastRequestId + "\nObject: " + this);
BranchLogger.e("Branch Networking Error: " +
"\nURL: " + url +
"\nResponse Code: " + lastResponseCode +
"\nResponse Message: " + lastResponseMessage +
"\nResponse Headers: " + lastResponseHeaders +
"\nRetry number: " + retryNumber +
"\nFinal attempt: true" + // no retry on 4XX errors
"\nrequestId: " + lastRequestId +
"\nObject: " + this);
result = new BranchResponse(getResponseString(connection.getErrorStream()), responseCode);
}
else {
Expand All @@ -250,6 +259,7 @@ private BranchResponse doRestfulPost(String url, JSONObject payload, int retryNu
"\nURL: " + url +
"\nResponse Code: " + lastResponseCode +
"\nResponse Message: " + lastResponseMessage +
"\nResponse Headers: " + lastResponseHeaders +
"\nRetry number: " + retryNumber +
"\nrequestId: " + lastRequestId +
"\nObject: " + this);
Expand Down Expand Up @@ -337,6 +347,7 @@ private void resetStats() {
lastRequestId = "";
lastResponseCode = -1;
lastResponseMessage = "";
lastResponseHeaders = "";
}

private String getResponseString(InputStream inputStream) {
Expand Down Expand Up @@ -364,6 +375,7 @@ String getNetworkErrorMessage(Exception e, String url, int retry){
"\nURL: " + url +
"\nResponse Code: " + lastResponseCode +
"\nResponse Message: " + lastResponseMessage +
"\nResponse Headers: " + lastResponseHeaders +
"\nCaught exception type: " + e.getClass().getCanonicalName() +
"\nRetry number: " + retry +
"\nrequestId: " + lastRequestId +
Expand Down

0 comments on commit ebe245a

Please sign in to comment.