Backtrace data models serialization optimization

backtrace-library/build.gradle

@@ -82,6 +82,7 @@ dependencies {
     implementation 'com.squareup:tape:1.2.3'
     testImplementation 'junit:junit:4.13.2'
     testImplementation "org.mockito:mockito-core:5.12.0"
+    testImplementation 'org.json:json:20240303'
     androidTestImplementation "org.mockito:mockito-android:5.12.0"
     androidTestImplementation 'net.jodah:concurrentunit:0.4.4'
     androidTestImplementation 'androidx.test.ext:junit:1.2.1'
@@ -90,6 +91,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     androidTestImplementation 'org.mockito:mockito-core:5.2.0'
     androidTestImplementation "org.mockito:mockito-android:2.28.2"
+    testImplementation "com.google.guava:guava:33.3.1-jre"
 }
 
 apply from: 'publish.gradle'

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

@@ -61,7 +61,7 @@ public void sendBacktraceExceptionAttachments() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                return new BacktraceResult(data.getReport(), data.report.exception.getMessage(),
+                return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                         BacktraceResultStatus.Ok);
             }
         };
@@ -104,7 +104,7 @@ public void sendBacktraceExceptionNoAttachments() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                return new BacktraceResult(data.getReport(), data.report.exception.getMessage(),
+                return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                         BacktraceResultStatus.Ok);
             }
         };

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

@@ -11,6 +11,7 @@
 
 import net.jodah.concurrentunit.Waiter;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,19 +31,26 @@ public class BacktraceClientAttributeTests {
     private BacktraceCredentials credentials;
     private BacktraceDatabase database;
 
+    private BacktraceClient backtraceClient;
+
     @Before
     public void setUp() {
         context = InstrumentationRegistry.getInstrumentation().getContext();
         credentials = new BacktraceCredentials("https://example-endpoint.com/", "");
         database = new BacktraceDatabase(context, context.getFilesDir().getAbsolutePath());
+        backtraceClient = new BacktraceClient(context, credentials, database);
+    }
+
+    @After
+    public void cleanUp() {
+        database.clear();
     }
 
     @Test
     public void shouldAddASingleAttribute() {
         // GIVEN
         final String attributeKey = "test-attribute";
         final String attributeValue = "test-value";
-        final BacktraceClient backtraceClient = new BacktraceClient(context, credentials, database);
 
         // WHEN
         backtraceClient.addAttribute(attributeKey, attributeValue);
@@ -66,7 +74,6 @@ public void shouldAddMultipleAttributesAtOnce() {
             attributes.put(String.format("%s %d", attributeKey, attributeIteration), attributeValue);
         }
         // WHEN
-        final BacktraceClient backtraceClient = new BacktraceClient(context, credentials, database);
         backtraceClient.addAttribute(attributes);
 
         // THEN
@@ -85,7 +92,6 @@ public void shouldReplaceExistingAttribute() {
         final String newAttributeValue = "test-value-new";
 
         // WHEN
-        final BacktraceClient backtraceClient = new BacktraceClient(context, credentials, database);
         backtraceClient.addAttribute(attributeKey, oldAttributeValue);
 
         backtraceClient.addAttribute(attributeKey, newAttributeValue);
@@ -129,14 +135,14 @@ public void attributesShouldBeAvailableInReport() {
         final String errorMessage = "error message";
         final String attributeKey = "test-attribute";
         final String attributeValue = "test-value";
-        final BacktraceClient backtraceClient = new BacktraceClient(context, credentials, database);
+
         backtraceClient.addAttribute(attributeKey, attributeValue);
         RequestHandler rh = data -> {
             // THEN
-            Object value = data.attributes.get(attributeKey);
+            Object value = data.getAttributes().get(attributeKey);
             assertNotNull(value);
             assertEquals(value, attributeValue);
-            return new BacktraceResult(data.getReport(), data.report.exception.getMessage(),
+            return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                     BacktraceResultStatus.Ok);
         };
         backtraceClient.setOnRequestHandler(rh);

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

@@ -73,7 +73,7 @@ public void sendBacktraceExceptionBreadcrumbs() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                return new BacktraceResult(data.getReport(), data.report.exception.getMessage(),
+                return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                         BacktraceResultStatus.Ok);
             }
         };
@@ -122,7 +122,7 @@ public void sendBacktraceExceptionBreadcrumbsAddBreadcrumb() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                return new BacktraceResult(data.getReport(), data.report.exception.getMessage(),
+                return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                         BacktraceResultStatus.Ok);
             }
         };
