[Chromoting.com] Make Android telemetry report host version/os/os version

remoting/client/client_telemetry_logger.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 "remoting/client/client_telemetry_logger.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "remoting/base/telemetry_log_writer.h"
 
 namespace {
 
 const char kSessionIdAlphabet[] =
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
 const int kSessionIdLength = 20;
 
 const int kMaxSessionIdAgeDays = 1;
 
 }  // namespace
 
 namespace remoting {
 
+struct ClientTelemetryLogger::HostInfo {
+  const std::string host_version;
+  const ChromotingEvent::Os host_os;
+  const std::string host_os_version;
+};
+
 ClientTelemetryLogger::ClientTelemetryLogger(ChromotingEvent::Mode mode)
     : mode_(mode) {}
 
 ClientTelemetryLogger::~ClientTelemetryLogger() {}
 
+void ClientTelemetryLogger::SetHostInfo(const std::string& host_version,
+                                        ChromotingEvent::Os host_os,
+                                        const std::string& host_os_version) {
+  host_info_.reset(new HostInfo{host_version, host_os, host_os_version});
+}
+
 void ClientTelemetryLogger::Start(
     std::unique_ptr<UrlRequestFactory> request_factory,
     const std::string& telemetry_base_url) {
   DCHECK(!log_writer_);
   DCHECK(thread_checker_.CalledOnValidThread());
   log_writer_.reset(
       new TelemetryLogWriter(telemetry_base_url, std::move(request_factory)));
 }
 
 void ClientTelemetryLogger::LogSessionStateChange(
@@ skipping 107 matching lines @@
       return ChromotingEvent::ConnectionError::UNKNOWN_ERROR;
     default:
       NOTREACHED();
       return ChromotingEvent::ConnectionError::UNEXPECTED;
   }
 }
 
 void ClientTelemetryLogger::FillEventContext(ChromotingEvent* event) const {
   event->SetEnum(ChromotingEvent::kModeKey, mode_);
   event->SetEnum(ChromotingEvent::kRoleKey, ChromotingEvent::Role::CLIENT);
+  if (host_info_) {
+    event->SetString(ChromotingEvent::kHostVersionKey,
+                     host_info_->host_version);
+    event->SetEnum(ChromotingEvent::kHostOsKey, host_info_->host_os);
+    event->SetString(ChromotingEvent::kHostOsVersionKey,
+                     host_info_->host_os_version);
+  }
   event->AddSystemInfo();
   if (!session_id_.empty()) {
     event->SetString(ChromotingEvent::kSessionIdKey, session_id_);
   }
   if (!session_start_time_.is_null()) {
     int session_duration =
         (base::TimeTicks::Now() - session_start_time_).InSeconds();
     event->SetInteger(ChromotingEvent::kSessionDurationKey, session_duration);
   }
 }
@@ skipping 74 matching lines @@
   return event;
 }
 
 ChromotingEvent ClientTelemetryLogger::MakeSessionIdNewEvent() {
   ChromotingEvent event(ChromotingEvent::Type::SESSION_ID_NEW);
   FillEventContext(&event);
   return event;
 }
 
 }  // namespace remoting