Report metrics about negotiated ciphers.

talk/app/webrtc/webrtcsession.cc

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 1374 matching lines @@
     }
   }
 }
 
 void WebRtcSession::OnTransportCompleted(cricket::Transport* transport) {
   ASSERT(signaling_thread()->IsCurrent());
   PeerConnectionInterface::IceConnectionState old_state = ice_connection_state_;
   SetIceConnectionState(PeerConnectionInterface::kIceConnectionCompleted);
   // Only report once when Ice connection is completed.
   if (old_state != PeerConnectionInterface::kIceConnectionCompleted) {
-    ReportBestConnectionState(transport);
+    cricket::TransportStats stats;
+    if (metrics_observer_ && transport->GetStats(&stats)) {
+      ReportBestConnectionState(stats);
+      ReportNegotiatedCiphers(stats);
+    }
   }
 }
 
 void WebRtcSession::OnTransportFailed(cricket::Transport* transport) {
   ASSERT(signaling_thread()->IsCurrent());
   SetIceConnectionState(PeerConnectionInterface::kIceConnectionFailed);
 }
 
 void WebRtcSession::OnTransportProxyCandidatesReady(
     cricket::TransportProxy* proxy, const cricket::Candidates& candidates) {
@@ skipping 459 matching lines @@
   cricket::ContentInfo content =
       current_remote_desc->description()->contents()[mediacontent_index];
   transport_proxy = GetTransportProxy(content.name);
 
   return transport_proxy && transport_proxy->local_description_set() &&
       transport_proxy->remote_description_set();
 }
 
 // Walk through the ConnectionInfos to gather best connection usage
 // for IPv4 and IPv6.
-void WebRtcSession::ReportBestConnectionState(cricket::Transport* transport) {
-  if (!metrics_observer_) {
-    return;
-  }
-
-  cricket::TransportStats stats;
-  if (!transport->GetStats(&stats)) {
-    return;
-  }
-
+void WebRtcSession::ReportBestConnectionState(
+    const cricket::TransportStats& stats) {
+  ASSERT(metrics_observer_ != NULL);

[tommi (sloooow) - chröme, 2015/07/02 11:32:29]

DCHECK? (same below if we can switch)

[joachim, 2015/07/02 22:06:06]

Done and also changed the "ASSERT(false)" to RTC_NOTREACHED (here and below).

   for (cricket::TransportChannelStatsList::const_iterator it =
          stats.channel_stats.begin();
        it != stats.channel_stats.end(); ++it) {
     for (cricket::ConnectionInfos::const_iterator it_info =
            it->connection_infos.begin();
          it_info != it->connection_infos.end(); ++it_info) {
       if (!it_info->best_connection) {
         continue;
       }
       if (it_info->local_candidate.address().family() == AF_INET) {
         metrics_observer_->IncrementCounter(kBestConnections_IPv4);
       } else if (it_info->local_candidate.address().family() ==
                  AF_INET6) {
         metrics_observer_->IncrementCounter(kBestConnections_IPv6);
       } else {
         ASSERT(false);
       }
       return;
     }
   }
 }
 
+void WebRtcSession::ReportNegotiatedCiphers(
+    const cricket::TransportStats& stats) {
+  ASSERT(metrics_observer_ != NULL);
+  if (!dtls_enabled_ || stats.channel_stats.empty()) {
+    return;
+  }
+
+  const std::string& srtp_cipher = stats.channel_stats[0].srtp_cipher;
+  const std::string& ssl_cipher = stats.channel_stats[0].ssl_cipher;
+  if (srtp_cipher.empty() && ssl_cipher.empty()) {
+    return;
+  }
+
+  PeerConnectionMetricsName srtp_name;
+  PeerConnectionMetricsName ssl_name;
+  if (stats.content_name == cricket::CN_AUDIO) {
+    srtp_name = kAudioSrtpCipher;
+    ssl_name = kAudioSslCipher;
+  } else if (stats.content_name == cricket::CN_VIDEO) {
+    srtp_name = kVideoSrtpCipher;
+    ssl_name = kVideoSslCipher;
+  } else if (stats.content_name == cricket::CN_DATA) {
+    srtp_name = kDataSrtpCipher;
+    ssl_name = kDataSslCipher;
+  } else {
+    ASSERT(false);
+    return;
+  }
+
+  if (!srtp_cipher.empty()) {
+    metrics_observer_->AddHistogramSample(srtp_name, srtp_cipher);
+  }
+  if (!ssl_cipher.empty()) {
+    metrics_observer_->AddHistogramSample(ssl_name, ssl_cipher);
+  }
+}
+
 }  // namespace webrtc