[Feat][SDK-347] ANR report

.palantir/revapi.yml

@@ -45,3 +45,8 @@ acceptedBreaks:
         justification: "This is a binary compatible change, which could only break custom\
         \ implementations of our config interfaces, but those interfaces are not meant\
         \ to be implemented by users"
+      - code: "java.method.addedToInterface"
+        new: "method java.util.List<com.rollbar.api.payload.data.body.RollbarThread> com.rollbar.notifier.wrapper.ThrowableWrapper::getRollbarThreads()"
+        justification: "This is a binary compatible change, which could only break custom\
+      \ implementations of our config interfaces, but those interfaces are not meant\
+      \ to be implemented by users"

examples/rollbar-android/build.gradle

@@ -11,14 +11,14 @@ buildscript {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 30
     buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.rollbar.example.android"
-        minSdkVersion 16
+        minSdkVersion 21
         // FIXME: Pending further discussion
         //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 27
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -38,9 +38,9 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation 'org.slf4j:slf4j-android:1.7.25'
     testImplementation group: 'junit', name: 'junit', version: '4.12'
 }

examples/rollbar-android/src/main/AndroidManifest.xml

@@ -16,7 +16,8 @@
             android:theme="@style/AppTheme">
         <activity
                 android:name=".MainActivity"
-                android:label="@string/app_name"
+            android:exported="true"
+            android:label="@string/app_name"
                 android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

examples/rollbar-android/src/main/java/com/rollbar/example/android/MainActivity.java

@@ -1,14 +1,16 @@
 package com.rollbar.example.android;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
 import android.view.Menu;
 import android.view.MenuItem;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
 import com.rollbar.android.Rollbar;
 
 public class MainActivity extends AppCompatActivity {

examples/rollbar-android/src/main/res/layout/activity_main.xml

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.rollbar.example.android.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context="com.rollbar.example.android.MainActivity">
+        android:theme="@style/AppTheme.AppBarOverlay">
 
-    <android.support.design.widget.AppBarLayout
-            android:layout_height="wrap_content"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
-                app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main"/>
 
-    <android.support.design.widget.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            app:srcCompat="@android:drawable/ic_dialog_email"/>
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@android:drawable/ic_dialog_email"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

gradle.properties

@@ -1,6 +1,8 @@
 VERSION_NAME=2.0.0
 GROUP=com.rollbar
 
+android.useAndroidX=true
+
 POM_DESCRIPTION=For connecting your applications built on the JVM to Rollbar for Error Reporting
 POM_URL=https://github.com/rollbar/rollbar-java
 POM_SCM_URL=https://github.com/rollbar/rollbar-java

rollbar-android/build.gradle

@@ -18,14 +18,14 @@ apply from: "$rootDir/gradle/release.gradle"
 apply from: "$rootDir/gradle/android.quality.gradle"
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 30
     buildToolsVersion '30.0.3' // Going above here requires bumping the AGP to version 4+
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         // FIXME: Pending further discussion
         //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 27
+        targetSdkVersion 30
         consumerProguardFiles 'proguard-rules.pro'
         manifestPlaceholders = [notifierVersion: VERSION_NAME]
     }

rollbar-android/src/main/java/com/rollbar/android/AndroidConfiguration.java

@@ -0,0 +1,38 @@
+package com.rollbar.android;
+
+import com.rollbar.android.anr.AnrConfiguration;
+
+public class AndroidConfiguration {
+  private final AnrConfiguration anrConfiguration;
+
+  AndroidConfiguration(Builder builder) {
+    anrConfiguration = builder.anrConfiguration;
+  }
+
+  public AnrConfiguration getAnrConfiguration() {
+    return anrConfiguration;
+  }
+
+
+  public static final class Builder {
+    private AnrConfiguration anrConfiguration;
+
+    Builder() {
+      anrConfiguration = new AnrConfiguration.Builder().build();
+    }
+
+    /**
+     * The ANR configuration, if this field is null, no ANR would be captured
+     * @param anrConfiguration the ANR configuration
+     * @return the builder instance
+     */
+    public Builder setAnrConfiguration(AnrConfiguration anrConfiguration) {
+      this.anrConfiguration = anrConfiguration;
+      return this;
+    }
+
+    public AndroidConfiguration build() {
+      return new AndroidConfiguration(this);
+    }
+  }
+}

rollbar-android/src/main/java/com/rollbar/android/Rollbar.java

@@ -10,9 +10,14 @@
 import android.os.Bundle;
 
 import android.util.Log;
+
+import com.rollbar.android.anr.AnrDetector;
+import com.rollbar.android.anr.AnrDetectorFactory;
+import com.rollbar.android.anr.AnrException;
 import com.rollbar.android.notifier.sender.ConnectionAwareSenderFailureStrategy;
 import com.rollbar.android.provider.ClientProvider;
 import com.rollbar.api.payload.data.TelemetryType;
+import com.rollbar.api.payload.data.body.RollbarThread;
 import com.rollbar.notifier.config.ConfigProvider;
 import com.rollbar.notifier.uncaughtexception.RollbarUncaughtExceptionHandler;
 import com.rollbar.android.provider.NotifierProvider;
@@ -24,12 +29,18 @@
 import com.rollbar.notifier.sender.SyncSender;
 import com.rollbar.notifier.sender.queue.DiskQueue;
 import com.rollbar.notifier.util.ObjectsUtils;
+import com.rollbar.notifier.wrapper.RollbarThrowableWrapper;
+import com.rollbar.notifier.wrapper.ThrowableWrapper;
+
+import org.slf4j.LoggerFactory;
 
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -71,6 +82,28 @@ public static Rollbar init(Context context) {
     return init(context, null, null);
   }
 
