DeviceStatusCollector: add ProbeError to TimezoneInfo request

Update cros_healthd telemetry handling code to check for and log errors
from TimezoneInfo request.

Bug: chromium:1041153
Change-Id: I2319094bd80b478c275ee4ceee35faa9e75263f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2145925Reviewed-by: Jesse Schettler <jschettler@chromium.org>
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Commit-Queue: Trent Begin <tbegin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758863}

chrome/browser/chromeos/policy/status_collector/device_status_collector.cc

@@ -893,13 +893,21 @@ class DeviceStatusCollectorState : public StatusCollectorState {
         }
       }
 
-      const auto& timezone_info = probe_result->timezone_info;
-      if (!timezone_info.is_null()) {
-        em::TimezoneInfo* const timezone_info_out =
-            response_params_.device_status->mutable_timezone_info();
-        timezone_info_out->set_posix(timezone_info->posix);
-        timezone_info_out->set_region(timezone_info->region);
+      // Process TimezoneResult.
+      const auto& timezone_result = probe_result->timezone_result;
+      if (!timezone_result.is_null()) {
+        if (timezone_result->is_error()) {
+          LOG(ERROR) << "cros_healthd: Error getting timezone info: "
+                     << timezone_result->get_error()->msg;
+        } else {
+          const auto& timezone_info = timezone_result->get_timezone_info();
+          em::TimezoneInfo* const timezone_info_out =
+              response_params_.device_status->mutable_timezone_info();
+          timezone_info_out->set_posix(timezone_info->posix);
+          timezone_info_out->set_region(timezone_info->region);
+        }
       }
+
       const auto& memory_info = probe_result->memory_info;
       if (!memory_info.is_null()) {
         em::MemoryInfo* const memory_info_out =

chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc

@@ -480,8 +480,10 @@ void GetFakeCrosHealthdData(
   base::Optional<std::vector<
       chromeos::cros_healthd::mojom::NonRemovableBlockDeviceInfoPtr>>
       block_device_info(std::move(storage_vector));
-  chromeos::cros_healthd::mojom::TimezoneInfo timezone_info(kPosixTimezone,
-                                                            kTimezoneRegion);
+  auto timezone_result =
+      chromeos::cros_healthd::mojom::TimezoneResult::NewTimezoneInfo(
+          chromeos::cros_healthd::mojom::TimezoneInfo::New(kPosixTimezone,
+                                                           kTimezoneRegion));
   chromeos::cros_healthd::mojom::MemoryInfo memory_info(
       kFakeTotalMemory, kFakeFreeMemory, kFakeAvailableMemory, kFakePageFaults);
   std::vector<chromeos::cros_healthd::mojom::BacklightInfoPtr> backlight_vector;
@@ -493,8 +495,9 @@ void GetFakeCrosHealthdData(
   fan_vector.push_back(fan_info.Clone());
   chromeos::cros_healthd::mojom::TelemetryInfo fake_info(
       battery_info.Clone(), std::move(block_device_info),
-      cached_vpd_info.Clone(), std::move(cpu_result), timezone_info.Clone(),
-      memory_info.Clone(), std::move(backlight_vector), std::move(fan_vector));
+      cached_vpd_info.Clone(), std::move(cpu_result),
+      std::move(timezone_result), memory_info.Clone(),
+      std::move(backlight_vector), std::move(fan_vector));
 
   // Create fake SampledData.
   em::CPUTempInfo fake_cpu_temp_sample;

chromeos/services/cros_healthd/public/cpp/service_connection_unittest.cc

@@ -117,9 +117,9 @@ mojom::CpuResultPtr MakeCpuResult() {
   return mojom::CpuResult::NewCpuInfo(std::move(cpu_info));
 }
 
-mojom::TimezoneInfoPtr MakeTimezoneInfo() {
-  return mojom::TimezoneInfo::New("MST7MDT,M3.2.0,M11.1.0" /* posix */,
-                                  "America/Denver" /* region */);
+mojom::TimezoneResultPtr MakeTimezoneResult() {
+  return mojom::TimezoneResult::NewTimezoneInfo(mojom::TimezoneInfo::New(
+      "MST7MDT,M3.2.0,M11.1.0" /* posix */, "America/Denver" /* region */));
 }
 
 mojom::MemoryInfoPtr MakeMemoryInfo() {
@@ -150,7 +150,7 @@ mojom::TelemetryInfoPtr MakeTelemetryInfo() {
       MakeBatteryInfo() /* battery_info */,
       MakeNonRemovableBlockDeviceInfo() /* block_device_info */,
       MakeCachedVpdInfo() /* vpd_info */, MakeCpuResult() /* cpu_result */,
-      MakeTimezoneInfo() /* timezone_info */,
+      MakeTimezoneResult() /* timezone_result */,
       MakeMemoryInfo() /* memory_info */,
       MakeBacklightInfo() /* backlight_info */, MakeFanInfo() /* fan_info */
   );

chromeos/services/cros_healthd/public/mojom/cros_healthd_probe.mojom

@@ -131,6 +131,15 @@ struct CpuInfo {
   uint32 max_clock_speed_khz;
 };
 
+// Timezone probe result. Can either be populated with the TimezoneInfo or an
+// error retrieving the information.
+union TimezoneResult {
+  // Valid TimezoneInfo.
+  TimezoneInfo timezone_info;
+  // The error that occurred attempting to retrieve the TimezoneInfo.
+  ProbeError error;
+};
+
 // Timezone information.
 struct TimezoneInfo {
   // The timezone of the device in POSIX standard.
@@ -191,7 +200,7 @@ struct TelemetryInfo {
   CpuResult? cpu_result;
   // Information about the device's timezone. Only present when kTimezone was
   // included in the categories input to ProbeTelemetryInfo.
-  TimezoneInfo? timezone_info;
+  TimezoneResult? timezone_result;
   // Information about the system's memory. Only present when kMemory was
   // included in the categories input to ProbeTelemetryInfo.
   MemoryInfo? memory_info;