Start logging host-version info in the Chromoting client.

remoting/webapp/crd/js/log_to_server.js

 // Copyright (c) 2012 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.
 
 /**
  * @fileoverview
  * Module for sending log entries to the server.
  */
 
 'use strict';
@@ skipping 13 matching lines @@
   /** @private */
   this.sessionIdGenerationTime_ = 0;
   /** @private */
   this.sessionStartTime_ = new Date().getTime();
   /** @private */
   this.signalStrategy_ = signalStrategy;
   /** @private {string} */
   this.connectionType_ = '';
   /** @private */
   this.authTotalTime_ = 0;
+  /** @private {string} */
+  this.hostVersion_ = '';
 
   this.setSessionId_();
   signalStrategy.sendConnectionSetupResults(this);
 };
 
 // Constants used for generating a session ID.
 /** @private */
 remoting.LogToServer.SESSION_ID_ALPHABET_ =
     'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
 /** @private */
@@ skipping 11 matching lines @@
  *
  * @param {remoting.ClientSession.State} state
  * @param {!remoting.Error} connectionError
  */
 remoting.LogToServer.prototype.logClientSessionStateChange =
     function(state, connectionError) {
   this.maybeExpireSessionId_();
   // Log the session state change.
   var entry = remoting.ServerLogEntry.makeClientSessionStateChange(
       state, connectionError);
-  entry.addHostFields();
+  entry.addClientOSFields();
   entry.addChromeVersionField();
   entry.addWebappVersionField();
   entry.addSessionIdField(this.sessionId_);
   this.log_(entry);
   // Don't accumulate connection statistics across state changes.
   this.logAccumulatedStatistics_();
   this.statsAccumulator_.empty();
   // Maybe clear the session ID.
   if (remoting.LogToServer.isEndOfSession_(state)) {
     this.clearSessionId_();
@@ skipping 73 matching lines @@
  *
  * If all the statistics are zero, then the accumulator is still emptied,
  * but the statistics are not sent to the log server.
  *
  * @private
  */
 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_);
     this.log_(entry);
   }
   this.statsAccumulator_.empty();
 };
 
 /**
  * Sends a log entry to the server.
  *
  * @private
  * @param {remoting.ServerLogEntry} entry
  */
 remoting.LogToServer.prototype.log_ = function(entry) {
   // Log the time taken to get to this point from the time this session started.
   // Exclude time taken for authorization.
   var sessionDurationInSeconds =
       (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:');
   entry.toDebugLog(1);
 
   var stanza = '<cli:iq to="' + remoting.settings.DIRECTORY_BOT_JID + '" ' +
                        'type="set" xmlns:cli="jabber:client">' +
                  '<gr:log xmlns:gr="google:remoting">' +
                    entry.toStanza() +
                  '</gr:log>' +
@@ skipping 62 matching lines @@
 };
 
 /**
  * @param {number} totalTime The value of time taken to complete authorization.
  * @return {void} Nothing.
  */
 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;
+};
+