@@ -276,7 +276,7 @@ public void sendBacktraceExceptionNoBreadcrumbs() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                return new BacktraceResult(data.report, data.report.exception.getMessage(),
+                return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                         BacktraceResultStatus.Ok);
             }
         };

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

@@ -86,7 +86,7 @@ public void useBeforeSendAndRequestHandler() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                return new BacktraceResult(null, data.attributes.get(attributeKey),
+                return new BacktraceResult(null, data.getAttributes().get(attributeKey),
                         BacktraceResultStatus.Ok);
             }
         };
@@ -95,7 +95,7 @@ public BacktraceResult onRequest(BacktraceData data) {
         backtraceClient.setOnBeforeSendEventListener(new OnBeforeSendEventListener() {
             @Override
             public BacktraceData onEvent(BacktraceData data) {
-                data.attributes.put(attributeKey, resultMessage);
+                data.getAttributes().put(attributeKey, resultMessage);
                 return data;
             }
         });

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

@@ -58,7 +58,7 @@ public void sendBacktraceReportWithStringAndAttributesProguard() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                assertEquals("proguard", data.symbolication);
+                assertEquals("proguard", data.getSymbolication());
                 return new BacktraceResult(data.getReport(), data.getReport().message,
                         BacktraceResultStatus.Ok);
             }
@@ -97,7 +97,7 @@ public void sendBacktraceReportWithStringAndAttributesNoProguard() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                assertNull(data.symbolication);
+                assertNull(data.getSymbolication());
                 return new BacktraceResult(data.getReport(), data.getReport().message,
                         BacktraceResultStatus.Ok);
             }
@@ -138,7 +138,7 @@ public void sendBacktraceReportWithExceptionAndAttributesProguard() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                assertEquals("proguard", data.symbolication);
+                assertEquals("proguard", data.getSymbolication());
                 return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                         BacktraceResultStatus.Ok);
             }
@@ -180,7 +180,7 @@ public void sendBacktraceReportWithExceptionAndAttributesNoProguard() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                assertNull(data.symbolication);
+                assertNull(data.getSymbolication());
                 return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                         BacktraceResultStatus.Ok);
             }
@@ -224,7 +224,7 @@ public void sendBacktraceExceptionProguard() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                assertEquals("proguard", data.symbolication);
+                assertEquals("proguard", data.getSymbolication());
                 return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                         BacktraceResultStatus.Ok);
             }
@@ -266,7 +266,7 @@ public void sendBacktraceExceptionNoProguard() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                assertNull(data.symbolication);
+                assertNull(data.getSymbolication());
                 return new BacktraceResult(data.getReport(), data.getReport().exception.getMessage(),
                         BacktraceResultStatus.Ok);
             }
@@ -309,7 +309,7 @@ public void sendBacktraceStringProguard() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                assertEquals("proguard", data.symbolication);
+                assertEquals("proguard", data.getSymbolication());
                 return new BacktraceResult(data.getReport(), data.getReport().message,
                         BacktraceResultStatus.Ok);
             }
