123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Jeremy Apthorp <[email protected]>
- Date: Thu, 30 Apr 2020 10:08:06 -0700
- Subject: crash: allow setting more options
- This allows the client of //components/crash to set upload url,
- rate-limiting, compression and global annotations.
- This should be upstreamed.
- diff --git a/components/crash/core/app/breakpad_linux.cc b/components/crash/core/app/breakpad_linux.cc
- index 00009dacdc2b084d7c647ab34c8c8be6decf1a5b..5eb19c8a47467d8df30316bfbd7f3c2f38aea7c0 100644
- --- a/components/crash/core/app/breakpad_linux.cc
- +++ b/components/crash/core/app/breakpad_linux.cc
- @@ -112,6 +112,7 @@ void SetUploadURL(const std::string& url) {
- }
- #endif
-
- +bool g_is_node = false;
- bool g_is_crash_reporter_enabled = false;
- uint64_t g_process_start_time = 0;
- pid_t g_pid = 0;
- diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc
- index 89b4bfccd5d3278231726184547378805fb30ed5..9f0cb9d52e2f7fc0c1808500b775bc28b4514d00 100644
- --- a/components/crash/core/app/crash_reporter_client.cc
- +++ b/components/crash/core/app/crash_reporter_client.cc
- @@ -139,6 +139,17 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
- return false;
- }
-
- +bool CrashReporterClient::GetShouldRateLimit() {
- + return true;
- +}
- +
- +bool CrashReporterClient::GetShouldCompressUploads() {
- + return true;
- +}
- +
- +void CrashReporterClient::GetProcessSimpleAnnotations(std::map<std::string, std::string>* annotations) {
- +}
- +
- #if defined(OS_ANDROID)
- unsigned int CrashReporterClient::GetCrashDumpPercentage() {
- return 100;
- diff --git a/components/crash/core/app/crash_reporter_client.h b/components/crash/core/app/crash_reporter_client.h
- index 39557cce474439238255ecd28030215085db0c81..5b3f980837911c710686ab91a2a81c318334080b 100644
- --- a/components/crash/core/app/crash_reporter_client.h
- +++ b/components/crash/core/app/crash_reporter_client.h
- @@ -5,6 +5,7 @@
- #ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
- #define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
-
- +#include <map>
- #include <string>
-
- #include "build/build_config.h"
- @@ -144,6 +145,19 @@ class CrashReporterClient {
- // that case, |breakpad_enabled| is set to the value enforced by policies.
- virtual bool ReportingIsEnforcedByPolicy(bool* breakpad_enabled);
-
- + // Returns true if crash uploads should be rate limited. If false, no
- + // throttling will be applied for uploads.
- + virtual bool GetShouldRateLimit();
- +
- + // Returns true if crash uploads should be compressed with gzip. If false,
- + // reports will be uploaded uncompressed.
- + virtual bool GetShouldCompressUploads();
- +
- + // Allows the client to add or edit global annotations passed to the crashpad
- + // handler.
- + virtual void GetProcessSimpleAnnotations(
- + std::map<std::string, std::string>* annotations);
- +
- #if defined(OS_ANDROID)
- // Used by WebView to sample crashes without generating the unwanted dumps. If
- // the returned value is less than 100, crash dumping will be sampled to that
- diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/app/crashpad_mac.mm
- index 2be2fd857bc5f6775e20fc595929d984c7543f8c..0d633410842cc4fcb9f1befe452c4fc0776d3af8 100644
- --- a/components/crash/core/app/crashpad_mac.mm
- +++ b/components/crash/core/app/crashpad_mac.mm
- @@ -86,6 +86,8 @@
- } // @autoreleasepool
- return process_annotations;
- }();
- + CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
- + crash_reporter_client->GetProcessSimpleAnnotations(&annotations);
- return annotations;
- }
-
- @@ -156,6 +158,13 @@ void DumpProcessWithoutCrashing(task_t task_port) {
-
- std::vector<std::string> arguments;
-
- + if (!crash_reporter_client->GetShouldRateLimit()) {
- + arguments.push_back("--no-rate-limit");
- + }
- + if (!crash_reporter_client->GetShouldCompressUploads()) {
- + arguments.push_back("--no-upload-gzip");
- + }
- +
- if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) {
- arguments.push_back("--monitor-self");
- }
- diff --git a/components/crash/core/app/crashpad_win.cc b/components/crash/core/app/crashpad_win.cc
- index 686be7964d77dbba91a6265d157d05d97d5823fb..3e4585f7ba14650fa8b7e644b026147e0bac5119 100644
- --- a/components/crash/core/app/crashpad_win.cc
- +++ b/components/crash/core/app/crashpad_win.cc
- @@ -89,6 +89,7 @@ base::FilePath PlatformCrashpadInitialization(
-
- std::map<std::string, std::string> process_annotations;
- GetPlatformCrashpadAnnotations(&process_annotations);
- + crash_reporter_client->GetProcessSimpleAnnotations(&process_annotations);
-
- std::string url = crash_reporter_client->GetUploadUrl();
-
- @@ -127,6 +128,13 @@ base::FilePath PlatformCrashpadInitialization(
-
- std::vector<std::string> arguments(start_arguments);
-
- + if (!crash_reporter_client->GetShouldRateLimit()) {
- + arguments.push_back("--no-rate-limit");
- + }
- + if (!crash_reporter_client->GetShouldCompressUploads()) {
- + arguments.push_back("--no-upload-gzip");
- + }
- +
- if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) {
- arguments.push_back("--monitor-self");
- for (const std::string& start_argument : start_arguments) {
|