Add connection type to connection stats.

remoting/webapp/crd/js/client_session.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
  * Class handling creation and teardown of a remoting client session.
  *
  * The ClientSession class controls lifetime of the client plugin
  * object and provides the plugin with the functionality it needs to
@@ skipping 88 matching lines @@
     * @private */
   this.plugin_ = null;
   /** @private */
   this.shrinkToFit_ = true;
   /** @private */
   this.resizeToClient_ = true;
   /** @private */
   this.remapKeys_ = '';
   /** @private */
   this.hasReceivedFrame_ = false;
-  this.logToServer = new remoting.LogToServer(signalStrategy);
+  this.logToServer = new remoting.LogToServer(signalStrategy, mode);
 
   /** @private */
   this.signalStrategy_ = signalStrategy;
   base.debug.assert(this.signalStrategy_.getState() ==
                     remoting.SignalStrategy.State.CONNECTED);
   this.signalStrategy_.setIncomingStanzaCallback(
       this.onIncomingMessage_.bind(this));
   remoting.formatIq.setJids(this.signalStrategy_.getJid(), hostJid);
 
   /** @type {number?} @private */
@@ skipping 401 matching lines @@
     this.video_.style.height = '0px';
 
     var renderer = new remoting.MediaSourceRenderer(this.video_);
     this.plugin_.enableMediaSourceRendering(renderer);
     this.container_.classList.add('mediasource-rendering');
   } else {
     this.container_.classList.remove('mediasource-rendering');
   }
 
   this.plugin_.setOnOutgoingIqHandler(this.sendIq_.bind(this));
-  this.plugin_.setOnDebugMessageHandler(
-      /** @param {string} msg */
-      function(msg) {
-        console.log('plugin: ' + msg.trimRight());
-      });
+  this.plugin_.setOnDebugMessageHandler(this.onDebugMessage_.bind(this));
 
   this.plugin_.setConnectionStatusUpdateHandler(
       this.onConnectionStatusUpdate_.bind(this));
   this.plugin_.setConnectionReadyHandler(this.onConnectionReady_.bind(this));
   this.plugin_.setDesktopSizeUpdateHandler(
       this.onDesktopSizeChanged_.bind(this));
   this.plugin_.setCapabilitiesHandler(this.onSetCapabilities_.bind(this));
   this.plugin_.setGnubbyAuthHandler(
       this.processGnubbyAuthMessage_.bind(this));
   this.plugin_.setMouseCursorHandler(this.updateMouseCursorImage_.bind(this));
@@ skipping 52 matching lines @@
  *    remoting.Error.NONE if there is no error.
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.disconnect = function(error) {
   var state = (error == remoting.Error.NONE) ?
                   remoting.ClientSession.State.CLOSED :
                   remoting.ClientSession.State.FAILED;
 
   // The plugin won't send a state change notification, so we explicitly log
   // the fact that the connection has closed.
-  this.logToServer.logClientSessionStateChange(state, error, this.mode_);
+  this.logToServer.logClientSessionStateChange(state, error);
   this.error_ = error;
   this.setState_(state);
 };
 
 /**
  * Deletes the <embed> element from the container and disconnects.
  *
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.cleanup = function() {
@@ skipping 212 matching lines @@
       remoting.SignalStrategy.State.CONNECTED) {
     console.log("Message above is dropped because signaling is not connected.");
     return;
   }
 
   this.signalStrategy_.sendMessage(message);
 };
 
 /**
  * @private
+ * @param {string} msg
+ */
+remoting.ClientSession.prototype.onDebugMessage_ = function(msg) {
+  var isConnectionTypeMessage = msg.match(
+      /^Channel (.*) using (.*) connection.$/);
+  if (isConnectionTypeMessage) {
+    this.logToServer.setConnectionType(isConnectionTypeMessage[2]);
+  }
+  console.log('plugin: ' + msg.trimRight());
+};
+
+/**
+ * @private
  * @param {Element} message
  */
 remoting.ClientSession.prototype.onIncomingMessage_ = function(message) {
   if (!this.plugin_) {
     return;
   }
   var formatted = new XMLSerializer().serializeToString(message);
   console.log(remoting.timestamp(),
               remoting.formatIq.prettifyReceiveIq(formatted));
   this.plugin_.onIncomingIq(formatted);
@@ skipping 177 matching lines @@
         !this.logHostOfflineErrors_) {
       // The application requested host-offline errors to be suppressed, for
       // example, because this connection attempt is using a cached host JID.
       console.log('Suppressing host-offline error.');
       state = remoting.ClientSession.State.CONNECTION_CANCELED;
     }
   } else if (oldState == remoting.ClientSession.State.CONNECTED &&
              this.state_ == remoting.ClientSession.State.FAILED) {
     state = remoting.ClientSession.State.CONNECTION_DROPPED;
   }
-  this.logToServer.logClientSessionStateChange(state, this.error_, this.mode_);
+  this.logToServer.logClientSessionStateChange(state, this.error_);
   if (this.state_ == remoting.ClientSession.State.CONNECTED) {
     this.createGnubbyAuthHandler_();
     this.createCastExtensionHandler_();
   }
 
   this.raiseEvent(remoting.ClientSession.Events.stateChanged,
     new remoting.ClientSession.StateEvent(newState, oldState)
   );
 };
 
@@ skipping 170 matching lines @@
 remoting.ClientSession.prototype.getPerfStats = function() {
   return this.plugin_.getPerfStats();
 };
 
 /**
  * Logs statistics.
  *
  * @param {remoting.ClientSession.PerfStats} stats
  */
 remoting.ClientSession.prototype.logStatistics = function(stats) {
-  this.logToServer.logStatistics(stats, this.mode_);
+  this.logToServer.logStatistics(stats);
 };
 
 /**
  * Enable or disable logging of connection errors due to a host being offline.
  * For example, if attempting a connection using a cached JID, host-offline
  * errors should not be logged because the JID will be refreshed and the
  * connection retried.
  *
  * @param {boolean} enable True to log host-offline errors; false to suppress.
  */
@@ skipping 325 matching lines @@
  * @param {string} data Contents of the extension message.
  * @return {boolean} True if the message was recognized, false otherwise.
  */
 remoting.ClientSession.prototype.handleExtensionMessage =
     function(type, data) {
   if (this.videoFrameRecorder_) {
     return this.videoFrameRecorder_.handleMessage(type, data);
   }
   return false;
 }