commit d662e81fcd0d96c010fe86d3b812917c5f62eb9c
author Greg Hartman <ghartman@google.com> Fri Jan 04 17:46:35 2019 -0800
committer Greg Hartman <ghartman@google.com> Fri Jan 04 18:01:50 2019 -0800
tree de75215af094c5ef50b1bb0b4c18dca43b9efe32
parent 412a69286da51d3cf64dce5a160a866b17201339

Log information messages for the guest versions

BUG: 122378432
Test: Local boot + examined TreeHugger logs on presubmit
Change-Id: If3cd768797844ec66698951eb96dcbdfdfcdd36d

host/commands/kernel_log_monitor/kernel_log_server.cc

diff --git a/host/commands/kernel_log_monitor/kernel_log_server.cc b/host/commands/kernel_log_monitor/kernel_log_server.cc
index ddb9b25..0ecf5fe 100644
--- a/host/commands/kernel_log_monitor/kernel_log_server.cc
+++ b/host/commands/kernel_log_monitor/kernel_log_server.cc
@@ -26,6 +26,11 @@
 using cvd::SharedFD;
 
 namespace {
+static const std::map<std::string, std::string> kInformationalPatterns = {
+    {"] Linux version ", "GUEST_KERNEL_VERSION: "},
+    {"GUEST_BUILD_FINGERPRINT: ", "GUEST_BUILD_FINGERPRINT: "},
+};
+
 static const std::map<std::string, monitor::BootEvent> kStageToEventMap = {
     {"VIRTUAL_DEVICE_BOOT_STARTED", monitor::BootEvent::BootStarted},
     {"VIRTUAL_DEVICE_BOOT_COMPLETED", monitor::BootEvent::BootCompleted},
@@ -121,6 +126,14 @@
   // Detect VIRTUAL_DEVICE_BOOT_*
   for (ssize_t i=0; i<ret; i++) {
     if ('\n' == buf[i]) {
+      for (auto& info_kv : kInformationalPatterns) {
+        auto& match = info_kv.first;
+        auto& prefix = info_kv.second;
+        auto pos = line_.find(match);
+        if (std::string::npos != pos) {
+          LOG(INFO) << prefix << line_.substr(pos + match.size());
+        }
+      }
       for (auto& stage_kv : kStageToEventMap) {
         auto& stage = stage_kv.first;
         auto event = stage_kv.second;