crash-reporter: write conversion failure diagnostics into fake dmp files

crash_sender

 #!/bin/sh
 
 # 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.
 
 set -e
 
 # Product ID in crash report
 CHROMEOS_PRODUCT=ChromeOS
@@ skipping 134 matching lines @@
   mktemp "${TIMESTAMPS_DIR}"/XXXX > /dev/null
   return 0
 }
 
 # Gets the base part of a crash report file, such as
 # name.01234.5678.9012 from name.01234.5678.9012.meta
 get_base() {
   echo "${1%.*}"
 }
 
+get_extension() {
+  echo "${1##*.}"
+}
+
 # Return which kind of report the given metadata file relates to
 get_kind() {
-  # There should never be a report with both a dmp and kcrash file.
-  # If that were to happen we arbitrarily consider this a minidump
-  # report and effectively ignore the kcrash.
-  local base="$(get_base "$1")"
-  if [ -r "${base}.dmp" ]; then
+  local payload="$(get_key_value "$1" "payload")"
+  if [ ! -r "${payload}" ]; then
+    lecho "Missing payload: ${payload}"
+    echo "unknown"
+    return
+  fi
+  local kind="$(get_extension "${payload}")"
+  if [ "${kind}" = "dmp" ]; then
     echo "minidump"
     return
   fi
-  if [ -r "${base}.kcrash" ]; then
-    echo "kcrash"
-    return
-  fi
+  echo "${kind}"
 }
 
 get_key_value() {
   if ! grep -q "$2=" "$1"; then
     echo "undefined"
     return
   fi
   grep "$2=" "$1" | cut -d = -f 2-
 }
 
 # Return the board name.
 get_board() {
   echo $(get_key_value "/etc/lsb-release" "CHROMEOS_RELEASE_BOARD")
 }
 
 # Return the hardware class or "unknown".
 get_hardware_class() {
   if [ -r "${HWCLASS_PATH}" ]; then
     cat "${HWCLASS_PATH}"
   else
     echo "unknown"
   fi
 }
 
 send_crash() {
   local meta_path="$1"
+  local report_payload="$(get_key_value "${meta_path}" "payload")"
   local kind="$(get_kind "${meta_path}")"
   local exec_name="$(get_key_value "${meta_path}" "exec_name")"
   local sleep_time=$(generate_uniform_random $SECONDS_SEND_SPREAD)
   local url="${REPORT_UPLOAD_PROD_URL}"
   local chromeos_version="$(get_key_value "${meta_path}" "ver")"
   local board="$(get_board)"
   local hwclass="$(get_hardware_class)"
-  local payload_extension="${kind}"
   local write_payload_size="$(get_key_value "${meta_path}" "payload_size")"
   local sig="$(get_key_value "${meta_path}" "sig")"
-  [ "${kind}" = "minidump" ] && payload_extension="dmp"
-  local report_payload="$(get_base "${meta_path}").${payload_extension}"
-  local send_payload_size="$(stat --printf=%s "${report_payload}")"
+  local send_payload_size="$(stat --printf=%s "${report_payload}" 2>/dev/null)"
   lecho "Sending crash:"
   lecho "  Scheduled to send in ${sleep_time}s"
   lecho "  Metadata: ${meta_path} (${kind})"
   lecho "  Payload: ${report_payload}"
   lecho "  Version: ${chromeos_version}"
   if is_mock; then
     lecho "  Product: ${CHROMEOS_PRODUCT}"
     lecho "  URL: ${url}"
     lecho "  Board: ${board}"
     lecho "  HWClass: ${hwclass}"
@@ skipping 16 matching lines @@
     return 1
   fi
 
   local report_id="${TMP_DIR}/report_id"
   local curl_stderr="${TMP_DIR}/curl_stderr"
 
   local extra_key1="write_payload_size"
   local extra_value1="${write_payload_size}"
   local extra_key2="send_payload_size"
   local extra_value2="${send_payload_size}"
-  if [ "${kind}" = "kcrash" ]; then
+  if [ "${sig}" != "unknown" ]; then
     extra_key1="sig"
     extra_value1="${sig}"
     extra_key2="sig2"
     extra_value2="${sig}"
   fi
 
   set +e
   curl "${url}" \
     -F "prod=${CHROMEOS_PRODUCT}" \
     -F "ver=${chromeos_version}" \
@@ skipping 47 matching lines @@
       lecho "Removing old orphaned file: ${old_file}."
       rm -f -- "${old_file}"
     fi
   done
 
   # Look through all metadata (*.meta) files, if any exist.
   for meta_path in $(ls -1t "${dir}"/*.meta 2>/dev/null); do
     lecho "Considering metadata ${meta_path}."
     local kind=$(get_kind "${meta_path}")
 
-    if [ "${kind}" != "minidump" ] && [ "${kind}" != "kcrash" ]; then
-      lecho "Unknown report kind.  Removing report."
+    if [ "${kind}" != "minidump" ] && \
+       [ "${kind}" != "kcrash" ] && \
+       [ "${kind}" != "log" ]; then
+      lecho "Unknown report kind ${kind}.  Removing report."
       remove_report "${meta_path}"
       continue
     fi
 
     if ${METRICS_CLIENT} -g; then
       lecho "Guest mode has been entered.  Delaying crash sending until exited."
       return 0
     fi
 
     if ! ${METRICS_CLIENT} -c; then
@@ skipping 62 matching lines @@
   TMP_DIR="$(mktemp -d /tmp/crash_sender.XXXX)"
 
   # Send system-wide crashes
   send_crashes "/var/spool/crash"
 
   # Send user-specific crashes
   send_crashes "/home/chronos/user/crash"
 }
 
 main