Merge pull request #65 from backtrace-labs/release

Release 3.7.4

Author: BartoszLitwiniuk

.github/workflows/test.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
   schedule:
     - cron:  '0 0 * * *'
 

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Backtrace Android Release Notes
 
+## Version 3.7.4
+- Feature: migrated to AndroidX
+- Improvement: removed READ_EXTERNAL_STORAGE permission from library AndroidManifest.xml
+
+## Version 3.7.3
+- Bug: Crashpad attachment syntax changed
+
+## Version 3.7.2
+- Bug: Fix issue rolling over Breadcrumb file
+- Feature: update gradle to latest
+- Feature: integrate crashpad via cmake
+- Improvement: Make local.properties optional
+- Improvement: Cleanup build scripts for speed
+
 ## Version 3.7.1 - 14.06.2022
 - Error type "crash" only on unhandled exceptions from main thread for other threads - error type will be "unhandled exception"
 

backtrace-library/build.gradle

@@ -11,16 +11,16 @@ androidGitVersion {
 
 android {
 
-    compileSdkVersion 30
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 32
         versionName androidGitVersion.name()
         versionCode androidGitVersion.code()
         buildConfigField("String", "VERSION_NAME", "\"${versionName}\"")
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         externalNativeBuild {
             cmake {
@@ -53,6 +53,7 @@ android {
     sourceSets {
         main {
         }
+        androidTest.manifest.srcFile "src/androidTest/java/backtraceio/library/AndroidManifest.xml"
     }
 
     // Needed until we migrate to AndroidX
@@ -66,14 +67,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.google.code.gson:gson:2.9.1'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
     implementation 'com.squareup:tape:1.2.3'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'net.jodah:concurrentunit:0.4.4'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
 apply from: 'publish.gradle'

backtrace-library/src/androidTest/java/backtraceio/library/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="backtraceio.library">
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <application/>
+</manifest>

backtrace-library/src/androidTest/java/backtraceio/library/BacktraceClientAttachmentsTest.java

@@ -6,8 +6,8 @@
 import static org.junit.Assert.assertNotNull;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import net.jodah.concurrentunit.Waiter;
 
@@ -38,7 +38,7 @@ public class BacktraceClientAttachmentsTest {
 
     @Before
     public void setUp() {
-        context = InstrumentationRegistry.getContext();
+        context = InstrumentationRegistry.getInstrumentation().getContext();
         credentials = new BacktraceCredentials("https://example-endpoint.com/", "");
 
         database = new BacktraceDatabase(context, context.getFilesDir().getAbsolutePath());

backtrace-library/src/androidTest/java/backtraceio/library/BacktraceClientBreadcrumbsTest.java

@@ -7,8 +7,8 @@
 import static org.junit.Assert.assertNull;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import junit.framework.TestCase;
 
@@ -47,7 +47,7 @@ public class BacktraceClientBreadcrumbsTest {
 
     @Before
     public void setUp() {
-        context = InstrumentationRegistry.getContext();
+        context = InstrumentationRegistry.getInstrumentation().getContext();
         credentials = new BacktraceCredentials("https://example-endpoint.com/", "");
 
         BacktraceDatabase database = new BacktraceDatabase(context, context.getFilesDir().getAbsolutePath());

backtrace-library/src/androidTest/java/backtraceio/library/BacktraceClientEventsTest.java

@@ -5,8 +5,8 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import net.jodah.concurrentunit.Waiter;
 
@@ -39,7 +39,7 @@ public class BacktraceClientEventsTest {
 
     @Before
     public void setUp() {
-        context = InstrumentationRegistry.getContext();
+        context = InstrumentationRegistry.getInstrumentation().getContext();
         credentials = new BacktraceCredentials(Uri.parse("https://submit.backtrace.io/backtrace/123/json"));
     }
 

backtrace-library/src/androidTest/java/backtraceio/library/BacktraceClientMetricsTest.java

@@ -9,8 +9,8 @@
 import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import net.jodah.concurrentunit.Waiter;
 
@@ -51,7 +51,7 @@ public class BacktraceClientMetricsTest {
 
     @Before
     public void setUp() {
-        context = InstrumentationRegistry.getContext();
+        context = InstrumentationRegistry.getInstrumentation().getContext();
         credentials = new BacktraceCredentials("https://universe.sp.backtrace.io:6098", token);
         BacktraceDatabase database = new BacktraceDatabase(context, context.getFilesDir().getAbsolutePath());
 

backtrace-library/src/androidTest/java/backtraceio/library/BacktraceClientProguardTest.java

@@ -6,8 +6,8 @@
 import static org.junit.Assert.assertNull;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import net.jodah.concurrentunit.Waiter;
 
@@ -43,7 +43,7 @@ public class BacktraceClientProguardTest {
 
     @Before
     public void setUp() {
-        context = InstrumentationRegistry.getContext();
+        context = InstrumentationRegistry.getInstrumentation().getContext();
         credentials = new BacktraceCredentials("https://example-endpoint.com/", "");
     }
 

backtrace-library/src/androidTest/java/backtraceio/library/BacktraceClientSendTest.java

@@ -4,21 +4,26 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import net.jodah.concurrentunit.Waiter;
 
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import backtraceio.library.common.BacktraceSerializeHelper;
 import backtraceio.library.events.OnServerResponseEventListener;
 import backtraceio.library.events.RequestHandler;
 import backtraceio.library.models.BacktraceData;
@@ -37,7 +42,7 @@ public class BacktraceClientSendTest {
 
     @Before
     public void setUp() {
-        context = InstrumentationRegistry.getContext();
+        context = InstrumentationRegistry.getInstrumentation().getContext();
         credentials = new BacktraceCredentials("https://example-endpoint.com/", "");
     }
 
@@ -74,6 +79,59 @@ public void onEvent(BacktraceResult backtraceResult) {
         }
     }
 
+    @Test
+    public void sendExceptionWithManyCause() {
+        // GIVEN
+        final String lastExceptionExpectedMessage = "New Exception";
+        final Exception causedException = new Exception(new IOException(new IllegalArgumentException(lastExceptionExpectedMessage)));
+        final StackTraceElement[] stackTraceElements = new StackTraceElement[1];
+        stackTraceElements[0] = new StackTraceElement("BacktraceClientSendTest.class", "sendCausedException", "BacktraceClientSendTest.java", 1);
+        causedException.setStackTrace(stackTraceElements);
+
+        final BacktraceClient backtraceClient = new BacktraceClient(context, credentials);
+        final Waiter waiter = new Waiter();
+        final String mainExceptionExpectedMessage = "java.io.IOException: java.lang.IllegalArgumentException: New Exception";
+        RequestHandler rh = data -> {
+            String jsonString = BacktraceSerializeHelper.toJson(data);
+
+            try {
+                // THEN
+                final JSONObject jsonObject = new JSONObject(jsonString);
+                final JSONObject exceptionProperties = jsonObject.getJSONObject("annotations").getJSONObject("Exception properties");
+                final String mainExceptionMessage = jsonObject.getJSONObject("annotations").getJSONObject("Exception").getString("message");
+
+                assertEquals(mainExceptionExpectedMessage, mainExceptionMessage);
+                assertTrue(exceptionProperties.getJSONArray("stack-trace").length() > 0);
+                assertEquals(mainExceptionExpectedMessage, exceptionProperties.get("detail-message"));
+
+                final JSONObject firstCause = exceptionProperties.getJSONObject("cause");
+                assertEquals("java.lang.IllegalArgumentException: New Exception", firstCause.getString("detail-message"));
+
+                final JSONObject secondCause = firstCause.getJSONObject("cause");
+                assertEquals(lastExceptionExpectedMessage, secondCause.getString("detail-message"));
+            } catch (JSONException e) {
+                e.printStackTrace();
+                fail(e.getMessage());
+            }
+
+            return new BacktraceResult(data.report, data.report.message,
+                    BacktraceResultStatus.Ok);
+        };
+        backtraceClient.setOnRequestHandler(rh);
+
+        // WHEN
+        backtraceClient.send(new BacktraceReport(causedException), backtraceResult -> {
+            waiter.resume();
+        });
+
+        // WAIT FOR THE RESULT FROM ANOTHER THREAD
+        try {
+            waiter.await(5, TimeUnit.SECONDS);
+        } catch (Exception ex) {
+            fail(ex.getMessage());
+        }
+    }
+
     @Test
     public void sendBacktraceReportWithString() {
         // GIVEN