+  /**
+   * Initialize the singleton instance of Rollbar.
+   * Defaults to reading the access token from the manifest, handling uncaught exceptions, and setting
+   * the environment to production.
+   *
+   * @param context Android context to use.
+   * @param androidConfiguration configuration for Android features.
+   * @return the managed instance of Rollbar.
+   */
+  public static Rollbar init(Context context, AndroidConfiguration androidConfiguration) {
+    return init(
+        context,
+        null,
+        DEFAULT_ENVIRONMENT,
+        DEFAULT_REGISTER_EXCEPTION_HANDLER,
+        DEFAULT_INCLUDE_LOGCAT,
+        DEFAULT_CONFIG_PROVIDER,
+        DEFAULT_SUSPEND_WHEN_NETWORK_IS_UNAVAILABLE,
+        androidConfiguration
+        );
+  }
+
   /**
    * Initialize the singleton instance of Rollbar.
    *
@@ -155,18 +188,71 @@ public static Rollbar init(Context context, String accessToken, String environme
   public static Rollbar init(Context context, String accessToken, String environment,
                              boolean registerExceptionHandler, boolean includeLogcat,
                              ConfigProvider provider, boolean suspendWhenNetworkIsUnavailable) {
+    return init(
+        context,
+        accessToken,
+        environment,
+        registerExceptionHandler,
+        includeLogcat,
+        provider,
+        suspendWhenNetworkIsUnavailable,
+        makeDefaultAndroidConfiguration()
+    );
+  }
+
+  /**
+   * Initialize the singleton instance of Rollbar.
+   *
+   * @param context     Android context to use.
+   * @param accessToken a Rollbar access token with at least post_client_item scope
+   * @param environment the environment to set for items
+   * @param registerExceptionHandler whether or not to handle uncaught exceptions.
+   * @param includeLogcat whether or not to include logcat output with items
+   * @param provider a configuration provider that can be used to customize the configuration further.
+   * @param suspendWhenNetworkIsUnavailable if true, sending occurrences will be suspended while the network is unavailable
+   * @param androidConfiguration configuration for Android features
+   * @return the managed instance of Rollbar.
+   */
+  public static Rollbar init(
+      Context context,
+      String accessToken,
+      String environment,
+      boolean registerExceptionHandler,
+      boolean includeLogcat,
+      ConfigProvider provider,
+      boolean suspendWhenNetworkIsUnavailable,
+      AndroidConfiguration androidConfiguration
+      ) {
     if (isInit()) {
       Log.w(TAG, "Rollbar.init() called when it was already initialized.");
       // This is likely an activity that was destroyed and recreated, so we need to update it
       notifier.updateContext(context);
     } else {
       notifier = new Rollbar(context, accessToken, environment, registerExceptionHandler,
-              includeLogcat, provider, DEFAULT_CAPTURE_IP, DEFAULT_MAX_LOGCAT_SIZE,
-              suspendWhenNetworkIsUnavailable);
+          includeLogcat, provider, DEFAULT_CAPTURE_IP, DEFAULT_MAX_LOGCAT_SIZE,
+          suspendWhenNetworkIsUnavailable);
+      if (androidConfiguration != null) {
+        initAnrDetector(context, androidConfiguration);
+      }
     }
+
     return notifier;
   }
 
+  private static void initAnrDetector(
+      Context context,
+      AndroidConfiguration androidConfiguration
+  ) {
+    AnrDetector anrDetector = AnrDetectorFactory.create(
+        context,
+        LoggerFactory.getLogger(AnrDetectorFactory.class),
+        androidConfiguration.getAnrConfiguration(),
+        error -> reportANR(error));
+    if (anrDetector != null) {
+      anrDetector.init();
+    }
+  }
+
   private void updateContext(Context context) {
     if (this.senderFailureStrategy != null) {
       this.senderFailureStrategy.updateContext(context);
@@ -836,6 +922,24 @@ public void log(Throwable error, Map<String, Object> custom, Level level) {
     log(error, custom, null, level);
   }
 
+  /**
+   * Record an error or message with extra data at the level specified. At least one of `error` or
+   * `description` must be non-null. If error is null, `description` will be sent as a message. If
+   * error is non-null, description will be sent as the description of the error. Custom data will
+   * be attached to message if the error is null. Custom data will extend whatever {@link
+   * Config#custom} returns.
+   *
+   * @param error the error (if any).
+   * @param custom the custom data (if any).
+   * @param description the description of the error, or the message to send.
+   * @param level the level to send it at.
+   * @param isUncaught whether this data comes from an uncaught exception.
+   */
+  public void log(ThrowableWrapper error, Map<String, Object> custom, String description,
+                  Level level, boolean isUncaught) {
+    rollbar.log(error, custom, description, level, isUncaught);
+  }
+
   /**
    * Log an error at level specified.
    *
@@ -1086,4 +1190,22 @@ private static void ensureInit(Runnable runnable) {
     }
   }
 
+  private static void reportANR(AnrException error){
+    List<RollbarThread> rollbarThreads = error.getThreads();
+
+    ThrowableWrapper throwableWrapper;
+
+    if (rollbarThreads == null) {
+      throwableWrapper = new RollbarThrowableWrapper(error);
+    } else {
+      throwableWrapper = new RollbarThrowableWrapper(error, rollbarThreads);
+    }
+
+    notifier.log(throwableWrapper, new HashMap<>(), "ANR", Level.CRITICAL, false);
+  }
+
+  private static AndroidConfiguration makeDefaultAndroidConfiguration() {
+    return new AndroidConfiguration.Builder().build();
+  }
+
 }