[Android Crash Reporting] Allow uploading minidumps via the JobScheduler

components/minidump_uploader/android/java/src/org/chromium/components/minidump_uploader/MinidumpUploaderImpl.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.components.minidump_uploader;
 
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 
@@ skipping 30 matching lines @@
      * The thread used for the actual work of uploading minidumps.
      */
     private Thread mWorkerThread;
 
     @VisibleForTesting
     public static final int MAX_UPLOAD_TRIES_ALLOWED = 3;
 
     @VisibleForTesting
     public MinidumpUploaderImpl(MinidumpUploaderDelegate delegate) {
         mDelegate = delegate;
-        mFileManager = createCrashFileManager(mDelegate.createCrashDir());
+        mFileManager = createCrashFileManager(mDelegate.getCrashParentDir());
         if (!mFileManager.ensureCrashDirExists()) {
             Log.e(TAG, "Crash directory doesn't exist!");
         }
     }
 
     /**
      * Utility method to allow tests to customize the behavior of the crash file manager.
-     * @param {crashDir} The directory in which to store crash files (i.e. minidumps).
+     * @param {crashParentDir} The directory that contains the "Crash Reports" directory, in which
+     *     crash files (i.e. minidumps) are stored.
      */
     @VisibleForTesting
-    public CrashFileManager createCrashFileManager(File crashDir) {
-        return new CrashFileManager(crashDir);
+    public CrashFileManager createCrashFileManager(File crashParentDir) {
+        return new CrashFileManager(crashParentDir);
     }
 
     /**
      * Utility method to allow us to test the logic of this class by injecting
      * test-specific MinidumpUploadCallables.
      */
     @VisibleForTesting
     public MinidumpUploadCallable createMinidumpUploadCallable(File minidumpFile, File logfile) {
         return new MinidumpUploadCallable(
                 minidumpFile, logfile, mDelegate.createCrashReportingPermissionManager());
     }
 
     /**
      * 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);
+            Log.i(TAG, "Attempting to upload %d minidumps.", minidumps.length);
             for (File minidump : minidumps) {
+                Log.i(TAG, "Attempting to upload " + minidump.getName());
                 MinidumpUploadCallable uploadCallable = createMinidumpUploadCallable(
                         minidump, mFileManager.getCrashUploadLogFile());
                 int uploadResult = uploadCallable.call();
 
+                // Record metrics about the upload.
+                if (uploadResult == MinidumpUploadCallable.UPLOAD_SUCCESS) {
+                    mDelegate.recordUploadSuccess(minidump);
+                } else if (uploadResult == MinidumpUploadCallable.UPLOAD_FAILURE) {
+                    // Only record a failure after we have maxed out the allotted tries.
+                    // Note: Add 1 to include the most recent failure, since the minidump's filename
+                    // is from before the failure.
+                    int numFailures = CrashFileManager.readAttemptNumber(minidump.getName()) + 1;
+                    if (numFailures == MAX_UPLOAD_TRIES_ALLOWED) {
+                        mDelegate.recordUploadFailure(minidump);
+                    }
+                }
+
                 // Bail if the job was canceled. Note that the cancelation status is checked AFTER
                 // trying to upload a minidump. This is to ensure that the scheduler attempts to
                 // upload at least one minidump per job. Otherwise, it's possible for a crash loop
                 // to continually write files to the crash directory; each such write would
                 // reschedule the job, and therefore cancel any pending jobs. In such a scenario,
                 // it's important to make at least *some* progress uploading minidumps.
                 // Note that other likely cancelation reasons are not a concern, because the upload
                 // callable checks relevant state prior to uploading. For example, if the job is
                 // canceled because the network connection is lost, or because the user switches
                 // over to a metered connection, the callable will detect the changed network state,
@@ skipping 61 matching lines @@
 
         // Reschedule if there are still minidumps to upload.
         return mFileManager.getAllMinidumpFiles(MAX_UPLOAD_TRIES_ALLOWED).length > 0;
     }
 
     @VisibleForTesting
     public void joinWorkerThreadForTesting() throws InterruptedException {
         mWorkerThread.join();
     }
 }