@@ -351,7 +351,7 @@ public void sendBacktraceStringNoProguard() {
         RequestHandler rh = new RequestHandler() {
             @Override
             public BacktraceResult onRequest(BacktraceData data) {
-                assertNull(data.symbolication);
+                assertNull(data.getSymbolication());
                 return new BacktraceResult(data.getReport(), data.getReport().message,
                         BacktraceResultStatus.Ok);
             }

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

@@ -110,7 +110,7 @@ public void sendExceptionWithManyCause() {
                 fail(e.getMessage());
             }
 
-            return new BacktraceResult(data.getReport(), data.report.message,
+            return new BacktraceResult(data.getReport(), data.getReport().message,
                     BacktraceResultStatus.Ok);
         };
         backtraceClient.setOnRequestHandler(rh);

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

@@ -29,6 +29,7 @@
 import backtraceio.library.models.BacktraceResult;
 import backtraceio.library.models.database.BacktraceDatabaseSettings;
 import backtraceio.library.models.json.BacktraceAttributes;
+import backtraceio.library.models.json.BacktraceReport;
 import backtraceio.library.models.types.BacktraceResultStatus;
 
 
@@ -176,10 +177,13 @@ public void run() {
                     @Override
                     public BacktraceResult onRequest(BacktraceData data) {
                         // THEN
-                        waiter.assertTrue(data.getReport().attributes.containsKey(customClientAttributeKey));
-                        waiter.assertEquals(customClientAttributeValue, data.getReport().attributes.get(customClientAttributeKey));
+
+                        final BacktraceReport dataReport = data.getReport();
+                        waiter.assertTrue(dataReport.attributes.containsKey(customClientAttributeKey));
+                        waiter.assertEquals(customClientAttributeValue, dataReport.attributes.get(customClientAttributeKey));
                         waiter.assertEquals(exceptionMessage, data.getReport().exception.getMessage());
-                        waiter.assertEquals(data.getReport().attributes.get(BacktraceAttributeConsts.ErrorType), BacktraceAttributeConsts.UnhandledExceptionAttributeType);
+                        waiter.assertEquals(dataReport.attributes.get(BacktraceAttributeConsts.ErrorType), BacktraceAttributeConsts.UnhandledExceptionAttributeType);
+
                         waiter.resume();
                         return new BacktraceResult(data.getReport(), "", BacktraceResultStatus.Ok);
                     }

backtrace-library/src/androidTest/java/backtraceio/library/database/BacktraceDatabaseContextTest.java

@@ -38,15 +38,13 @@ public void setUp() {
         this.context = InstrumentationRegistry.getInstrumentation().getContext();
         this.dbPath = this.context.getFilesDir().getAbsolutePath();
         this.databaseSettings = new BacktraceDatabaseSettings(this.dbPath, RetryOrder.Queue);
-        this.databaseContext = new BacktraceDatabaseContext(this.context, this.databaseSettings);
+        this.databaseContext = new BacktraceDatabaseContext(this.databaseSettings);
     }
-
     @After
     public void after() {
         this.databaseContext.clear();
     }
 
-
     @Test
     public void firstFromDatabaseContextQueue() {
         // GIVEN
@@ -79,7 +77,7 @@ public void lastFromDatabaseContextQueue() {
     public void firstFromDatabaseContextStack() {
         // GIVEN
         BacktraceDatabaseSettings settings = new BacktraceDatabaseSettings(this.dbPath, RetryOrder.Stack);
-        this.databaseContext = new BacktraceDatabaseContext(this.context, settings);
+        this.databaseContext = new BacktraceDatabaseContext(settings);
         List<BacktraceDatabaseRecord> records = fillDatabase();
 
         // WHEN
@@ -94,7 +92,7 @@ public void firstFromDatabaseContextStack() {
     public void lastFromDatabaseContextStack() {
         // GIVEN
         BacktraceDatabaseSettings settings = new BacktraceDatabaseSettings(this.dbPath, RetryOrder.Stack);
-        this.databaseContext = new BacktraceDatabaseContext(this.context, settings);
+        this.databaseContext = new BacktraceDatabaseContext(settings);
         List<BacktraceDatabaseRecord> records = fillDatabase();
 
         // WHEN
@@ -147,7 +145,7 @@ public void notContainsInDatabaseContext() {
         // GIVEN
         fillDatabase();
         BacktraceReport report = new BacktraceReport(this.testMessage);
-        BacktraceData data = new BacktraceData(this.context, report, null);
+        BacktraceData data = new BacktraceData.Builder(report).setAttributes(this.context, null).build();
         BacktraceDatabaseRecord record = new BacktraceDatabaseRecord(data, this.dbPath);
 
         // WHEN
@@ -236,7 +234,7 @@ public void tryDeleteNotExistingRecordFromDatabaseContext() {
         // GIVEN
         fillDatabase();
         BacktraceReport report = new BacktraceReport(this.testMessage);
-        BacktraceData data = new BacktraceData(this.context, report, null);
+        BacktraceData data = new BacktraceData.Builder(report).setAttributes(this.context, null).build();
         BacktraceDatabaseRecord record = new BacktraceDatabaseRecord(data, this.dbPath);
 
         // WHEN
@@ -261,9 +259,9 @@ private List<BacktraceDatabaseRecord> fillDatabase() {
         BacktraceReport report = new BacktraceReport(this.testMessage);
         BacktraceReport report2 = new BacktraceReport(this.testMessage);
         BacktraceReport report3 = new BacktraceReport(this.testMessage);
-        BacktraceData data = new BacktraceData(this.context, report, null);
-        BacktraceData data2 = new BacktraceData(this.context, report2, null);
-        BacktraceData data3 = new BacktraceData(this.context, report3, null);
+        BacktraceData data = new BacktraceData.Builder(report).setAttributes(this.context, null).build();
+        BacktraceData data2 = new BacktraceData.Builder(report2).setAttributes(this.context, null).build();
+        BacktraceData data3 = new BacktraceData.Builder(report3).setAttributes(this.context, null).build();
         result.add(databaseContext.add(data));
         result.add(databaseContext.add(data2));
         result.add(databaseContext.add(data3));