Integrate Crashpad UMA

third_party/crashpad/crashpad/handler/handler_main.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "handler/handler_main.h"
 
 #include <getopt.h>
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
+#include "base/metrics/persistent_metrics_file_util.h"
 #include "base/scoped_generic.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "client/crash_report_database.h"
 #include "client/crashpad_client.h"
 #include "client/prune_crash_reports.h"
 #include "handler/crash_report_upload_thread.h"
 #include "handler/prune_crash_reports_thread.h"
 #include "tools/tool_support.h"
 #include "util/file/file_io.h"
@@ skipping 266 matching lines @@
   if (!options.database) {
     ToolSupport::UsageHint(me, "--database is required");
     return EXIT_FAILURE;
   }
 
   if (argc) {
     ToolSupport::UsageHint(me, nullptr);
     return EXIT_FAILURE;
   }
 
+  std::unique_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
+      base::FilePath(ToolSupport::CommandLineArgumentToFilePathStringType(
+          options.database))));
+  if (!database) {
+    return EXIT_FAILURE;
+  }
+
+  const base::FilePath metrics_dir(
+      ToolSupport::CommandLineArgumentToFilePathStringType(options.database));

[Mark Mentovai, 2016/09/13 21:35:56]

Hmm, this will delay the handshake with the browser, and the browser’s in turn
blocked on that.

[scottmg, 2016/09/13 21:46:24]

It will. :( It "only" creates the directory if it doesn't exist and sets a
couple in-memory variables, but on first run startup we have the cost of
creating that directory. All we need is a place to put the file where the
browser can find them -- I guess we should just put it in the User Data dir
directly instead of inside the Crashpad subdirectory since we can rely on the
installer to have created that one for us?

[Mark Mentovai, 2016/09/13 21:52:01]

Well, crashpad_handler won’t run at all unless the parent of database_dir
already exists. We’d hit the EXIT_FAILURE just above in that case.

But now that you bring this up, there’s another concern: we’ve never promised
that options.database is a directory. Some future database implementation might
stick a file there instead. I don’t think we should litter an arbitrary database
implementation’s innards with files it’s not expecting, either.

So there’s another argument in favor of just the user-data-dir.

+  const char kMetricsName[] = "CrashpadMetrics";
+  base::InitializeGlobalPersistentMetricsStorage(
+      metrics_dir, kMetricsName, 1 << 20);
+
 #if defined(OS_MACOSX)
   if (options.mach_service.empty()) {
     // Don’t do this when being run by launchd. See launchd.plist(5).
     CloseStdinAndStdout();
   }
 
   if (options.reset_own_crash_exception_port_to_system_default) {
     CrashpadClient::UseSystemDefaultHandler();
   }
 
@@ skipping 53 matching lines @@
       return EXIT_FAILURE;
     }
     if (!LoggingWriteFile(options.handshake_handle,
                           pipe_name.c_str(),
                           pipe_name.size() * sizeof(pipe_name[0]))) {
       return EXIT_FAILURE;
     }
   }
 #endif  // OS_MACOSX
 
-  std::unique_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
-      base::FilePath(ToolSupport::CommandLineArgumentToFilePathStringType(
-          options.database))));
-  if (!database) {
-    return EXIT_FAILURE;
-  }
-
   // TODO(scottmg): options.rate_limit should be removed when we have a
   // configurable database setting to control upload limiting.
   // See https://crashpad.chromium.org/bug/23.
   CrashReportUploadThread upload_thread(
       database.get(), options.url, options.rate_limit);
   upload_thread.Start();
 
   PruneCrashReportThread prune_thread(database.get(),
                                       PruneCondition::GetDefault());
   prune_thread.Start();
 
   CrashReportExceptionHandler exception_handler(
       database.get(), &upload_thread, &options.annotations);
 
   exception_handler_server.Run(&exception_handler);
 
   upload_thread.Stop();
   prune_thread.Stop();
 
+  base::CleanUpGlobalPersistentHistogramStorage();
+
   return EXIT_SUCCESS;
 }
 
 }  // namespace crashpad