[Android Crash Reporting] Componentize MinidumpUploadImpl.java

android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java

Index: android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java
diff --git a/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java b/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java
similarity index 37%
copy from android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
copy to android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java
index 14227a5ec489dbb18d8ae6ca430dccac6796c31b..1b2e7f8ef6b2dccc2495bd6431d4b5defe8b4371 100644
--- a/android_webview/java/src/org/chromium/android_webview/crash/MinidumpUploaderImpl.java
+++ b/android_webview/java/src/org/chromium/android_webview/crash/AwMinidumpUploaderDelegate.java
@@ -12,88 +12,36 @@ import android.webkit.ValueCallback;
 import org.chromium.android_webview.PlatformServiceBridge;
 import org.chromium.android_webview.command_line.CommandLineUtil;
 import org.chromium.base.CommandLine;
-import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
-import org.chromium.components.minidump_uploader.CrashFileManager;
-import org.chromium.components.minidump_uploader.MinidumpUploadCallable;
-import org.chromium.components.minidump_uploader.MinidumpUploader;
+import org.chromium.components.minidump_uploader.MinidumpUploaderDelegate;
 import org.chromium.components.minidump_uploader.util.CrashReportingPermissionManager;
 
 import java.io.File;
 
 /**
- * Class in charge of uploading Minidumps from WebView's data directory.
- * This class gets invoked from a JobScheduler job and posts the operation of uploading minidumps to
- * a privately defined worker thread.
- * Note that this implementation is state-less in the sense that it doesn't keep track of whether it
- * successfully uploaded any minidumps. At the end of a job it simply checks whether there are any
- * minidumps left to upload, and if so, the job is rescheduled.
+ * Android Webview-specific implementations for minidump uploading logic.
  */
