tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Retire the Tron metrics reporting for non-A/B update" am: 6bdacc40ef am: fed0b90045 am: 2cc6f21833

Browse source 
Change-Id: I3cd62f30d3dc8c6e7d7402d5fa0f08c60a3d9b64
This commit is contained in:
Automerger Merge Worker 2020-01-21 19:46:11 +00:00
commit b892a6b788
2 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Android.bp
View file

@ -158,7 +158,6 @@ cc_binary {
shared_libs: [ shared_libs: [
"libbase", "libbase",
"liblog", "liblog",
"libmetricslogger",
], ],
static_libs: [ static_libs: [

18
recovery-persist.cpp
View file

@ -35,12 +35,10 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <limits>
#include <string> #include <string>
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <metricslogger/metrics_logger.h>
#include <private/android_logger.h> /* private pmsg functions */ #include <private/android_logger.h> /* private pmsg functions */
#include "recovery_utils/logging.h" #include "recovery_utils/logging.h"
@ -112,20 +110,6 @@ ssize_t logsave(
return android::base::WriteStringToFile(buffer, destination.c_str()); return android::base::WriteStringToFile(buffer, destination.c_str());
} }
// Parses the LAST_INSTALL file and reports the update metrics saved under recovery mode.
static void report_metrics_from_last_install(const std::string& file_name) {
auto metrics = ParseLastInstall(file_name);
// TODO(xunchang) report the installation result.
for (const auto& [event, value] : metrics) {
if (value > std::numeric_limits<int>::max()) {
LOG(WARNING) << event << " (" << value << ") exceeds integer max.";
} else {
LOG(INFO) << "Uploading " << value << " to " << event;
android::metricslogger::LogHistogram(event, value);
}
}
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
/* Is /cache a mount?, we have been delivered where we are not wanted */ /* Is /cache a mount?, we have been delivered where we are not wanted */
@ -157,7 +141,6 @@ int main(int argc, char **argv) {
if (has_cache) { if (has_cache) {
// Collects and reports the non-a/b update metrics from last_install; and removes the file // Collects and reports the non-a/b update metrics from last_install; and removes the file
// to avoid duplicate report. // to avoid duplicate report.
report_metrics_from_last_install(LAST_INSTALL_FILE_IN_CACHE);
if (access(LAST_INSTALL_FILE_IN_CACHE, F_OK) && unlink(LAST_INSTALL_FILE_IN_CACHE) == -1) { if (access(LAST_INSTALL_FILE_IN_CACHE, F_OK) && unlink(LAST_INSTALL_FILE_IN_CACHE) == -1) {
PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE_IN_CACHE; PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE_IN_CACHE;
} }
@ -181,7 +164,6 @@ int main(int argc, char **argv) {
// For those device without /cache, the last_install file has been copied to // For those device without /cache, the last_install file has been copied to
// /data/misc/recovery from pmsg. Looks for the sideload history only. // /data/misc/recovery from pmsg. Looks for the sideload history only.
if (!has_cache) { if (!has_cache) {
report_metrics_from_last_install(LAST_INSTALL_FILE);
if (access(LAST_INSTALL_FILE, F_OK) && unlink(LAST_INSTALL_FILE) == -1) { if (access(LAST_INSTALL_FILE, F_OK) && unlink(LAST_INSTALL_FILE) == -1) {
PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE; PLOG(ERROR) << "Failed to unlink " << LAST_INSTALL_FILE;
} }