Feature/unify attributes (#35)

Unify DeviceAttributesHelper with BacktraceAttributes

Author: rqbacktrace

.gitignore

@@ -87,4 +87,5 @@ hs_err_pid*
 
 #NDK
 obj/
-.externalNativeBuild
+.externalNativeBuild
+**/.cxx

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

@@ -224,9 +224,6 @@ public void addAndStoreUniqueEvent() {
         BacktraceAttributes backtraceAttributes = new BacktraceAttributes(context, null, backtraceClient.attributes);
         expectedAttributes.putAll(backtraceAttributes.getAllAttributes());
 
-        DeviceAttributesHelper deviceAttributesHelper = new DeviceAttributesHelper(context);
-        expectedAttributes.putAll(deviceAttributesHelper.getDeviceAttributes());
-
         assertEquals(expectedAttributes.size(), backtraceClient.metrics.getUniqueEvents().getLast().getAttributes().size());
     }
 
@@ -247,9 +244,6 @@ public void addAndStoreUniqueEventNullAttributes() {
         BacktraceAttributes backtraceAttributes = new BacktraceAttributes(context, null, backtraceClient.attributes);
         expectedAttributes.putAll(backtraceAttributes.getAllAttributes());
 
-        DeviceAttributesHelper deviceAttributesHelper = new DeviceAttributesHelper(context);
-        expectedAttributes.putAll(deviceAttributesHelper.getDeviceAttributes());
-
         assertEquals(expectedAttributes.size(), backtraceClient.metrics.getUniqueEvents().getLast().getAttributes().size());
     }
 
@@ -274,9 +268,6 @@ public void addAndStoreUniqueEventWithAttributes() {
         BacktraceAttributes backtraceAttributes = new BacktraceAttributes(context, null, backtraceClient.attributes);
         expectedAttributes.putAll(backtraceAttributes.getAllAttributes());
 
-        DeviceAttributesHelper deviceAttributesHelper = new DeviceAttributesHelper(context);
-        expectedAttributes.putAll(deviceAttributesHelper.getDeviceAttributes());
-
         assertEquals(expectedAttributes.size() + 1, backtraceClient.metrics.getUniqueEvents().getLast().getAttributes().size());
     }
 

backtrace-library/src/androidTest/java/backtraceio/library/breadcrumbs/BacktraceBreadcrumbsTest.java

@@ -309,7 +309,7 @@ public void testQueueFileShouldNotRollover() {
     @Test
     public void testQueueFileRollover() {
         final int numIterations = 1000;
-        final int firstBreadcrumbIndexAfterRollover = 932;
+        final int firstBreadcrumbIndexAfterRollover = 925;
         // Account for mandatory configuration breadcrumb
         backtraceBreadcrumbs.setCurrentBreadcrumbId(1);
 

backtrace-library/src/main/java/backtraceio/library/models/BacktraceData.java

@@ -166,9 +166,6 @@ private void setAttributes(Map<String, Object> clientAttributes) {
                 clientAttributes);
         this.attributes = backtraceAttributes.attributes;
 
-        DeviceAttributesHelper deviceAttributesHelper = new DeviceAttributesHelper(this.context);
-        this.attributes.putAll(deviceAttributesHelper.getDeviceAttributes());
-
         setAnnotations(backtraceAttributes.getComplexAttributes());
     }
 

backtrace-library/src/main/java/backtraceio/library/models/json/BacktraceAttributes.java

@@ -16,6 +16,7 @@
 
 import backtraceio.library.BuildConfig;
 import backtraceio.library.common.BacktraceStringHelper;
+import backtraceio.library.common.DeviceAttributesHelper;
 import backtraceio.library.common.TypeHelper;
 import backtraceio.library.enums.ScreenOrientation;
 import backtraceio.library.logger.BacktraceLogger;
@@ -100,6 +101,9 @@ private void setDeviceInformation() {
         this.attributes.put("device.manufacturer", Build.MANUFACTURER);
 
         this.attributes.put("device.os_version", System.getProperty("os.version"));
+
+        DeviceAttributesHelper deviceAttributesHelper = new DeviceAttributesHelper(this.context);
+        this.attributes.putAll(deviceAttributesHelper.getDeviceAttributes());
     }
 
     private void setAppInformation() {

backtrace-library/src/main/java/backtraceio/library/services/BacktraceMetrics.java

@@ -343,9 +343,6 @@ protected Map<String, Object> createLocalAttributes(Map<String, Object> attribut
         BacktraceAttributes backtraceAttributes = new BacktraceAttributes(context, null, customReportAttributes);
         localAttributes.putAll(backtraceAttributes.getAllAttributes());
 
-        DeviceAttributesHelper deviceAttributesHelper = new DeviceAttributesHelper(context);
-        localAttributes.putAll(deviceAttributesHelper.getDeviceAttributes());
-
         return localAttributes;
     }