Collect log messages from stability files

components/browser_watcher/postmortem_report_collector.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/browser_watcher/postmortem_report_collector.h"
 
 #include <utility>
 
 #include "base/debug/activity_analyzer.h"
 #include "base/files/file_enumerator.h"
@@ skipping 82 matching lines @@
 PostmortemReportCollector::CollectionStatus
 PostmortemReportCollector::CollectAndSubmit(
     const crashpad::UUID& client_id,
     const FilePath& file,
     crashpad::CrashReportDatabase* report_database) {
   DCHECK_NE(nullptr, report_database);
 
   // Note: the code below involves two notions of report: chrome internal state
   // reports and the crashpad reports they get wrapped into.
 
-  // Collect the data from the debug file to a proto.
+  // Collect the data from the debug file to a proto. Note: a non-empty report
+  // is interpreted here as an unclean exit.
   std::unique_ptr<StabilityReport> report_proto;
   CollectionStatus status = Collect(file, &report_proto);
   if (status != SUCCESS) {
     // The file was empty, or there was an error collecting the data. Detailed
     // logging happens within the Collect function.
     if (!base::DeleteFile(file, false))
       LOG(ERROR) << "Failed to delete " << file.value();
     return status;
   }
   DCHECK_NE(nullptr, report_proto.get());
@@ skipping 46 matching lines @@
   DCHECK_NE(nullptr, report);
   report->reset();
 
   // Create a global analyzer.
   std::unique_ptr<GlobalActivityAnalyzer> global_analyzer =
       GlobalActivityAnalyzer::CreateWithFile(debug_state_file);
   if (!global_analyzer)
     return ANALYZER_CREATION_FAILED;
 
   // Early exit if there is no data.
+  std::vector<std::string> log_messages = global_analyzer->GetLogMessages();
   ThreadActivityAnalyzer* thread_analyzer = global_analyzer->GetFirstAnalyzer();
-  if (!thread_analyzer) {
-    // No data. This case happens in the case of a clean exit.
+  if (log_messages.empty() && !thread_analyzer) {
     return DEBUG_FILE_NO_DATA;
   }
 
-  // Iterate through the thread analyzers, fleshing out the report.
+  // Create the report, then flesh it out.
   report->reset(new StabilityReport());
+
+  // Collect log messages.
+  for (const std::string& message : log_messages) {
+    (*report)->add_log_messages(message);
+  }
+
+  // Collect thread activity data.
   // Note: a single process is instrumented.
   ProcessState* process_state = (*report)->add_process_states();
-
   for (; thread_analyzer != nullptr;
        thread_analyzer = global_analyzer->GetNextAnalyzer()) {
     // Only valid analyzers are expected per contract of GetFirstAnalyzer /
     // GetNextAnalyzer.
     DCHECK(thread_analyzer->IsValid());
 
     if (!process_state->has_process_id()) {
       process_state->set_process_id(
           thread_analyzer->activity_snapshot().process_id);
     }
@@ skipping 64 matching lines @@
 #if defined(ARCH_CPU_X86)
   minidump_info.platform = std::string("Win32");
 #elif defined(ARCH_CPU_X86_64)
   minidump_info.platform = std::string("Win64");
 #endif
 
   return WritePostmortemDump(minidump_file, report, minidump_info);
 }
 
 }  // namespace browser_watcher