RTCIceCandidateStats.transportId added and collected.

webrtc/api/rtcstatscollector.cc

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 247 matching lines @@
     int64_t timestamp_us, const cricket::Candidate& candidate, bool is_local,
     RTCStatsReport* report) {
   const std::string& id = "RTCIceCandidate_" + candidate.id();
   const RTCStats* stats = report->Get(id);
   if (!stats) {
     std::unique_ptr<RTCIceCandidateStats> candidate_stats;
     if (is_local)
       candidate_stats.reset(new RTCLocalIceCandidateStats(id, timestamp_us));
     else
       candidate_stats.reset(new RTCRemoteIceCandidateStats(id, timestamp_us));
+    if (!candidate.transport_name().empty()) {

[Taylor Brandstetter, 2016/12/22 19:28:31]

Using the transport_name on the candidate isn't reliable (I think it was only
added for a "RemoveCandidates" API, and I'd like to remove it since it's
redundant in most places, and not always kept in sync). I'd just pass the
already-generated transport_id into this method.

[hbos, 2016/12/23 14:25:17]

Done.

+      candidate_stats->transport_id = RTCTransportStatsIDFromTransportChannel(
+          candidate.transport_name(), candidate.component());
+    }
     candidate_stats->ip = candidate.address().ipaddr().ToString();
     candidate_stats->port = static_cast<int32_t>(candidate.address().port());
     candidate_stats->protocol = candidate.protocol();
     candidate_stats->candidate_type = CandidateTypeToRTCIceCandidateType(
         candidate.type());
     candidate_stats->priority = static_cast<int32_t>(candidate.priority());
 
     stats = candidate_stats.get();
     report->AddStats(std::move(candidate_stats));
   }
@@ skipping 362 matching lines @@
     report->AddStats(std::move(data_channel_stats));
   }
 }
 
 void RTCStatsCollector::ProduceIceCandidateAndPairStats_n(
       int64_t timestamp_us, const SessionStats& session_stats,
       RTCStatsReport* report) const {
   RTC_DCHECK(network_thread_->IsCurrent());
   for (const auto& transport_stats : session_stats.transport_stats) {
     for (const auto& channel_stats : transport_stats.second.channel_stats) {
       std::string transport_id = RTCTransportStatsIDFromTransportChannel(

[Taylor Brandstetter, 2016/12/22 19:28:31]

Here's the transport ID you can pass into ProduceIceCandidateStats.

[hbos, 2016/12/23 14:25:17]

OK, I was wondering if it was the same information twice. But it makes sense to
have transport name on candidate as well since there could be candidates not
paired with anything. When that is supported though the candidates need to know
about their transport assuming they have one.

           transport_stats.second.transport_name, channel_stats.component);
       for (const cricket::ConnectionInfo& info :
            channel_stats.connection_infos) {
         std::unique_ptr<RTCIceCandidatePairStats> candidate_pair_stats(
             new RTCIceCandidatePairStats(
                 RTCIceCandidatePairStatsIDFromConnectionInfo(info),
                 timestamp_us));
 
         candidate_pair_stats->transport_id = transport_id;
         // TODO(hbos): There could be other candidates that are not paired with
@@ skipping 304 matching lines @@
     const std::string& type) {
   return CandidateTypeToRTCIceCandidateType(type);
 }
 
 const char* DataStateToRTCDataChannelStateForTesting(
     DataChannelInterface::DataState state) {
   return DataStateToRTCDataChannelState(state);
 }
 
 }  // namespace webrtc