Integrate Crashpad UMA

chrome/browser/metrics/chrome_metrics_service_client.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 92 matching lines @@
 #include "chrome/browser/signin/chrome_signin_status_metrics_provider_delegate.h"
 #include "components/signin/core/browser/signin_status_metrics_provider.h"
 #endif  // !defined(OS_CHROMEOS)
 
 namespace {
 
 // This specifies the amount of time to wait for all renderers to send their
 // data.
 const int kMaxHistogramGatheringWaitDuration = 60000;  // 60 seconds.
 
+// Needs to be kept in sync with the writer in
+// third_party/crashpad/crashpad/handler/handler_main.cc.
+const char kCrashpadHistogramAllocatorName[] = "CrashpadMetrics";
+
 // Checks whether it is the first time that cellular uploads logic should be
 // enabled based on whether the the preference for that logic is initialized.
 // This should happen only once as the used preference will be initialized
 // afterwards in |UmaSessionStats.java|.
 bool ShouldClearSavedMetrics() {
 #if BUILDFLAG(ANDROID_JAVA_UI)
   PrefService* local_state = g_browser_process->local_state();
   return !local_state->HasPrefPath(metrics::prefs::kMetricsReportingEnabled) &&
          metrics::IsCellularLogicEnabled();
 #else
   return false;
 #endif
 }
 
 void RegisterInstallerFileMetricsPreferences(PrefRegistrySimple* registry) {

[bcwhite, 2016/09/13 14:27:48]

How about changing the name of this function while you're here...

RegisterFileMetricsPreferences

[scottmg, 2016/09/13 19:15:32]

Done.

   metrics::FileMetricsProvider::RegisterPrefs(
       registry, ChromeMetricsServiceClient::kBrowserMetricsName);
 
 #if defined(OS_WIN)
   metrics::FileMetricsProvider::RegisterPrefs(
       registry, installer::kSetupHistogramAllocatorName);
 #endif
+
+  metrics::FileMetricsProvider::RegisterPrefs(registry,

[bcwhite, 2016/09/13 14:27:48]

Move above the windows-specific stuff.

[scottmg, 2016/09/13 19:15:32]

Done.

+                                              kCrashpadHistogramAllocatorName);
 }
 
 std::unique_ptr<metrics::FileMetricsProvider>
 CreateInstallerFileMetricsProvider(bool metrics_reporting_enabled) {

[bcwhite, 2016/09/13 14:27:48]

How about changing the name of this function while you're here...

CreateFileMetricsProvider

[scottmg, 2016/09/13 19:15:32]

Done.

   // Fetch a worker-pool for performing I/O tasks that are not allowed on
   // the main UI thread.
   scoped_refptr<base::TaskRunner> task_runner =
       content::BrowserThread::GetBlockingPool()
           ->GetTaskRunnerWithShutdownBehavior(
               base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
 
   // Create an object to monitor files of metrics and include them in reports.
   std::unique_ptr<metrics::FileMetricsProvider> file_metrics_provider(
       new metrics::FileMetricsProvider(task_runner,
@@ skipping 27 matching lines @@
   // Read metrics file from setup.exe.
   base::FilePath program_dir;
   base::PathService::Get(base::DIR_EXE, &program_dir);
   file_metrics_provider->RegisterSource(
       program_dir.AppendASCII(installer::kSetupHistogramAllocatorName),
       metrics::FileMetricsProvider::SOURCE_HISTOGRAMS_ATOMIC_DIR,
       metrics::FileMetricsProvider::ASSOCIATE_CURRENT_RUN,
       installer::kSetupHistogramAllocatorName);
 #endif
 
+  // Read the Crashpad metrics file.

[bcwhite, 2016/09/13 14:27:48]

Move above the windows-specific stuff.

[scottmg, 2016/09/13 19:15:32]

Done.

+  base::FilePath crashpad_metrics_file;
+  if (base::PathService::Get(chrome::DIR_CRASH_DUMPS, &crashpad_metrics_file)) {
+    crashpad_metrics_file =
+        crashpad_metrics_file.AppendASCII(kCrashpadHistogramAllocatorName)
+            .AddExtension(base::PersistentMemoryAllocator::kFileExtension);
+    if (metrics_reporting_enabled) {
+      file_metrics_provider->RegisterSource(
+          crashpad_metrics_file,
+          metrics::FileMetricsProvider::SOURCE_HISTOGRAMS_ATOMIC_FILE,
+          metrics::FileMetricsProvider::ASSOCIATE_PREVIOUS_RUN,
+          kCrashpadHistogramAllocatorName);
+    } else {
+      task_runner->PostTask(
+          FROM_HERE, base::Bind(base::IgnoreResult(&base::DeleteFile),
+                                crashpad_metrics_file, /*recursive=*/false));
+    }
+  }
+
   return file_metrics_provider;
 }
 
 // If there is a global metrics file being updated on disk, mark it to be
 // deleted when the process exits. A normal shutdown is almost complete
 // so there is no benefit in keeping a file with no new data to be processed
 // during the next startup sequence. Deleting the file during shutdown adds
 // an extra disk-access or two to shutdown but eliminates the unnecessary
 // processing of the contents during startup only to find nothing.
 void CleanUpGlobalPersistentHistogramStorage() {
@@ skipping 589 matching lines @@
   }
 }
 
 void ChromeMetricsServiceClient::OnURLOpenedFromOmnibox(OmniboxLog* log) {
   metrics_service_->OnApplicationNotIdle();
 }
 
 bool ChromeMetricsServiceClient::IsUMACellularUploadLogicEnabled() {
   return metrics::IsCellularLogicEnabled();
 }