Start logging host-version info in the Chromoting client.

BUG=479831

Review URL: https://codereview.chromium.org/1103913002

Cr-Commit-Position: refs/heads/master@{#326910}

3 files changed, 29 insertions, 3 deletions

diff --git a/remoting/webapp/crd/js/desktop_remoting_activity.js b/remoting/webapp/crd/js/desktop_remoting_activity.js
index 0a6da79..e6f956e 100644
--- a/remoting/webapp/crd/js/desktop_remoting_activity.js
+++ b/remoting/webapp/crd/js/desktop_remoting_activity.js
@@ -47,6 +47,7 @@ remoting.DesktopRemotingActivity.prototype.start =
     function(/** remoting.ClientSession */ session) {
       that.session_ = session;
       session.logHostOfflineErrors(!opt_suppressOfflineError);
+      session.getLogger().setHostVersion(host.hostVersion);
       session.connect(host, credentialsProvider);
   });
 };
diff --git a/remoting/webapp/crd/js/log_to_server.js b/remoting/webapp/crd/js/log_to_server.js
index e76f67a..ad0742b 100644
--- a/remoting/webapp/crd/js/log_to_server.js
+++ b/remoting/webapp/crd/js/log_to_server.js
@@ -31,6 +31,8 @@ remoting.LogToServer = function(signalStrategy) {
   this.connectionType_ = '';
   /** @private */
   this.authTotalTime_ = 0;
+  /** @private {string} */
+  this.hostVersion_ = '';
 
   this.setSessionId_();
   signalStrategy.sendConnectionSetupResults(this);
@@ -62,7 +64,7 @@ remoting.LogToServer.prototype.logClientSessionStateChange =
   // Log the session state change.
   var entry = remoting.ServerLogEntry.makeClientSessionStateChange(
       state, connectionError);
-  entry.addHostFields();
+  entry.addClientOSFields();
   entry.addChromeVersionField();
   entry.addWebappVersionField();
   entry.addSessionIdField(this.sessionId_);
@@ -156,7 +158,7 @@ remoting.LogToServer.prototype.logAccumulatedStatistics_ = function() {
   var entry = remoting.ServerLogEntry.makeStats(this.statsAccumulator_,
                                                 this.connectionType_);
   if (entry) {
-    entry.addHostFields();
+    entry.addClientOSFields();
     entry.addChromeVersionField();
     entry.addWebappVersionField();
     entry.addSessionIdField(this.sessionId_);
@@ -178,6 +180,9 @@ remoting.LogToServer.prototype.log_ = function(entry) {
       (new Date().getTime() - this.sessionStartTime_ -
           this.authTotalTime_) / 1000.0;
   entry.addSessionDuration(sessionDurationInSeconds);
+  // The host-version will be blank for logs before a session has been created.
+  // For example, the signal-strategy log-entries won't have host version info.
+  entry.addHostVersion(this.hostVersion_);
 
   // Send the stanza to the debug log.
   console.log('Enqueueing log entry:');
@@ -260,3 +265,11 @@ remoting.LogToServer.prototype.setAuthTotalTime = function(totalTime) {
   this.authTotalTime_ = totalTime;
 };
 
+/**
+ * @param {string} hostVersion Version of the host for current session.
+ * @return {void} Nothing.
+ */
+remoting.LogToServer.prototype.setHostVersion = function(hostVersion) {
+  this.hostVersion_ = hostVersion;
+};
+
diff --git a/remoting/webapp/crd/js/server_log_entry.js b/remoting/webapp/crd/js/server_log_entry.js
index 00cab93..2b3b5ac 100644
--- a/remoting/webapp/crd/js/server_log_entry.js
+++ b/remoting/webapp/crd/js/server_log_entry.js
@@ -159,6 +159,9 @@ remoting.ServerLogEntry.KEY_BROWSER_VERSION_ = 'browser-version';
 remoting.ServerLogEntry.KEY_WEBAPP_VERSION_ = 'webapp-version';
 
 /** @private */
+remoting.ServerLogEntry.KEY_HOST_VERSION_ = 'host-version';
+
+/** @private */
 remoting.ServerLogEntry.VALUE_EVENT_NAME_SESSION_ID_OLD_ = 'session-id-old';
 
 /** @private */
@@ -367,7 +370,7 @@ remoting.ServerLogEntry.prototype.addSessionIdField = function(sessionId) {
 /**
  * Adds fields describing the host to this log entry.
  */
-remoting.ServerLogEntry.prototype.addHostFields = function() {
+remoting.ServerLogEntry.prototype.addClientOSFields = function() {
   var host = remoting.ServerLogEntry.getHostData_();
   if (host) {
     if (host.os_name.length > 0) {
@@ -477,6 +480,15 @@ remoting.ServerLogEntry.prototype.addWebappVersionField = function() {
 };
 
 /**
+ * Adds a field specifying the host version to this log entry.
+ * @param {string} hostVersion Version of the host for current session.
+ * @return {void} Nothing.
+ */
+remoting.ServerLogEntry.prototype.addHostVersion = function(hostVersion) {
+  this.set_(remoting.ServerLogEntry.KEY_HOST_VERSION_, hostVersion);
+};
+
+/**
  * Adds a field specifying the mode to this log entry.
  */
 remoting.ServerLogEntry.prototype.addModeField = function() {