-public class MinidumpUploaderImpl implements MinidumpUploader {
-    private static final String TAG = "MinidumpUploaderImpl";
-    private Context mContext;
-    private Thread mWorkerThread;
+public class AwMinidumpUploaderDelegate implements MinidumpUploaderDelegate {
+    private final Context mContext;
     private final ConnectivityManager mConnectivityManager;
-    private final CrashFileManager mFileManager;
 
-    private boolean mCancelUpload = false;
-
-    private final boolean mCleanOutMinidumps;
     private boolean mPermittedByUser = false;
 
     @VisibleForTesting
-    public static final int MAX_UPLOAD_TRIES_ALLOWED = 3;
-
-    /**
-     * Notify the worker thread that the current job has been canceled - so we shouldn't upload any
-     * more minidumps.
-     */
-    private void setCancelUpload(boolean cancel) {
-        mCancelUpload = cancel;
-    }
-
-    /**
-     * Check whether the current job has been canceled.
-     */
-    private boolean getCancelUpload() {
-        return mCancelUpload;
-    }
-
-    @VisibleForTesting
-    public MinidumpUploaderImpl(Context context, boolean cleanOutMinidumps) {
+    public AwMinidumpUploaderDelegate(Context context) {
+        mContext = context;
         mConnectivityManager =
                 (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        mContext = context;
-        File webviewCrashDir = CrashReceiverService.createWebViewCrashDir(context);
-        mFileManager = new CrashFileManager(webviewCrashDir);
-        if (!mFileManager.ensureCrashDirExists()) {
-            Log.e(TAG, "Crash directory doesn't exist!");
-        }
-        mCleanOutMinidumps = cleanOutMinidumps;
     }
 
-    /**
-     * Utility method to allow us to test the logic of this class by injecting
-     * test-MinidumpUploadCallables.
-     */
-    @VisibleForTesting
-    public MinidumpUploadCallable createMinidumpUploadCallable(File minidumpFile, File logfile) {
-        return new MinidumpUploadCallable(
-                minidumpFile, logfile, createWebViewCrashReportingManager());
-    }
-
-    /**
-     * Utility method to allow us to test the logic of this class by injecting
-     * a test-PlatformServiceBridge.
-     */
-    @VisibleForTesting
-    public PlatformServiceBridge createPlatformServiceBridge() {
-        return PlatformServiceBridge.getInstance(mContext);
+    @Override
+    public File createCrashDir() {
+        return CrashReceiverService.createWebViewCrashDir(mContext);
     }
 
-    @VisibleForTesting
-    protected CrashReportingPermissionManager createWebViewCrashReportingManager() {
+    @Override
+    public CrashReportingPermissionManager createCrashReportingPermissionManager() {
         return new CrashReportingPermissionManager() {
             @Override
             public boolean isClientInMetricsSample() {
@@ -108,6 +56,9 @@ public class MinidumpUploaderImpl implements MinidumpUploader {
             public boolean isNetworkAvailableForCrashUploads() {
                 // JobScheduler will call onStopJob causing our upload to be interrupted when our
                 // network requirements no longer hold.
+                // TODO(isherman): This code should really be shared with Chrome. Especially, Chrome

[gsennton, 2017/02/27 18:54:55]

I assume you are implying that Chrome should be checking for unmetered networks
as well? (since the JobService will only run jobs on unmetered connections).

[Ilya Sherman, 2017/02/28 03:54:13]

Indeed!  Rephrased the comment to hopefully clarify that.

+                // checks for WiFi networks, rather than checking for whether the network is
+                // metered.
                 NetworkInfo networkInfo = mConnectivityManager.getActiveNetworkInfo();
                 if (networkInfo == null || !networkInfo.isConnected()) return false;
                 return !mConnectivityManager.isActiveNetworkMetered();
@@ -133,73 +84,15 @@ public class MinidumpUploaderImpl implements MinidumpUploader {
                 // Note that CommandLine/CommandLineUtil are not thread safe. They are initialized
                 // on the main thread, but before the current worker thread started - so this thread
                 // will have seen the initialization of the CommandLine.
+                ThreadUtils.assertOnUiThread();
                 return CommandLine.getInstance().hasSwitch(
                         CommandLineUtil.CRASH_UPLOADS_ENABLED_FOR_TESTING_SWITCH);
             }
         };
     }
 
-    /**
-     * Runnable that upload minidumps.
-     * This is where the actual uploading happens - an upload job consists of posting this Runnable
-     * to the worker thread.
-     */
-    private class UploadRunnable implements Runnable {
-        private final MinidumpUploader.UploadsFinishedCallback mUploadsFinishedCallback;
-
-        public UploadRunnable(MinidumpUploader.UploadsFinishedCallback uploadsFinishedCallback) {
-            mUploadsFinishedCallback = uploadsFinishedCallback;
-        }
-
-        @Override
-        public void run() {
-            File[] minidumps = mFileManager.getAllMinidumpFiles(MAX_UPLOAD_TRIES_ALLOWED);
-            for (File minidump : minidumps) {
-                // Store the name of the current minidump so that we can mark it as a failure from
-                // the main thread if JobScheduler tells us to stop.
-                MinidumpUploadCallable uploadCallable = createMinidumpUploadCallable(
-                        minidump, mFileManager.getCrashUploadLogFile());
-                int uploadResult = uploadCallable.call();
-
-                // Job was canceled -> early out: any clean-up will be performed in cancelUploads().
-                // Note that we check whether we are canceled AFTER trying to upload a minidump -
-                // this is to allow the uploading of at least one minidump per job (to deal with
-                // cases where we reschedule jobs over and over again and would never upload any
-                // minidumps because old jobs are canceled when scheduling new jobs).
-                if (getCancelUpload()) return;
-
-                if (uploadResult == MinidumpUploadCallable.UPLOAD_FAILURE) {
-                    String newName = CrashFileManager.tryIncrementAttemptNumber(minidump);
-                    if (newName == null) {
-                        Log.w(TAG, "Failed to increment attempt number of " + minidump);
-                    }
-                }
-            }
-
-            // Clean out old/uploaded minidumps. Note that this clean-up method is more strict than
-            // our copying mechanism in the sense that it keeps less minidumps.
-            if (mCleanOutMinidumps) {
-                mFileManager.cleanOutAllNonFreshMinidumpFiles();
-            }
-
-            // Reschedule if there are still minidumps to upload.
-            boolean reschedule =
-                    mFileManager.getAllMinidumpFiles(MAX_UPLOAD_TRIES_ALLOWED).length > 0;
-            mUploadsFinishedCallback.uploadsFinished(reschedule);
-        }
-    }
-
     @Override
-    public void uploadAllMinidumps(
-            final MinidumpUploader.UploadsFinishedCallback uploadsFinishedCallback) {
-        // This call should happen on the main thread
-        ThreadUtils.assertOnUiThread();
-        if (mWorkerThread != null) {
-            throw new RuntimeException("Only one upload-job should be active at a time");
-        }
-        mWorkerThread = new Thread(new UploadRunnable(uploadsFinishedCallback), "mWorkerThread");
-        setCancelUpload(false);
-
+    public void prepareToUploadMinidumps(final Runnable startUploads) {
         createPlatformServiceBridge().queryMetricsSetting(new ValueCallback<Boolean>() {
             public void onReceiveValue(Boolean enabled) {
                 // This callback should be received on the main thread (e.g. mWorkerThread
@@ -207,35 +100,18 @@ public class MinidumpUploaderImpl implements MinidumpUploader {
                 ThreadUtils.assertOnUiThread();
 
                 mPermittedByUser = enabled;
-                // Note that our job might have been cancelled by this time - however, we do start
-                // our worker thread anyway to try to make some progress towards uploading
-                // minidumps.
-                // This is to ensure that in the case where an app is crashing over and over again
-                // - and we are rescheduling jobs over and over again - we are still uploading at
-                // least one minidump per job, as long as that job starts before it is canceled by
-                // the next job.
-                // For cases where the job is cancelled because the network connection is lost, or
-                // because we switch over to a metered connection, we won't try to upload any
-                // minidumps anyway since we check the network connection just before the upload of
-                // each minidump.
-                mWorkerThread.start();
+
+                startUploads.run();
             }
         });
     }
 
-    @VisibleForTesting
-    public void joinWorkerThreadForTesting() throws InterruptedException {
-        mWorkerThread.join();
-    }
-
     /**
-     * @return whether to reschedule the uploads.
+     * Utility method to allow us to test the logic of this class by injecting
+     * a test-PlatformServiceBridge.
      */
-    @Override
-    public boolean cancelUploads() {
-        setCancelUpload(true);
-
-        // Reschedule if there are still minidumps to upload.
-        return mFileManager.getAllMinidumpFiles(MAX_UPLOAD_TRIES_ALLOWED).length > 0;
+    @VisibleForTesting
+    public PlatformServiceBridge createPlatformServiceBridge() {
+        return PlatformServiceBridge.getInstance(mContext);
     }
 }