commit 7eca09361d6d49df7bcb7bdbeba3e030ce73b5c0
author Steve Anton <steveanton@webrtc.org> Fri Mar 30 22:18:41 2018
committer Commit Bot <commit-bot@chromium.org> Mon Apr 02 18:45:27 2018
tree 4d312b46dbb5390e1a2c1ad7177cf94cb33d7c1d
parent a859c1ac3e12e460f47b86ec7068f4c195ecea08

Ensure that data channel transport stats are included

The RTCStatsCollector was only iterating through RtpTransceivers
in order to find the active transports for which to generate stats.
But for data channel only connections, there were no
RtpTransceivers so no transports were being identified.

This CL changes the stats collector to include the transport names
of the SCTP and RTP data channel if active.

Bug: chromium:826972
Change-Id: I762b253b3bbf0f0d7861bc281b8908decbb9b0d9
Reviewed-on: https://webrtc-review.googlesource.com/65788
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22697}

pc/rtcstatscollector.cc

diff --git a/pc/rtcstatscollector.cc b/pc/rtcstatscollector.cc
index 2d6a7ac..7d75ce8 100644
--- a/pc/rtcstatscollector.cc
+++ b/pc/rtcstatscollector.cc
@@ -776,6 +776,9 @@
     // |ProducePartialResultsOnNetworkThread| and
     // |ProducePartialResultsOnSignalingThread|.
     transceiver_stats_infos_ = PrepareTransceiverStatsInfos_s();
+    // Prepare |transport_names_| for use in
+    // |ProducePartialResultsOnNetworkThread|.
+    transport_names_ = PrepareTransportNames_s();
 
     // Prepare |call_stats_| here since GetCallStats() will hop to the worker
     // thread.
@@ -827,14 +830,8 @@
   rtc::scoped_refptr<RTCStatsReport> report = RTCStatsReport::Create(
       timestamp_us);
 
-  std::set<std::string> transport_names;
-  for (const auto& stats : transceiver_stats_infos_) {
-    if (stats.transport_name) {
-      transport_names.insert(*stats.transport_name);
-    }
-  }
   std::map<std::string, cricket::TransportStats> transport_stats_by_name =
-      pc_->GetTransportStatsByNames(transport_names);
+      pc_->GetTransportStatsByNames(transport_names_);
 
   std::map<std::string, CertificateStatsPair> transport_cert_stats =
       PrepareTransportCertificateStats_n(transport_stats_by_name);
@@ -1483,6 +1480,23 @@
   return transceiver_stats_infos;
 }
 
+std::set<std::string> RTCStatsCollector::PrepareTransportNames_s() const {
+  std::set<std::string> transport_names;
+  for (const auto& transceiver : pc_->GetTransceiversInternal()) {
+    if (transceiver->internal()->channel()) {
+      transport_names.insert(
+          transceiver->internal()->channel()->transport_name());
+    }
+  }
+  if (pc_->rtp_data_channel()) {
+    transport_names.insert(pc_->rtp_data_channel()->transport_name());
+  }
+  if (pc_->sctp_transport_name()) {
+    transport_names.insert(*pc_->sctp_transport_name());
+  }
+  return transport_names;
+}
+
 void RTCStatsCollector::OnDataChannelCreated(DataChannel* channel) {
   channel->SignalOpened.connect(this, &RTCStatsCollector::OnDataChannelOpened);
   channel->SignalClosed.connect(this, &RTCStatsCollector::OnDataChannelClosed);