Revert "arc: Implement smaller dumpstate output"
This reverts commit f56bbb2bc0d65190bdb660ab359eb4697e928245.
Bug: 142684959
Bug: 136273873
Test: atest dumpstate_test
Change-Id: I9c5c007c2f630f06225e5e2b6229c1f3473f181f
diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index d4c1616..5359619 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1367,53 +1367,6 @@
printf("\n");
}
-static void DumpstateArcOnly() {
- // Trimmed-down version of dumpstate to only include a whitelisted
- // set of logs (system log, event log, and system server / system app
- // crashes, and ARC networking logs). See b/136273873 and b/138459828
- // for context. New sections must be first approved by Chrome OS Privacy
- // and then added to server side cros monitoring PII scrubber before adding
- // them here. See cl/312126645 for an example.
- DurationReporter duration_reporter("DUMPSTATE");
- unsigned long timeout_ms;
- // calculate timeout
- timeout_ms = logcat_timeout({"main", "system", "crash"});
- RunCommand("SYSTEM LOG",
- {"logcat", "-v", "threadtime", "-v", "printable", "-v", "uid", "-d", "*:v"},
- CommandOptions::WithTimeoutInMs(timeout_ms).Build());
- timeout_ms = logcat_timeout({"events"});
- RunCommand(
- "EVENT LOG",
- {"logcat", "-b", "events", "-v", "threadtime", "-v", "printable", "-v", "uid", "-d", "*:v"},
- CommandOptions::WithTimeoutInMs(timeout_ms).Build());
-
- printf("========================================================\n");
- printf("== Networking Service\n");
- printf("========================================================\n");
-
- // ARC networking service implements dumpsys by reusing the 'wifi' service name.
- // The top-level handler is implemented in handleDump() in
- // vendor/google_arc/libs/arc-services/src/com/android/server/arc/net/ArcNetworkService.java.
- // It outputs a subset of Android system server state relevant for debugging ARC
- // connectivity issues, in a PII-free manner. See b/147270970.
- RunDumpsys("DUMPSYS NETWORK_SERVICE_LIMITED", {"wifi", "-a"},
- CommandOptions::WithTimeout(90).Build(), SEC_TO_MSEC(10));
-
- printf("========================================================\n");
- printf("== Dropbox crashes\n");
- printf("========================================================\n");
-
- RunDumpsys("DROPBOX SYSTEM SERVER CRASHES", {"dropbox", "-p", "system_server_crash"});
- RunDumpsys("DROPBOX SYSTEM APP CRASHES", {"dropbox", "-p", "system_app_crash"});
-
- printf("========================================================\n");
- printf("== Final progress (pid %d): %d/%d (estimated %d)\n", ds.pid_, ds.progress_->Get(),
- ds.progress_->GetMax(), ds.progress_->GetInitialMax());
- printf("========================================================\n");
- printf("== dumpstate: done (id %d)\n", ds.id_);
- printf("========================================================\n");
-}
-
// Dumps various things. Returns early with status USER_CONSENT_DENIED if user denies consent
// via the consent they are shown. Ignores other errors that occur while running various
// commands. The consent checking is currently done around long running tasks, which happen to
@@ -2100,7 +2053,7 @@
static void ShowUsage() {
fprintf(stderr,
"usage: dumpstate [-h] [-b soundfile] [-e soundfile] [-d] [-p] "
- "[-z] [-s] [-S] [-q] [-P] [-R] [-A] [-V version]\n"
+ "[-z] [-s] [-S] [-q] [-P] [-R] [-V version]\n"
" -h: display this help message\n"
" -b: play sound file instead of vibrate, at beginning of job\n"
" -e: play sound file instead of vibrate, at end of job\n"
@@ -2113,7 +2066,6 @@
" -P: send broadcast when started and do progress updates\n"
" -R: take bugreport in remote mode (requires -z and -d, shouldn't be used with -P)\n"
" -w: start binder service and make it wait for a call to startBugreport\n"
- " -A: output limited information that is safe for submission in ARC++ bugreports\n"
" -v: prints the dumpstate header and exit\n");
}
@@ -2359,12 +2311,13 @@
"do_zip_file: %d do_vibrate: %d use_socket: %d use_control_socket: %d do_screenshot: %d "
"is_remote_mode: %d show_header_only: %d do_start_service: %d telephony_only: %d "
"wifi_only: %d do_progress_updates: %d fd: %d bugreport_mode: %s dumpstate_hal_mode: %s "
- "arc_only: %d args: %s\n",
+ "args: %s\n",
options.do_zip_file, options.do_vibrate, options.use_socket, options.use_control_socket,
options.do_screenshot, options.is_remote_mode, options.show_header_only,
- options.do_start_service, options.telephony_only, options.wifi_only,
- options.do_progress_updates, options.bugreport_fd.get(), options.bugreport_mode.c_str(),
- toString(options.dumpstate_hal_mode).c_str(), options.arc_only, options.args.c_str());
+ options.do_start_service,
+ options.telephony_only, options.wifi_only, options.do_progress_updates,
+ options.bugreport_fd.get(), options.bugreport_mode.c_str(),
+ toString(options.dumpstate_hal_mode).c_str(), options.args.c_str());
}
void Dumpstate::DumpOptions::Initialize(BugreportMode bugreport_mode,
@@ -2386,7 +2339,7 @@
Dumpstate::RunStatus Dumpstate::DumpOptions::Initialize(int argc, char* argv[]) {
RunStatus status = RunStatus::OK;
int c;
- while ((c = getopt(argc, argv, "dho:svqzpAPBRSV:w")) != -1) {
+ while ((c = getopt(argc, argv, "dho:svqzpPBRSV:w")) != -1) {
switch (c) {
// clang-format off
case 'd': do_add_date = true; break;
@@ -2398,7 +2351,6 @@
case 'p': do_screenshot = true; break;
case 'P': do_progress_updates = true; break;
case 'R': is_remote_mode = true; break;
- case 'A': arc_only = true; break;
case 'V': break; // compatibility no-op
case 'w':
// This was already processed
@@ -2683,7 +2635,6 @@
// duration is logged into MYLOG instead.
PrintHeader();
- // TODO(nandana) reduce code repetition in if branches
if (options_->telephony_only) {
MaybeTakeEarlyScreenshot();
onUiIntensiveBugreportDumpsFinished(calling_uid, calling_package);
@@ -2695,11 +2646,6 @@
onUiIntensiveBugreportDumpsFinished(calling_uid, calling_package);
MaybeCheckUserConsent(calling_uid, calling_package);
DumpstateWifiOnly();
- } else if (options_->arc_only) {
- MaybeTakeEarlyScreenshot();
- onUiIntensiveBugreportDumpsFinished(calling_uid, calling_package);
- MaybeCheckUserConsent(calling_uid, calling_package);
- DumpstateArcOnly();
} else {
// Invoke critical dumpsys first to preserve system state, before doing anything else.
RunDumpsysCritical();
diff --git a/cmds/dumpstate/dumpstate.h b/cmds/dumpstate/dumpstate.h
index c8c9f45..28d8936 100644
--- a/cmds/dumpstate/dumpstate.h
+++ b/cmds/dumpstate/dumpstate.h
@@ -377,8 +377,6 @@
bool do_start_service = false;
bool telephony_only = false;
bool wifi_only = false;
- // Trimmed-down version of dumpstate to only include whitelisted logs.
- bool arc_only = false;
// Whether progress updates should be published.
bool do_progress_updates = false;
// The mode we'll use when calling IDumpstateDevice::dumpstateBoard.
diff --git a/cmds/dumpstate/main.cpp b/cmds/dumpstate/main.cpp
index f1342a5..68d3733 100644
--- a/cmds/dumpstate/main.cpp
+++ b/cmds/dumpstate/main.cpp
@@ -30,7 +30,7 @@
bool do_wait = false;
int c;
// Keep flags in sync with Dumpstate::DumpOptions::Initialize.
- while ((c = getopt(argc, argv, "dho:svqzpAPBRSV:w")) != -1 && !do_wait) {
+ while ((c = getopt(argc, argv, "wdho:svqzpPBRSV:")) != -1 && !do_wait) {
switch (c) {
case 'w':
do_wait = true;
diff --git a/cmds/dumpstate/tests/dumpstate_test.cpp b/cmds/dumpstate/tests/dumpstate_test.cpp
index 7078521..9871a3b 100644
--- a/cmds/dumpstate/tests/dumpstate_test.cpp
+++ b/cmds/dumpstate/tests/dumpstate_test.cpp
@@ -179,7 +179,6 @@
EXPECT_FALSE(options_.do_screenshot);
EXPECT_FALSE(options_.do_progress_updates);
EXPECT_FALSE(options_.is_remote_mode);
- EXPECT_FALSE(options_.arc_only);
EXPECT_EQ(options_.dumpstate_hal_mode, DumpstateMode::DEFAULT);
}
@@ -207,7 +206,6 @@
EXPECT_FALSE(options_.do_progress_updates);
EXPECT_FALSE(options_.is_remote_mode);
EXPECT_FALSE(options_.use_socket);
- EXPECT_FALSE(options_.arc_only);
EXPECT_EQ(options_.dumpstate_hal_mode, DumpstateMode::DEFAULT);
}
@@ -233,7 +231,6 @@
EXPECT_FALSE(options_.do_screenshot);
EXPECT_FALSE(options_.do_progress_updates);
EXPECT_FALSE(options_.is_remote_mode);
- EXPECT_FALSE(options_.arc_only);
EXPECT_EQ(options_.dumpstate_hal_mode, DumpstateMode::DEFAULT);
}
@@ -252,7 +249,6 @@
EXPECT_FALSE(options_.is_remote_mode);
EXPECT_FALSE(options_.use_socket);
EXPECT_FALSE(options_.do_start_service);
- EXPECT_FALSE(options_.arc_only);
}
TEST_F(DumpOptionsTest, InitializeInteractiveBugReport) {
@@ -270,7 +266,6 @@
EXPECT_FALSE(options_.show_header_only);
EXPECT_FALSE(options_.is_remote_mode);
EXPECT_FALSE(options_.use_socket);
- EXPECT_FALSE(options_.arc_only);
}
TEST_F(DumpOptionsTest, InitializeRemoteBugReport) {
@@ -287,7 +282,6 @@
EXPECT_FALSE(options_.show_header_only);
EXPECT_FALSE(options_.do_progress_updates);
EXPECT_FALSE(options_.use_socket);
- EXPECT_FALSE(options_.arc_only);
}
TEST_F(DumpOptionsTest, InitializeWearBugReport) {
@@ -305,7 +299,6 @@
EXPECT_FALSE(options_.show_header_only);
EXPECT_FALSE(options_.is_remote_mode);
EXPECT_FALSE(options_.use_socket);
- EXPECT_FALSE(options_.arc_only);
}
TEST_F(DumpOptionsTest, InitializeTelephonyBugReport) {
@@ -323,7 +316,6 @@
EXPECT_FALSE(options_.show_header_only);
EXPECT_FALSE(options_.is_remote_mode);
EXPECT_FALSE(options_.use_socket);
- EXPECT_FALSE(options_.arc_only);
}
TEST_F(DumpOptionsTest, InitializeWifiBugReport) {
@@ -341,37 +333,6 @@
EXPECT_FALSE(options_.do_progress_updates);
EXPECT_FALSE(options_.is_remote_mode);
EXPECT_FALSE(options_.use_socket);
- EXPECT_FALSE(options_.arc_only);
-}
-
-TEST_F(DumpOptionsTest, InitializeArcOnlyBugreport) {
- // clang-format off
- char* argv[] = {
- const_cast<char*>("dumpstatez"),
- const_cast<char*>("-S"),
- const_cast<char*>("-d"),
- const_cast<char*>("-z"),
- const_cast<char*>("-q"),
- const_cast<char*>("-A")
- };
- // clang-format on
-
- Dumpstate::RunStatus status = options_.Initialize(ARRAY_SIZE(argv), argv);
-
- EXPECT_EQ(status, Dumpstate::RunStatus::OK);
- EXPECT_TRUE(options_.do_add_date);
- EXPECT_TRUE(options_.do_zip_file);
- EXPECT_TRUE(options_.use_control_socket);
- EXPECT_FALSE(options_.do_vibrate);
- EXPECT_TRUE(options_.arc_only);
-
- // Other options retain default values
- EXPECT_FALSE(options_.show_header_only);
- EXPECT_FALSE(options_.do_screenshot);
- EXPECT_FALSE(options_.do_progress_updates);
- EXPECT_FALSE(options_.is_remote_mode);
- EXPECT_FALSE(options_.use_socket);
- EXPECT_EQ(options_.dumpstate_hal_mode, DumpstateMode::DEFAULT);
}
TEST_F(DumpOptionsTest, InitializeDefaultBugReport) {
@@ -400,7 +361,6 @@
EXPECT_FALSE(options_.is_remote_mode);
EXPECT_FALSE(options_.use_socket);
EXPECT_FALSE(options_.wifi_only);
- EXPECT_FALSE(options_.arc_only);
}
TEST_F(DumpOptionsTest, InitializePartial1) {
@@ -430,7 +390,6 @@
EXPECT_FALSE(options_.do_screenshot);
EXPECT_FALSE(options_.do_progress_updates);
EXPECT_FALSE(options_.is_remote_mode);
- EXPECT_FALSE(options_.arc_only);
EXPECT_EQ(options_.dumpstate_hal_mode, DumpstateMode::DEFAULT);
}
@@ -460,7 +419,6 @@
EXPECT_FALSE(options_.do_zip_file);
EXPECT_FALSE(options_.use_socket);
EXPECT_FALSE(options_.use_control_socket);
- EXPECT_FALSE(options_.arc_only);
EXPECT_EQ(options_.dumpstate_hal_mode, DumpstateMode::DEFAULT);
}