Include time elapsed since start of a remoting session in each log entry.

remoting/webapp/crd/js/server_log_entry.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
  * A class of server log entries.
  *
  * Any changes to the values here need to be coordinated with the host and
  * server/log proto code.
@@ skipping 29 matching lines @@
 /** @private */
 remoting.ServerLogEntry.KEY_SESSION_STATE_ = 'session-state';
 /** @private */
 remoting.ServerLogEntry.KEY_CONNECTION_TYPE_ = 'connection-type';
 /** @private */
 remoting.ServerLogEntry.KEY_SIGNAL_STRATEGY_TYPE_ = 'signal-strategy-type';
 /** @private */
 remoting.ServerLogEntry.KEY_SIGNAL_STRATEGY_PROGRESS_ =
     'signal-strategy-progress';
 /** @private */
-remoting.ServerLogEntry.KEY_SIGNAL_STRATEGY_ELAPSED_TIME_ =
-    'signal-strategy-elapsed-time';
+remoting.ServerLogEntry.KEY_ELAPSED_TIME_MS_ = 'elapsed-time';
+
 
 /**
  * @private
  * @param {remoting.ClientSession.State} state
  * @return {string}
  */
 remoting.ServerLogEntry.getValueForSessionState_ = function(state) {
   switch(state) {
     case remoting.ClientSession.State.UNKNOWN:
       return 'unknown';
@@ skipping 50 matching lines @@
       return 'host-overload';
     case remoting.Error.P2P_FAILURE:
       return 'p2p-failure';
     case remoting.Error.UNEXPECTED:
       return 'unexpected';
     default:
       return 'unknown-' + connectionError;
   }
 };
 
-/** @private */
-remoting.ServerLogEntry.KEY_SESSION_DURATION_ = 'session-duration';
 
 /** @private */
 remoting.ServerLogEntry.VALUE_EVENT_NAME_CONNECTION_STATISTICS_ =
     "connection-statistics";
 /** @private */
 remoting.ServerLogEntry.KEY_VIDEO_BANDWIDTH_ = "video-bandwidth";
 /** @private */
 remoting.ServerLogEntry.KEY_CAPTURE_LATENCY_ = "capture-latency";
 /** @private */
 remoting.ServerLogEntry.KEY_ENCODE_LATENCY_ = "encode-latency";
@@ skipping 101 matching lines @@
              remoting.ServerLogEntry.getValueForSessionState_(state));
   if (connectionError != remoting.Error.NONE) {
     entry.set_(remoting.ServerLogEntry.KEY_CONNECTION_ERROR_,
                remoting.ServerLogEntry.getValueForError_(connectionError));
   }
   entry.addModeField(mode);
   return entry;
 };
 
 /**
- * Adds a session duration to a log entry.
- *
- * @param {number} sessionDuration
- */
-remoting.ServerLogEntry.prototype.addSessionDurationField = function(
-    sessionDuration) {
-  this.set_(remoting.ServerLogEntry.KEY_SESSION_DURATION_,
-            sessionDuration.toString());
-};
-
-/**
  * Makes a log entry for a set of connection statistics.
  * Returns null if all the statistics were zero.
  *
  * @param {remoting.StatsAccumulator} statsAccumulator
  * @param {string} connectionType
  * @param {remoting.DesktopConnectedView.Mode} mode
  * @return {?remoting.ServerLogEntry}
  */
 remoting.ServerLogEntry.makeStats = function(statsAccumulator,
                                              connectionType,
@@ skipping 84 matching lines @@
   entry.addModeField(mode);
   return entry;
 };
 
 /**
  * Makes a log entry for a "signal strategy fallback" event.
  *
  * @param {string} sessionId
  * @param {remoting.SignalStrategy.Type} strategyType
  * @param {remoting.FallbackSignalStrategy.Progress} progress
- * @param {number} elapsedTimeInMs
  * @return {remoting.ServerLogEntry}
  */
 remoting.ServerLogEntry.makeSignalStrategyProgress =
-    function(sessionId, strategyType, progress, elapsedTimeInMs) {
+    function(sessionId, strategyType, progress) {
   var entry = new remoting.ServerLogEntry();
   entry.set_(remoting.ServerLogEntry.KEY_ROLE_,
              remoting.ServerLogEntry.VALUE_ROLE_CLIENT_);
   entry.set_(
       remoting.ServerLogEntry.KEY_EVENT_NAME_,
       remoting.ServerLogEntry.VALUE_EVENT_NAME_SIGNAL_STRATEGY_PROGRESS_);
   entry.addSessionIdField(sessionId);
   entry.set_(remoting.ServerLogEntry.KEY_SIGNAL_STRATEGY_TYPE_, strategyType);
   entry.set_(remoting.ServerLogEntry.KEY_SIGNAL_STRATEGY_PROGRESS_, progress);
-  entry.set_(remoting.ServerLogEntry.KEY_SIGNAL_STRATEGY_ELAPSED_TIME_,
-             String(elapsedTimeInMs));
 
   return entry;
 };
 
 /**
  * Adds a session ID field to this log entry.
  *
  * @param {string} sessionId
  */
 remoting.ServerLogEntry.prototype.addSessionIdField = function(sessionId) {
@@ skipping 74 matching lines @@
     return {
         'os_name': remoting.ServerLogEntry.VALUE_OS_NAME_CHROMEOS_,
         'os_version': match[2],
         'cpu': match[1]
     };
   }
   return null;
 };
 
 /**
+ * Adds a field to this log entry specifying the elapsed time since the start of
+ * the session to the current session state.
+ * @param {number} elapsedTimeInMs
+ */
+remoting.ServerLogEntry.prototype.addElapsedTimeMs =
+    function(elapsedTimeInMs) {
+  this.set_(remoting.ServerLogEntry.KEY_ELAPSED_TIME_MS_,
+            String(elapsedTimeInMs));
+};
+
+
+/**
  * Adds a field specifying the browser version to this log entry.
  */
 remoting.ServerLogEntry.prototype.addChromeVersionField = function() {
   var version = remoting.getChromeVersion();
   if (version != null) {
     this.set_(remoting.ServerLogEntry.KEY_BROWSER_VERSION_, version);
   }
 };
 
 /**
@@ skipping 28 matching lines @@
     case remoting.DesktopConnectedView.Mode.IT2ME:
       return remoting.ServerLogEntry.VALUE_MODE_IT2ME_;
     case remoting.DesktopConnectedView.Mode.ME2ME:
       return remoting.ServerLogEntry.VALUE_MODE_ME2ME_;
     case remoting.DesktopConnectedView.Mode.APP_REMOTING:
       return remoting.ServerLogEntry.VALUE_MODE_APP_REMOTING_;
     default:
       return remoting.ServerLogEntry.VALUE_MODE_UNKNOWN_;
   }
 };