Enabling sampling of UMA and crash reports on Android.

chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java

 // Copyright 2015 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.chrome.browser.crash;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.support.annotation.IntDef;
 
@@ skipping 34 matching lines @@
     protected static final String PREF_LAST_UPLOAD_DAY = "crash_dump_last_upload_day";
     protected static final String PREF_LAST_UPLOAD_WEEK = "crash_dump_last_upload_week";
     protected static final String PREF_WEEK_UPLOAD_SIZE = "crash_dump_week_upload_size";
 
     @VisibleForTesting
     protected static final String CRASH_URL_STRING = "https://clients2.google.com/cr/report";
 
     @VisibleForTesting
     protected static final String CONTENT_TYPE_TMPL = "multipart/form-data; boundary=%s";
 
-    @IntDef({
-        UPLOAD_SUCCESS,
-        UPLOAD_FAILURE,
-        UPLOAD_USER_DISABLED,
-        UPLOAD_COMMANDLINE_DISABLED
-    })
+    @IntDef({UPLOAD_SUCCESS, UPLOAD_FAILURE, UPLOAD_USER_DISABLED, UPLOAD_COMMANDLINE_DISABLED,
+            UPLOAD_DISABLED_BY_SAMPLING})

[Ilya Sherman, 2016/08/24 05:02:50]

Could you please revert the format change here?  Or is this the "correct"
formatting?  The previous one was certainly more scannable.

[jwd, 2016/08/24 15:06:28]

Yeah, it's the result of git cl format. I reverted it once, because I prefered
the manual version, but I didn't want to keep fighting with the formatter.

     public @interface MinidumpUploadStatus {}
     public static final int UPLOAD_SUCCESS = 0;
     public static final int UPLOAD_FAILURE = 1;
     public static final int UPLOAD_USER_DISABLED = 2;
     public static final int UPLOAD_COMMANDLINE_DISABLED = 3;
+    public static final int UPLOAD_DISABLED_BY_SAMPLING = 4;
 
     private final File mFileToUpload;
     private final File mLogfile;
     private final HttpURLConnectionFactory mHttpURLConnectionFactory;
     private final CrashReportingPermissionManager mPermManager;
 
     public MinidumpUploadCallable(File fileToUpload, File logfile, Context context) {
         this(fileToUpload, logfile, new HttpURLConnectionFactoryImpl(),
                 PrivacyPreferencesManager.getInstance());
         removeOutdatedPrefs(ContextUtils.getAppSharedPreferences());
@@ skipping 19 matching lines @@
         if (mPermManager.isUploadEnabledForTests()) {
             Log.i(TAG, "Minidump upload enabled for tests, skipping other checks.");
         } else {
             if (!mPermManager.isUploadUserPermitted()) {
                 Log.i(TAG, "Minidump upload is not permitted by user. Marking file as uploaded for "
                         + "cleanup to prevent future uploads.");
                 cleanupMinidumpFile();
                 return UPLOAD_USER_DISABLED;
             }
 
+            if (!mPermManager.isClientInMetricsSample()) {
+                Log.i(TAG, "Minidump cannot be uploaded due to sampling.");

[Ilya Sherman, 2016/08/24 05:02:50]

nit: This is super nitpicky, but I'd log something more like "Minidump upload
skipped due to sampling.  Marking file as uploaded for cleanup to prevent future
uploads."

That second sentence should be modified according to what we actually do with
the file.

[jwd, 2016/08/24 15:06:28]

Done.

+                return UPLOAD_DISABLED_BY_SAMPLING;
+            }
+
             boolean isLimited = mPermManager.isUploadLimited();
             if (isLimited || !mPermManager.isUploadPermitted()) {
                 Log.i(TAG, "Minidump cannot currently be uploaded due to constraints.");
                 return UPLOAD_FAILURE;
             }
         }
 
         HttpURLConnection connection =
                 mHttpURLConnectionFactory.createHttpURLConnection(CRASH_URL_STRING);
         if (connection == null) {
@@ skipping 201 matching lines @@
     // TODO(gayane): Remove this function and unused prefs in M51. crbug.com/555022
     private void removeOutdatedPrefs(SharedPreferences sharedPreferences) {
         SharedPreferences.Editor editor = sharedPreferences.edit();
         editor.remove(PREF_DAY_UPLOAD_COUNT)
               .remove(PREF_LAST_UPLOAD_DAY)
               .remove(PREF_LAST_UPLOAD_WEEK)
               .remove(PREF_WEEK_UPLOAD_SIZE)
               .apply();
     }
 }