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

remoting/client/jni/chromoting_jni_instance.cc

 // Copyright 2013 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/jni/chromoting_jni_instance.h"
 
 #include <android/log.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "net/socket/client_socket_factory.h"
 #include "remoting/base/chromium_url_request.h"
+#include "remoting/base/chromoting_event.h"
 #include "remoting/client/audio_player_android.h"
 #include "remoting/client/client_telemetry_logger.h"
 #include "remoting/client/jni/android_keymap.h"
 #include "remoting/client/jni/chromoting_jni_runtime.h"
 #include "remoting/client/jni/jni_client.h"
 #include "remoting/client/jni/jni_pairing_secret_fetcher.h"
 #include "remoting/protocol/chromium_port_allocator_factory.h"
 #include "remoting/protocol/chromium_socket_factory.h"
 #include "remoting/protocol/client_authentication_config.h"
 #include "remoting/protocol/frame_consumer.h"
@@ skipping 26 matching lines @@
     std::unique_ptr<protocol::CursorShapeStub> cursor_shape_stub,
     std::unique_ptr<protocol::VideoRenderer> video_renderer,
     const std::string& username,
     const std::string& auth_token,
     const std::string& host_jid,
     const std::string& host_id,
     const std::string& host_pubkey,
     const std::string& pairing_id,
     const std::string& pairing_secret,
     const std::string& capabilities,
-    const std::string& flags)
+    const std::string& flags,
+    const std::string& host_version,
+    const std::string& host_os,
+    const std::string& host_os_version)
     : jni_runtime_(jni_runtime),
       jni_client_(jni_client),
       secret_fetcher_(secret_fetcher),
       host_jid_(host_jid),
       flags_(flags),
       cursor_shape_stub_(std::move(cursor_shape_stub)),
       video_renderer_(std::move(video_renderer)),
       capabilities_(capabilities),
+      host_version_(host_version),
+      host_os_(host_os),
+      host_os_version_(host_os_version),
       weak_factory_(this) {
   DCHECK(jni_runtime_->ui_task_runner()->BelongsToCurrentThread());
   weak_ptr_ = weak_factory_.GetWeakPtr();
 
   // Initialize XMPP config.
   xmpp_config_.host = kXmppServer;
   xmpp_config_.port = kXmppPort;
   xmpp_config_.use_tls = kXmppUseTls;
   xmpp_config_.username = username;
   xmpp_config_.auth_token = auth_token;
@@ skipping 284 matching lines @@
   NOTIMPLEMENTED();
 }
 
 base::WeakPtr<ChromotingJniInstance> ChromotingJniInstance::GetWeakPtr() {
   return weak_ptr_;
 }
 
 void ChromotingJniInstance::ConnectToHostOnNetworkThread() {
   DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread());
 
+  jni_runtime_->logger()->SetHostInfo(
+      host_version_, ChromotingEvent::ParseOsFromString(host_os_),
+      host_os_version_);
+
   jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
 
   client_context_.reset(new ClientContext(jni_runtime_->network_task_runner()));
   client_context_->Start();
 
   perf_tracker_.reset(new protocol::PerformanceTracker());
 
   video_renderer_->Initialize(*client_context_,
                               perf_tracker_.get());
 
@@ skipping 108 matching lines @@
   video_renderer_.reset();
   signaling_.reset();
   perf_tracker_.reset();
   client_context_.reset();
   cursor_shape_stub_.reset();
 
   weak_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace remoting