Track which error reports are created automatically (#59)

Author: kattrali

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.5.0 (2017-02-10)
+
+* Track whether an error is handled or unhandled
+
+* Update native libraries
+
 ## 3.4.0 (2017-19-09)
 
 ### Enhancements

Rakefile

@@ -86,22 +86,19 @@ task :create_ios_plugin do
   mkdir_p ios_dir
 
   # Copy iOS bugsnag notifier and KSCrash directory files
-  kscrash_dir = "bugsnag-cocoa/Carthage/Checkouts/KSCrash/Source/KSCrash/"
-  recording_path = kscrash_dir + "Recording"
-  swift_path = kscrash_dir + "swift"
-  llvm_path = kscrash_dir + "llvm"
   bugsnag_path = "bugsnag-cocoa/Source"
-  `find #{recording_path} #{swift_path} #{llvm_path} #{bugsnag_path} -name '*.m' -or -name '*.c' -or -name '*.mm' -or -name '*.h' -or -name '*.cpp'`.split("\n").each do |x|
-    cp x, ios_dir
-  end
+  kscrash_dir = "bugsnag-cocoa/Source/KSCrash/Source/KSCrash/"
+  recording_path = kscrash_dir + "Recording"
+  reporting_path = kscrash_dir + "Reporting"
 
   # Copy over basic additional KSCrash reporting files
+  recording_sentry_path = kscrash_dir + "Recording/Sentry"
+  recording_tools_path = kscrash_dir + "Recording/Tools"
   kscrash_filter_path = kscrash_dir + "Reporting/Filters/"
-  cp kscrash_filter_path + "Tools/KSVarArgs.h", ios_dir
-  cp kscrash_filter_path + "Tools/Container+DeepSearch.h", ios_dir
-  cp kscrash_filter_path + "Tools/Container+DeepSearch.m", ios_dir
-  cp kscrash_filter_path + "KSCrashReportFilter.h", ios_dir
-  cp kscrash_filter_path + "KSCrashReportFilter.m", ios_dir
+
+  `find #{recording_path} #{reporting_path} #{bugsnag_path} #{recording_sentry_path} #{recording_tools_path} #{kscrash_filter_path} -name '*.m' -or -name '*.c' -or -name '*.mm' -or -name '*.h' -or -name '*.cpp'`.split("\n").each do |x|
+    cp x, ios_dir
+  end
 
   # Copy unity to bugsnag-cocoa wrapper
   cp "src/BugsnagUnity.mm", ios_dir
@@ -134,7 +131,7 @@ task :create_android_plugin do
     sh "../bugsnag-android/gradlew clean build"
   end
 
-  cp "bugsnag-android/build/outputs/aar/bugsnag-android-release.aar", android_dir
+  cp "bugsnag-android/sdk/build/outputs/aar/sdk-release.aar", android_dir
   cp "bugsnag-android-unity/build/outputs/aar/bugsnag-android-unity-release.aar", android_dir
 end
 

bugsnag-android

@@ -1,24 +1,33 @@
+ext {
+    supportLibVersion = "25.3.1"
+    supportTestVersion = "0.5"
+    espressoVersion = "2.2.2"
+    junitVersion = "4.12"
+    mockitoVersion = "1.10.19"
+    kotlin_version = '1.1.3-2'
+}
+
 buildscript {
     repositories {
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
 
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
+    compileSdkVersion Integer.parseInt(project.ANDROID_COMPILE_SDK_VERSION)
     buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION
 
     defaultConfig {
-        minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
-        targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
+        minSdkVersion Integer.parseInt(project.ANDROID_MIN_SDK_VERSION)
+        targetSdkVersion Integer.parseInt(project.ANDROID_TARGET_SDK_VERSION)
     }
 }
 
 dependencies {
-    compile project(':bugsnag-android')
+    compile project(':sdk')
 }

bugsnag-android-unity/build.gradle

@@ -6,7 +6,17 @@ POM_URL=https://bugsnag.com
 POM_ARTIFACT_ID=bugsnag-android-unity
 POM_PACKAGING=aar
 
-ANDROID_BUILD_TARGET_SDK_VERSION=21
-ANDROID_BUILD_TOOLS_VERSION=25.0.2
-ANDROID_BUILD_SDK_VERSION=25
-ANDROID_BUILD_MIN_SDK_VERSION=4
+VERSION_NAME=4.0.0
+POM_SCM_URL=https://github.com/bugsnag/bugsnag-android
+POM_SCM_CONNECTION=scm:git@github.com:bugsnag/bugsnag-android.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:bugsnag/bugsnag-android.git
+POM_LICENCE_NAME=MIT
+POM_LICENCE_URL=http://opensource.org/licenses/MIT
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=loopj
+POM_DEVELOPER_NAME=James Smith
+POM_DEVELOPER_EMAIL=james@bugsnag.com
+ANDROID_MIN_SDK_VERSION=14
+ANDROID_TARGET_SDK_VERSION=26
+ANDROID_BUILD_TOOLS_VERSION=26.0.1
+ANDROID_COMPILE_SDK_VERSION=26

bugsnag-android-unity/gradle.properties

@@ -1,2 +1,2 @@
-include ':bugsnag-android'
-project(':bugsnag-android').projectDir = new File(rootProject.projectDir, '../bugsnag-android')
+include ':sdk'
+project(':sdk').projectDir = new File(rootProject.projectDir, '../bugsnag-android/sdk')

bugsnag-android-unity/settings.gradle

@@ -9,13 +9,11 @@ class UnityCallback implements Callback {
     static final String NOTIFIER_VERSION = "3.4.0";
     static final String NOTIFIER_URL = "https://github.com/bugsnag/bugsnag-unity";
 
-    private final Severity severity;
     private final String context;
     private final String logLevel;
 
-    UnityCallback(String context, Severity severity, String logLevel) {
+    UnityCallback(String context, String logLevel) {
         this.context = context;
-        this.severity = severity;
         this.logLevel = logLevel;
     }
 
@@ -26,12 +24,14 @@ public void beforeNotify(Report report) {
         report.setNotifierVersion(NOTIFIER_VERSION);
 
         com.bugsnag.android.Error error = report.getError();
-        error.setSeverity(severity);
         MetaData metadata = error.getMetaData();
         metadata.addToTab("Unity", "unityException", "true");
-        if (logLevel != null && logLevel.length() > 0)
+
+        if (logLevel != null && logLevel.length() > 0) {
             metadata.addToTab("Unity", "unityLogLevel", logLevel);
-        if (context != null && context.length() > 0)
+        }
+        if (context != null && context.length() > 0) {
             error.setContext(context);
+        }
     }
 }

bugsnag-android-unity/src/main/java/com/bugsnag/android/unity/UnityCallback.java

@@ -1,6 +1,8 @@
 package com.bugsnag.android.unity;
 
 import java.lang.String;
+import java.util.Map;
+import java.util.HashMap;
 
 import android.content.Context;
 
@@ -12,8 +14,18 @@ public static void init(Context androidContext, String apiKey) {
         Bugsnag.init(androidContext, apiKey);
     }
 
-    public static void notify(String name, String message, String context, StackTraceElement[] stacktrace, Severity severity, String logLevel) {
-        Bugsnag.notify(name, message, stacktrace, new UnityCallback(context, severity, logLevel));
+    public static void notify(String name, String message,
+                              String context, StackTraceElement[] stacktrace,
+                              Severity severity, String logLevel,
+                              String severityReason) {
+        Throwable t = new BugsnagException(name, message, stacktrace);
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("severity", severity.getName());
+        data.put("severityReason", severityReason);
+        data.put("logLevel", logLevel);
+
+        Bugsnag.getClient().internalClientNotify(t, data, false, new UnityCallback(context, logLevel));
     }
-}
 
+}