Add pure java Logger

coroner-client/src/main/java/backtraceio/coroner/CoronerClient.java

@@ -48,7 +48,11 @@ public CoronerResponse rxIdFilter(final String rxId, final List<String> customAt
     public CoronerResponse errorTypeTimestampFilter(final String errorType, final String timestampLeast, final String timestampMost, final List<String> customAttributes) throws CoronerResponseException, IOException, CoronerHttpException {
         final List<String> attributes = concatAttributes(customAttributes);
 
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient errorTypeTimestampFilter started attributes", String.valueOf(attributes));
+
+
         final JsonObject coronerQuery = this.coronerQueries.filterByErrorTypeAndTimestamp(errorType, timestampLeast, timestampMost, attributes);
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient errorTypeTimestampFilter coronerQuery JsonObject", String.valueOf(coronerQuery));
 
         return makeRequest(coronerQuery);
     }
@@ -60,8 +64,12 @@ private List<String> concatAttributes(final List<String> customAttributes) {
     }
 
     private CoronerResponse makeRequest(final JsonObject coronerQuery) throws CoronerResponseException, IOException, CoronerHttpException {
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient makeRequest started", "started");
+
+
         final CoronerApiResponse response = this.coronerHttpClient.get(coronerQuery.toString());
-
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient CoronerResponse makeRequest", response.toString());
+
         if (response.error != null) {
             throw new CoronerResponseException(response.getError());
         }

coroner-client/src/main/java/backtraceio/coroner/CoronerHttpClient.java

@@ -29,16 +29,25 @@ public CoronerHttpClient(final String apiUrl, final String coronerToken) {
     public CoronerApiResponse get(final String requestJson) throws CoronerHttpException, IOException {
         final HttpURLConnection urlConnection = prepareHttpRequest(requestJson);
         final int statusCode = urlConnection.getResponseCode();
-
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient", "invoked");
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient api url", apiUrl);
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient request json", requestJson);
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient statusCode", String.valueOf(statusCode));
         if (statusCode != HttpURLConnection.HTTP_OK) {
             String message = getResponseMessage(urlConnection);
+
+            backtraceio.coroner.common.Logger.d("CoronerHttpClient getResponseMessage message", message);
+
             message = (Common.isNullOrEmpty(message)) ?
                     urlConnection.getResponseMessage() : message;
             throw new CoronerHttpException(statusCode, String.format("%s: %s", statusCode, message));
         }
 
         final String resultJson = getResponseMessage(urlConnection);
 
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient resultJson", resultJson);
+
+
         return GsonWrapper.fromJson(
                 resultJson,
                 CoronerApiResponse.class);

coroner-client/src/main/java/backtraceio/coroner/common/AndroidLogDelegate.java

@@ -0,0 +1,6 @@
+package backtraceio.coroner.common;
+
+// Interface that the instrumentation test can implement to call android.util.Log
+public interface AndroidLogDelegate {
+    void d(String tag, String message);
+}

coroner-client/src/main/java/backtraceio/coroner/common/Logger.java

@@ -0,0 +1,25 @@
+package backtraceio.coroner.common;
+
+public final class Logger {
+    private static AndroidLogDelegate delegate;
+
+    private Logger() {
+        // no instances
+    }
+
+    /**
+     * Called from the Android test code to register a delegate that can log to Logcat.
+     */
+    public static synchronized void setDelegate(AndroidLogDelegate logDelegate) {
+        delegate = logDelegate;
+    }
+
+    /**
+     * Pure Java code can call this method instead of System.out.println().
+     */
+    public static synchronized void d(String tag, String message) {
+        if (delegate != null) {
+            delegate.d(tag, message);
+        }
+    }
+}

coroner-client/src/main/java/backtraceio/coroner/serialization/GsonWrapper.java

@@ -9,12 +9,25 @@
 public class GsonWrapper {
 
     public static <T> T fromJson(final String json, final Class<T> type) {
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient GsonWrapper fromJson", "started");
+
+
         Gson gson = new GsonBuilder()
                 .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES)
                 .registerTypeAdapter(CoronerResponseGroup.class, new CoronerResponseGroupDeserializer())
                 .create();
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient GsonWrapper", gson.toString());
+
+
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient GsonWrapper fromJson", "json");
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient GsonWrapper fromJson", json);
+
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient GsonWrapper fromJson", "started");
+        T result = gson.fromJson(json, type);
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient GsonWrapper fromJson", "result");
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient GsonWrapper fromJson", result.toString());
 
-        return gson.fromJson(json, type);
+        return result;
     }
 
 }

example-app/build.gradle

@@ -67,7 +67,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'androidx.test:rules:1.6.1'
-    androidTestImplementation 'net.jodah:concurrentunit:0.4.4'
+    androidTestImplementation 'net.jodah:concurrentunit:0.4.6'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     implementation project(':backtrace-library')
     androidTestImplementation project(path: ':coroner-client')

example-app/src/androidTest/java/backtraceio/backtraceio/CoronerLogDelegate.java

@@ -0,0 +1,12 @@
+package backtraceio.backtraceio;
+
+import backtraceio.coroner.common.AndroidLogDelegate;
+import android.util.Log;
+
+// Implementation that calls the real android.util.Log
+public class CoronerLogDelegate implements AndroidLogDelegate {
+    @Override
+    public void d(String tag, String message) {
+        Log.d(tag, message);
+    }
+}

example-app/src/androidTest/java/backtraceio/backtraceio/ExampleInstrumentedTest.java

@@ -20,9 +20,11 @@
 import org.junit.runner.RunWith;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import backtraceio.coroner.common.Logger;
 import backtraceio.coroner.response.CoronerResponse;
 import backtraceio.coroner.response.CoronerResponseProcessingException;
 
@@ -44,6 +46,11 @@ public void enableMetricsAndBreadcrumbs() {
         onView(withId(R.id.enableBreadcrumbs)).perform(click());
     }
 
+    @Before
+    public void setUp() {
+        Logger.setDelegate(new CoronerLogDelegate());
+    }
+
     @Test
     public void useAppContext() {
         // Context of the app under test.
@@ -70,8 +77,13 @@ public void handledException() throws TimeoutException, CoronerResponseProcessin
         // THEN
         CoronerResponse response = null;
 
+        // Test
+        backtraceio.coroner.common.Logger.d("CoronerHttpClient", "handledException");
+
         try {
             response = this.getCoronerClient().rxIdFilter(rxId[0], Arrays.asList("error.message"));
+            backtraceio.coroner.common.Logger.d("CoronerHttpClient handledException response", response.toString());
+
         } catch (Exception ex) {
             Assert.fail(ex.getMessage());
         }
@@ -96,13 +108,21 @@ public void dumpWithoutCrash() throws CoronerResponseProcessingException, Interr
         onView(withId(R.id.dumpWithoutCrash)).perform(click()); // UI action
         Thread.sleep(THREAD_SLEEP_TIME_MS * 10);
 
+        // Test
+        Logger.d("CoronerHttpClient", "Hello from pure Java code!");
+
         // THEN
         try {
             response = this.getCoronerClient().errorTypeTimestampFilter("Crash",
                     Long.toString(timestampStart),
                     Long.toString(this.getSecondsTimestampNowGMT()),
-                    Arrays.asList("error.message"));
+                    Collections.singletonList("error.message"));
+
+            backtraceio.coroner.common.Logger.d("CoronerHttpClient dumpWithoutCrash response", response.toString());
+
         } catch (Exception ex) {
+            backtraceio.coroner.common.Logger.d("CoronerHttpClient dumpWithoutCrash Exception", ex.getMessage());
+
             Assert.fail(ex.getMessage());
         }
 
@@ -132,7 +152,7 @@ public void unhandledException() throws CoronerResponseProcessingException, Inte
             response = this.getCoronerClient().errorTypeTimestampFilter("Crash",
                     Long.toString(timestampStart),
                     Long.toString(this.getSecondsTimestampNowGMT()),
-                    Arrays.asList("error.message"));
+                    Collections.singletonList("error.message"));
         } catch (Exception ex) {
             Assert.fail(ex.getMessage());
         }