crash-reporter: Send OS version at time of crash and related improvements

kernel_collector.cc

 // Copyright (c) 2010 The Chromium OS 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 "crash-reporter/kernel_collector.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "crash-reporter/system_logging.h"
@@ skipping 48 matching lines @@
           preserved_dump_path_,
           kClearingSequence,
           strlen(kClearingSequence)) != strlen(kClearingSequence)) {
     logger_->LogError("Failed to clear kernel crash dump");
     return false;
   }
   logger_->LogInfo("Cleared kernel crash diagnostics");
   return true;
 }
 
-FilePath KernelCollector::GetKernelCrashPath(
-    const FilePath &root_crash_path,
-    time_t timestamp) {
-  std::string dump_basename =
-      FormatDumpBasename(kKernelExecName,
-                         timestamp,
-                         kKernelPid);
-  return root_crash_path.Append(
-      StringPrintf("%s.kcrash", dump_basename.c_str()));
-}
-
 bool KernelCollector::Collect() {
   std::string kernel_dump;
   FilePath root_crash_directory;
   if (!LoadPreservedDump(&kernel_dump)) {
     return false;
   }
   if (kernel_dump.empty()) {
     return false;
   }
+  logger_->LogInfo("Received prior crash notification from kernel");
+
   if (is_feedback_allowed_function_()) {
     count_crash_function_();
 
     if (!GetCreatedCrashDirectoryByEuid(kRootUid,
                                         &root_crash_directory)) {
       return true;
     }
 
-    FilePath kernel_crash_path = GetKernelCrashPath(root_crash_directory,
-                                                    time(NULL));
+    std::string dump_basename =
+        FormatDumpBasename(kKernelExecName,
+                           time(NULL),
+                           kKernelPid);
+    FilePath kernel_crash_path = root_crash_directory.Append(
+        StringPrintf("%s.kcrash", dump_basename.c_str()));
+
     if (file_util::WriteFile(kernel_crash_path,
                              kernel_dump.data(),
                              kernel_dump.length()) !=
         static_cast<int>(kernel_dump.length())) {
       logger_->LogInfo("Failed to write kernel dump to %s",
                        kernel_crash_path.value().c_str());
       return true;
     }
 
+    WriteCrashMetaData(
+        root_crash_directory.Append(
+            StringPrintf("%s.meta", dump_basename.c_str())),
+        kKernelExecName);
+
     logger_->LogInfo("Collected kernel crash diagnostics into %s",
                      kernel_crash_path.value().c_str());
   } else {
     logger_->LogInfo("Crash not saved since metrics disabled");
   }
   if (!ClearPreservedDump()) {
     return false;
   }
 
   return true;
 }