Merge pull request #3 from backtrace-labs/dev

Version 1.1.2

Author: BartoszLitwiniuk

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Backtrace Android Release Notes
 
 
+## Version 1.1.2 - 07.03.2019
+- Added class name to function name in exception StackFrame
+- Added exception message to annotations
+
 ## Version 1.1.1 - 26.02.2019
 - Fixed exception on filter out Backtrace files from StackTraceElements when file name is null
 

README.md

@@ -70,7 +70,7 @@ catch (e: Exception) {
 * Gradle
 ```
 dependencies {
-    implementation 'com.github.backtrace-labs.backtrace-android:backtrace-library:1.1.1'
+    implementation 'com.github.backtrace-labs.backtrace-android:backtrace-library:1.1.2'
 }
 ```
 
@@ -79,7 +79,7 @@ dependencies {
 <dependency>
   <groupId>com.github.backtrace-labs.backtrace-android</groupId>
   <artifactId>backtrace-library</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <type>aar</type>
 </dependency>
 ```

backtrace-library/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 111
-        versionName "1.1.1"
+        versionCode 112
+        versionName "1.1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

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

@@ -117,24 +117,38 @@ public BacktraceData(Context context, BacktraceReport report, Map<String, Object
         }
         this.context = context;
         this.report = report;
-        this.annotations = new Annotations();
 
         setReportInformation();
-
         setThreadsInformation();
         setAttributes(clientAttributes);
     }
 
     /**
      * Get absolute paths to report attachments
+     *
      * @return paths to attachments
      */
     public List<String> getAttachments() {
         return FileHelper.filterOutFiles(this.context, report.attachmentPaths);
     }
 
+    /***
+     * Set annotations object
+     * @param complexAttributes
+     */
+    private void setAnnotations(Map<String, Object> complexAttributes) {
+        Object exceptionMessage = null;
+
+        if (this.attributes != null &&
+                this.attributes.containsKey("error.message")) {
+            exceptionMessage = this.attributes.get("error.message");
+        }
+        this.annotations = new Annotations(exceptionMessage, complexAttributes);
+    }
+
     /**
      * Set attributes and add complex attributes to annotations
+     *
      * @param clientAttributes
      */
     private void setAttributes(Map<String, Object> clientAttributes) {
@@ -145,10 +159,7 @@ private void setAttributes(Map<String, Object> clientAttributes) {
         DeviceAttributesHelper deviceAttributesHelper = new DeviceAttributesHelper(this.context);
         this.attributes.putAll(deviceAttributesHelper.getDeviceAttributes());
 
-        if(this.annotations != null)
-        {
-            this.annotations.addComplexAttributes(backtraceAttributes.getComplexAttributes());
-        }
+        setAnnotations(backtraceAttributes.getComplexAttributes());
     }
 
     /**

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

@@ -45,7 +45,7 @@ public BacktraceStackFrame(StackTraceElement frame) {
         if (frame == null || frame.getMethodName() == null) {
             return;
         }
-        this.functionName = frame.getMethodName();
+        this.functionName = frame.getClassName() + "." + frame.getMethodName();
         this.sourceCodeFileName = frame.getFileName();
         this.sourceCode = UUID.randomUUID().toString();
         this.line = frame.getLineNumber() > 0 ? frame.getLineNumber() : null;

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

@@ -8,15 +8,29 @@
  */
 public class Annotations extends HashMap<String, Object>{
 
-    public Annotations()
+    public Annotations(Object exceptionMessage, Map<String, Object> complexAttributes)
     {
         this.put("Environment Variables", System.getenv());
+        this.addComplexAttributes(complexAttributes);
+        this.addExceptionDetails(exceptionMessage);
     }
 
-    public void addComplexAttributes(Map<String, Object> complexAttributes)
+    private void addComplexAttributes(Map<String, Object> complexAttributes)
     {
         if(complexAttributes != null) {
             this.putAll(complexAttributes);
         }
     }
+
+    private void addExceptionDetails(final Object exceptionMessage){
+        this.put("Exception", new AnnotationException(exceptionMessage));
+    }
+
+    class AnnotationException{
+        Object Message;
+
+        AnnotationException(Object message){ setMessage(message); }
+
+        void setMessage(Object message){ this.Message = message; }
+    }
 }

gradle.properties

@@ -13,8 +13,8 @@ org.gradle.jvmargs=-Xmx1024m
 # org.gradle.parallel=true
 
 
-VERSION_NAME=1.1.1
-VERSION_CODE=111
+VERSION_NAME=1.1.2
+VERSION_CODE=112
 GROUP=com.github.backtrace-labs.backtrace-android
 
 POM_DESCRIPTION=Backtrace's integration with Android applications written in Java allows customers to capture and report handled and unhandled java exceptions.