RTCIceCandidateStats.transportId added and collected.

RTCIceCandidateStats.transportId added and collected.

BUG=webrtc:6756, chromium:632723, chromium:627816
Review-Url: https://codereview.webrtc.org/2597963002
Cr-Commit-Position: refs/heads/master@{#15875}
Committed: https://chromium.googlesource.com/external/webrtc/+/b4e426e8db4a761e00998660dfbd4e2797452ab0

[hbos, 2016-12-22 10:34:14]

The CQ bit was checked by hbos@webrtc.org to run a CQ dry run

[hbos, 2016-12-22 10:34:25]

Patchset #1 (id:1) has been deleted

[commit-bot: I haz the power, 2016-12-22 10:34:29]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[hbos, 2016-12-22 10:35:38]

hbos@webrtc.org changed reviewers:
+ deadbeef@webrtc.org, hta@webrtc.org

[hbos, 2016-12-22 10:35:39]

Please take a deadbeef, hta, look

[commit-bot: I haz the power, 2016-12-22 10:50:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-22 10:50:34]

Dry run: Try jobs failed on following builders:
  ios64_sim_dbg on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/ios64_sim_dbg/builds/13645)

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

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstats_integ...
File webrtc/api/rtcstats_integrationtest.cc (right):

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstats_integ...
webrtc/api/rtcstats_integrationtest.cc:359:
verifier.TestMemberIsOptionalIDReference(
Should get rid of "Optional"

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
File webrtc/api/rtcstatscollector.cc (right):

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
webrtc/api/rtcstatscollector.cc:268: if (!candidate.transport_name().empty()) {
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.

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
webrtc/api/rtcstatscollector.cc:654: std::string transport_id =
RTCTransportStatsIDFromTransportChannel(
Here's the transport ID you can pass into ProduceIceCandidateStats.

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
File webrtc/api/rtcstatscollector_unittest.cc (right):

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
webrtc/api/rtcstatscollector_unittest.cc:164: const std::string& transport_name
= "") {
As mentioned in other comments, I wouldn't use the transport_name on the
candidate.

[hbos, 2016-12-23 14:24:41]

Patchset #3 (id:40002) has been deleted

[hbos, 2016-12-23 14:25:05]

The CQ bit was checked by hbos@webrtc.org to run a CQ dry run

[commit-bot: I haz the power, 2016-12-23 14:25:16]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

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

PTAL deadbeef, hta

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstats_integ...
File webrtc/api/rtcstats_integrationtest.cc (right):

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstats_integ...
webrtc/api/rtcstats_integrationtest.cc:359:
verifier.TestMemberIsOptionalIDReference(
On 2016/12/22 19:28:31, Taylor Brandstetter wrote:
> Should get rid of "Optional"

Done.

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
File webrtc/api/rtcstatscollector.cc (right):

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
webrtc/api/rtcstatscollector.cc:268: if (!candidate.transport_name().empty()) {
On 2016/12/22 19:28:31, Taylor Brandstetter wrote:
> 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.

Done.

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
webrtc/api/rtcstatscollector.cc:654: std::string transport_id =
RTCTransportStatsIDFromTransportChannel(
On 2016/12/22 19:28:31, Taylor Brandstetter wrote:
> Here's the transport ID you can pass into ProduceIceCandidateStats.

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.

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
File webrtc/api/rtcstatscollector_unittest.cc (right):

https://codereview.webrtc.org/2597963002/diff/20001/webrtc/api/rtcstatscollec...
webrtc/api/rtcstatscollector_unittest.cc:164: const std::string& transport_name
= "") {
On 2016/12/22 19:28:31, Taylor Brandstetter wrote:
> As mentioned in other comments, I wouldn't use the transport_name on the
> candidate.

Done.

[hbos, 2016-12-23 14:38:11]

Description was changed from

==========
RTCIceCandidateStats.transportId added and collected.

BUG=chromium:632723, chromium:627816
==========

to

==========
RTCIceCandidateStats.transportId added and collected.

BUG=webrtc:6756, chromium:632723, chromium:627816
==========

[commit-bot: I haz the power, 2016-12-23 15:33:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-23 15:33:52]

Dry run: This issue passed the CQ dry run.

[Taylor Brandstetter, 2016-12-23 18:03:51]

lgtm

[hbos, 2016-12-27 09:49:50]

PTAL hta

[hta-webrtc, 2017-01-02 13:59:28]

lgtm

[hbos, 2017-01-02 15:06:29]

The CQ bit was checked by hbos@webrtc.org

[hbos, 2017-01-02 15:06:29]

The patchset sent to the CQ was uploaded after l-g-t-m from hta@webrtc.org,
deadbeef@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2597963002/#ps90001 (title:
"Rebase with master")

[commit-bot: I haz the power, 2017-01-02 15:06:43]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-02 16:12:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-02 16:12:20]

Failed to apply patch for webrtc/api/rtcstatscollector.cc:
While running git apply --index -p1;
  error: patch failed: webrtc/api/rtcstatscollector.cc:643
  error: webrtc/api/rtcstatscollector.cc: patch does not apply

Patch:       webrtc/api/rtcstatscollector.cc
Index: webrtc/api/rtcstatscollector.cc
diff --git a/webrtc/api/rtcstatscollector.cc b/webrtc/api/rtcstatscollector.cc
index
85113e69a2e925271ad1c1150a3e02ff62ed9880..6a5cbe5709deb40ac22d4cd09d2ec9c268496ef0
100644
--- a/webrtc/api/rtcstatscollector.cc
+++ b/webrtc/api/rtcstatscollector.cc
@@ -256,7 +256,7 @@ void ProduceCertificateStatsFromSSLCertificateStats(
 
 const std::string& ProduceIceCandidateStats(
     int64_t timestamp_us, const cricket::Candidate& candidate, bool is_local,
-    RTCStatsReport* report) {
+    const std::string& transport_id, RTCStatsReport* report) {
   const std::string& id = "RTCIceCandidate_" + candidate.id();
   const RTCStats* stats = report->Get(id);
   if (!stats) {
@@ -265,6 +265,7 @@ const std::string& ProduceIceCandidateStats(
       candidate_stats.reset(new RTCLocalIceCandidateStats(id, timestamp_us));
     else
       candidate_stats.reset(new RTCRemoteIceCandidateStats(id, timestamp_us));
+    candidate_stats->transport_id = transport_id;
     candidate_stats->ip = candidate.address().ipaddr().ToString();
     candidate_stats->port = static_cast<int32_t>(candidate.address().port());
     candidate_stats->protocol = candidate.protocol();
@@ -643,9 +644,9 @@ void RTCStatsCollector::ProduceIceCandidateAndPairStats_n(
         // Port objects, and prflx candidates (both local and remote) are only
         // stored in candidate pairs. crbug.com/632723
         candidate_pair_stats->local_candidate_id = ProduceIceCandidateStats(
-            timestamp_us, info.local_candidate, true, report);
+            timestamp_us, info.local_candidate, true, transport_id, report);
         candidate_pair_stats->remote_candidate_id = ProduceIceCandidateStats(
-            timestamp_us, info.remote_candidate, false, report);
+            timestamp_us, info.remote_candidate, false, transport_id, report);
         // TODO(hbos): This writable is different than the spec. It goes to
         // false after a certain amount of time without a response passes.
         // crbug.com/633550

[hbos, 2017-01-02 16:53:09]

The CQ bit was checked by hbos@webrtc.org

[hbos, 2017-01-02 16:53:09]

The patchset sent to the CQ was uploaded after l-g-t-m from hta@webrtc.org,
deadbeef@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2597963002/#ps110001 (title:
"Rebase with master")

[commit-bot: I haz the power, 2017-01-02 16:53:19]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-01-02 17:59:32]

CQ is committing da patch.

Bot data: {"patchset_id": 110001, "attempt_start_ts": 1483375989242600,
"parent_rev": "d25f79eb83fb6f78e345f2a27b8f8a0a2e5d2198", "commit_rev":
"b4e426e8db4a761e00998660dfbd4e2797452ab0"}

[commit-bot: I haz the power, 2017-01-02 17:59:34]

Description was changed from

==========
RTCIceCandidateStats.transportId added and collected.

BUG=webrtc:6756, chromium:632723, chromium:627816
==========

to

==========
RTCIceCandidateStats.transportId added and collected.

BUG=webrtc:6756, chromium:632723, chromium:627816

Review-Url: https://codereview.webrtc.org/2597963002
Cr-Commit-Position: refs/heads/master@{#15875}
Committed:
https://chromium.googlesource.com/external/webrtc/+/b4e426e8db4a761e00998660d...
==========

[commit-bot: I haz the power, 2017-01-02 17:59:34]

Committed patchset #5 (id:110001) as
https://chromium.googlesource.com/external/webrtc/+/b4e426e8db4a761e00998660d...