2020-05-07 20:31:26 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jeremy Apthorp <jeremya@chromium.org>
|
|
|
|
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/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc
|
2023-07-01 20:22:55 +00:00
|
|
|
index 3f3ed53d48fc4b19642cae847e69982782790e31..51d089f9fa0e1734f98f270a81a200beda71f2f4 100644
|
2020-05-07 20:31:26 +00:00
|
|
|
--- a/components/crash/core/app/crash_reporter_client.cc
|
|
|
|
+++ b/components/crash/core/app/crash_reporter_client.cc
|
2023-07-01 20:22:55 +00:00
|
|
|
@@ -141,6 +141,17 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
|
2020-05-07 20:31:26 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
+bool CrashReporterClient::GetShouldRateLimit() {
|
|
|
|
+ return true;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+bool CrashReporterClient::GetShouldCompressUploads() {
|
|
|
|
+ return true;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void CrashReporterClient::GetProcessSimpleAnnotations(std::map<std::string, std::string>* annotations) {
|
|
|
|
+}
|
|
|
|
+
|
2022-02-10 02:58:52 +00:00
|
|
|
#if BUILDFLAG(IS_ANDROID)
|
2020-05-07 20:31:26 +00:00
|
|
|
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
|
2023-04-13 01:10:31 +00:00
|
|
|
index a604df7a5ea6a1f5613acc032a65668364aadf89..93a8bf787bdaa0e4251a41453eb22062646f4bcb 100644
|
2020-05-07 20:31:26 +00:00
|
|
|
--- a/components/crash/core/app/crash_reporter_client.h
|
|
|
|
+++ b/components/crash/core/app/crash_reporter_client.h
|
2023-04-13 01:10:31 +00:00
|
|
|
@@ -7,6 +7,7 @@
|
|
|
|
|
|
|
|
#include <stdint.h>
|
2020-05-07 20:31:26 +00:00
|
|
|
|
|
|
|
+#include <map>
|
|
|
|
#include <string>
|
|
|
|
|
2021-03-04 17:27:05 +00:00
|
|
|
#include "build/build_config.h"
|
2023-04-13 01:10:31 +00:00
|
|
|
@@ -153,6 +154,19 @@ class CrashReporterClient {
|
2020-05-07 20:31:26 +00:00
|
|
|
// 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);
|
|
|
|
+
|
2022-02-10 02:58:52 +00:00
|
|
|
#if BUILDFLAG(IS_ANDROID)
|
2020-05-07 20:31:26 +00:00
|
|
|
// 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
|
2021-07-19 17:11:10 +00:00
|
|
|
diff --git a/components/crash/core/app/crashpad_linux.cc b/components/crash/core/app/crashpad_linux.cc
|
2022-10-03 20:21:00 +00:00
|
|
|
index 99efa6b245b9944710b76a342ec9a37947078a48..e55df93f17560a566e1dd2a63c560054edd772a5 100644
|
2021-07-19 17:11:10 +00:00
|
|
|
--- a/components/crash/core/app/crashpad_linux.cc
|
|
|
|
+++ b/components/crash/core/app/crashpad_linux.cc
|
2022-03-25 01:39:03 +00:00
|
|
|
@@ -170,6 +170,7 @@ bool PlatformCrashpadInitialization(
|
2021-07-19 17:11:10 +00:00
|
|
|
// where crash_reporter provides it's own values for lsb-release.
|
|
|
|
annotations["lsb-release"] = base::GetLinuxDistro();
|
|
|
|
#endif
|
|
|
|
+ crash_reporter_client->GetProcessSimpleAnnotations(&annotations);
|
|
|
|
|
|
|
|
std::vector<std::string> arguments;
|
|
|
|
if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) {
|
2022-03-25 01:39:03 +00:00
|
|
|
@@ -191,6 +192,13 @@ bool PlatformCrashpadInitialization(
|
2021-07-19 17:11:10 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
+ if (!crash_reporter_client->GetShouldRateLimit()) {
|
|
|
|
+ arguments.push_back("--no-rate-limit");
|
|
|
|
+ }
|
|
|
|
+ if (!crash_reporter_client->GetShouldCompressUploads()) {
|
|
|
|
+ arguments.push_back("--no-upload-gzip");
|
|
|
|
+ }
|
|
|
|
+
|
2022-06-27 20:50:08 +00:00
|
|
|
CHECK(client.StartHandler(handler_path, *database_path, metrics_path, url,
|
|
|
|
annotations, arguments, false, false));
|
|
|
|
} else {
|
2020-05-07 20:31:26 +00:00
|
|
|
diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/app/crashpad_mac.mm
|
chore: bump chromium to 118.0.5975.0 (main) (#39531)
* chore: bump chromium in DEPS to 118.0.5951.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894
No logic changes, but patch needed to be manually re-applied due to upstream code shear
* chore: update port_autofill_colors_to_the_color_pipeline.patch
No manual changes; patch applied with fuzz
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5953.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5955.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5957.0
* chore: update patches
* chore: include path of native_web_keyboard_event.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
* chore: remove reference to eextensions/browser/notification-types.h
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627
* chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689
Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code?
* chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198
* chore: add auto_pip_setting_helper.[cc,h] to chromium_src build
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277
Exiting upstream code used by chromium_src now depends on this new upstream class
* chore: bump chromium in DEPS to 118.0.5959.0
* chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
manually adjust patch to minor upstream chagnes
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5961.0
* chore: bump chromium in DEPS to 118.0.5963.0
* chore: update patches
* 4780994: Rename various base files to "apple" since iOS uses them too
https://chromium-review.googlesource.com/c/chromium/src/+/4780994
* Many files moved from `mac` -> `apple`
This commit follows a handful of CLs that simply rename files/symbols to change `mac`
to `apple`
to signify their use across both macOS and iOS:
- 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header
- 4790744: Move foundation_util to base/apple, leave a forwarding header
- 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header
- 4787627: Move and rename macOS+iOS base/ files in PA to "apple"
- 4780399: Move OSStatus logging to base/apple
- 4787387: Remove forwarding headers
- 4781113: Rename message_pump_mac to "apple" because iOS uses it too
* fixup minor patch update error
A function param got dropped from this patch somewhere earlier
* chore: bump chromium in DEPS to 118.0.5965.2
* chore: update patches
* 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base::apple::
https://chromium-review.googlesource.com/c/chromium/src/+/4799213
* Fix removed include to BrowserContext
In crrev.com/c/4767962 an include to BrowserContext was removed,
which was necessary for compilation. This broke only for us because
"chrome/browser/profiles/profile.h" includes that class, but we remove
all references to profiles.
* chore: bump chromium in DEPS to 118.0.5967.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5969.0
* chore: update patches
* chore: bump chromium in DEPS to 118.0.5971.0
* chore: bump chromium in DEPS to 118.0.5973.0
* chore: update patches
* 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper
https://chromium-review.googlesource.com/c/chromium/src/+/4772121
* 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate.
https://chromium-review.googlesource.com/c/chromium/src/+/4811164
* 4809488: Remove duplicate dnd functionality between Web and Renderer prefs
https://chromium-review.googlesource.com/c/chromium/src/+/4809488
Given that this is no longer an option of web preferences, we should
consider deprecating this option and then removing it.
* chore: bump chromium in DEPS to 118.0.5975.0
* chore: update patches
* fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build
* Reland "[windows] Remove RegKey::DeleteEmptyKey"
Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255
* Ensure StrCat means StrCat
Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180
* fixup! Remove RegKey::DeleteEmptyKey
* Consistently reject large p and large q in DH
Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
2023-09-01 06:54:59 +00:00
|
|
|
index eb5bcfe0234c39526d6d162434476fe9e32d8184..8480d07e2607eb3c8c16b54a02077c0454d11fce 100644
|
2020-05-07 20:31:26 +00:00
|
|
|
--- a/components/crash/core/app/crashpad_mac.mm
|
|
|
|
+++ b/components/crash/core/app/crashpad_mac.mm
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -87,6 +87,8 @@
|
2020-05-07 20:31:26 +00:00
|
|
|
} // @autoreleasepool
|
|
|
|
return process_annotations;
|
|
|
|
}();
|
|
|
|
+ CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
|
|
|
|
+ crash_reporter_client->GetProcessSimpleAnnotations(&annotations);
|
|
|
|
return annotations;
|
|
|
|
}
|
|
|
|
|
2023-08-15 15:49:41 +00:00
|
|
|
@@ -157,6 +159,13 @@ bool PlatformCrashpadInitialization(
|
2020-05-07 20:31:26 +00:00
|
|
|
|
|
|
|
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
|
2022-10-03 20:21:00 +00:00
|
|
|
index 9ab5fb1c822752854fc88ba0ee3d24ddca4dd107..11ae602ccc58cb2728911b28d6637079d2dcb359 100644
|
2020-05-07 20:31:26 +00:00
|
|
|
--- a/components/crash/core/app/crashpad_win.cc
|
|
|
|
+++ b/components/crash/core/app/crashpad_win.cc
|
2022-07-20 11:03:34 +00:00
|
|
|
@@ -91,6 +91,7 @@ bool PlatformCrashpadInitialization(
|
2020-05-07 20:31:26 +00:00
|
|
|
|
|
|
|
std::map<std::string, std::string> process_annotations;
|
|
|
|
GetPlatformCrashpadAnnotations(&process_annotations);
|
|
|
|
+ crash_reporter_client->GetProcessSimpleAnnotations(&process_annotations);
|
|
|
|
|
2020-05-15 03:09:02 +00:00
|
|
|
std::string url = crash_reporter_client->GetUploadUrl();
|
2020-05-07 20:31:26 +00:00
|
|
|
|
2022-07-20 11:03:34 +00:00
|
|
|
@@ -129,6 +130,13 @@ bool PlatformCrashpadInitialization(
|
2020-05-07 20:31:26 +00:00
|
|
|
|
|
|
|
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) {
|