Add instrumentation to track the IceEndpointType.

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 39 matching lines @@
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/p2p/base/portallocator.h"
 
 using cricket::ContentInfo;
 using cricket::ContentInfos;
 using cricket::MediaContentDescription;
 using cricket::SessionDescription;
 using cricket::TransportInfo;
 
+using cricket::LOCAL_PORT_TYPE;
+using cricket::STUN_PORT_TYPE;
+using cricket::RELAY_PORT_TYPE;
+using cricket::PRFLX_PORT_TYPE;
+using webrtc::IceEndpointType;
+
 namespace webrtc {
 
 // Error messages
 const char kBundleWithoutRtcpMux[] = "RTCP-MUX must be enabled when BUNDLE "
                                      "is enabled.";
 const char kCreateChannelFailed[] = "Failed to create channels.";
 const char kInvalidCandidates[] = "Description contains invalid candidates.";
 const char kInvalidSdp[] = "Invalid session description.";
 const char kMlineMismatch[] =
     "Offer and answer descriptions m-lines are not matching. Rejecting answer.";
 const char kPushDownTDFailed[] =
     "Failed to push down transport description:";
 const char kSdpWithoutDtlsFingerprint[] =
     "Called with SDP without DTLS fingerprint.";
 const char kSdpWithoutSdesCrypto[] =
     "Called with SDP without SDES crypto.";
 const char kSdpWithoutIceUfragPwd[] =
     "Called with SDP without ice-ufrag and ice-pwd.";
 const char kSessionError[] = "Session error code: ";
 const char kSessionErrorDesc[] = "Session error description: ";
 const char kDtlsSetupFailureRtp[] =
     "Couldn't set up DTLS-SRTP on RTP channel.";
 const char kDtlsSetupFailureRtcp[] =
     "Couldn't set up DTLS-SRTP on RTCP channel.";
 const int kMaxUnsignalledRecvStreams = 20;
 
+#define DECLARE_ENDPOINT_TYPE_ENTRY(local_type, remote_type, endpoint_type) \
+  if (local.type() == local_type##_PORT_TYPE &&                             \
+      remote.type() == remote_type##_PORT_TYPE) {                           \
+    return endpoint_type;                                                   \
+  }
+
+IceEndpointType GetIceEndpointType(const cricket::Candidate& local,
+                                   const cricket::Candidate& remote) {
+  DECLARE_ENDPOINT_TYPE_ENTRY(LOCAL, LOCAL, kIceEndpoint_Host_Host);
+  DECLARE_ENDPOINT_TYPE_ENTRY(LOCAL, STUN, kIceEndpoint_Host_Srflx);
+  DECLARE_ENDPOINT_TYPE_ENTRY(LOCAL, RELAY, kIceEndpoint_Host_Relay);
+  DECLARE_ENDPOINT_TYPE_ENTRY(LOCAL, PRFLX, kIceEndpoint_Host_Prflx);
+  DECLARE_ENDPOINT_TYPE_ENTRY(STUN, LOCAL, kIceEndpoint_Srflx_Host);
+  DECLARE_ENDPOINT_TYPE_ENTRY(STUN, STUN, kIceEndpoint_Srflx_Srflx);
+  DECLARE_ENDPOINT_TYPE_ENTRY(STUN, RELAY, kIceEndpoint_Srflx_Relay);
+  DECLARE_ENDPOINT_TYPE_ENTRY(STUN, PRFLX, kIceEndpoint_Srflx_Prflx);
+  DECLARE_ENDPOINT_TYPE_ENTRY(RELAY, LOCAL, kIceEndpoint_Relay_Host);
+  DECLARE_ENDPOINT_TYPE_ENTRY(RELAY, STUN, kIceEndpoint_Relay_Srflx);
+  DECLARE_ENDPOINT_TYPE_ENTRY(RELAY, RELAY, kIceEndpoint_Relay_Relay);
+  DECLARE_ENDPOINT_TYPE_ENTRY(RELAY, PRFLX, kIceEndpoint_Relay_Prflx);
+  DECLARE_ENDPOINT_TYPE_ENTRY(PRFLX, LOCAL, kIceEndpoint_Prflx_Host);
+  DECLARE_ENDPOINT_TYPE_ENTRY(PRFLX, STUN, kIceEndpoint_Prflx_Srflx);
+  DECLARE_ENDPOINT_TYPE_ENTRY(PRFLX, RELAY, kIceEndpoint_Prflx_Relay);
+  return kIceEndpoint_Max;
+}
+
 // Compares |answer| against |offer|. Comparision is done
 // for number of m-lines in answer against offer. If matches true will be
 // returned otherwise false.
 static bool VerifyMediaDescriptions(
     const SessionDescription* answer, const SessionDescription* offer) {
   if (offer->contents().size() != answer->contents().size())
     return false;
 
   for (size_t i = 0; i < offer->contents().size(); ++i) {
     if ((offer->contents()[i].name) != answer->contents()[i].name) {
@@ skipping 1813 matching lines @@
   DCHECK(metrics_observer_ != NULL);
   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;
       }
+
+      // Get the PeerConnectionEnumCounterType.
+      PeerConnectionEnumCounterType counter = kPeerConnectionEnumCounter_Max;

[juberti1, 2015/08/14 21:26:04]

looks like this code needs to be updated

+      if (it_info->local_candidate.first_hop_protocol() ==
+          cricket::UDP_PROTOCOL_NAME) {
+        counter = kPeerConnectionEnumCounter_IceEndpointTypeUDP;
+      } else if (it_info->local_candidate.first_hop_protocol() ==
+                 cricket::TCP_PROTOCOL_NAME) {
+        counter = kPeerConnectionEnumCounter_IceEndpointTypeTCP;
+      } else {
+        DCHECK(counter != kPeerConnectionEnumCounter_Max);
+      }
+
+      metrics_observer_->IncrementEnumCounter(
+          counter, GetIceEndpointType(it_info->local_candidate,
+                                      it_info->remote_candidate),
+          kIceEndpoint_Max);
       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 {
         RTC_NOTREACHED();
       }
       return;
     }
@@ skipping 31 matching lines @@
 
   if (!srtp_cipher.empty()) {
     metrics_observer_->AddHistogramSample(srtp_name, srtp_cipher);
   }
   if (!ssl_cipher.empty()) {
     metrics_observer_->AddHistogramSample(ssl_name, ssl_cipher);
   }
 }
 
 }  // namespace webrtc