admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

peerconnection: move first connect metrics gathering to helper function

Browse Source 
since it has grown too large

BUG=None

Change-Id: I9dfffd6264db3206c0674a3446c857c139ba6fb8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267826
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#37492}
This commit is contained in:
Philipp Hancke 2022-07-06 09:26:41 +02:00 committed by WebRTC LUCI CQ
parent 9f1104731e
commit 9799fe036a
2 changed files with 62 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
pc/peer_connection.cc
View File

@ -1934,67 +1934,70 @@ void PeerConnection::SetConnectionState(
connection_state_ = new_state;
Observer()->OnConnectionChange(new_state);
// The first connection state change to connected happens once per
// connection which makes it a good point to report metrics.
if (new_state == PeerConnectionState::kConnected && !was_ever_connected_) {
was_ever_connected_ = true;
// The first connection state change to connected happens once per
// connection which makes it a good point to report metrics.
// Record bundle-policy from configuration. Done here from
// connectionStateChange to limit to actually established connections.
BundlePolicyUsage policy = kBundlePolicyUsageMax;
switch (configuration_.bundle_policy) {
case kBundlePolicyBalanced:
policy = kBundlePolicyUsageBalanced;
break;
case kBundlePolicyMaxBundle:
policy = kBundlePolicyUsageMaxBundle;
break;
case kBundlePolicyMaxCompat:
policy = kBundlePolicyUsageMaxCompat;
break;
}
RTC_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.BundlePolicy", policy,
kBundlePolicyUsageMax);
// Record configured ice candidate pool size depending on the
// BUNDLE policy. See
// https://w3c.github.io/webrtc-pc/#dom-rtcconfiguration-icecandidatepoolsize
// The ICE candidate pool size is an optimization and it may be desirable
// to restrict the maximum size of the pre-gathered candidates.
switch (configuration_.bundle_policy) {
case kBundlePolicyBalanced:
RTC_HISTOGRAM_COUNTS_LINEAR(
"WebRTC.PeerConnection.CandidatePoolUsage.Balanced",
configuration_.ice_candidate_pool_size, 0, 255, 256);
break;
case kBundlePolicyMaxBundle:
RTC_HISTOGRAM_COUNTS_LINEAR(
"WebRTC.PeerConnection.CandidatePoolUsage.MaxBundle",
configuration_.ice_candidate_pool_size, 0, 255, 256);
break;
case kBundlePolicyMaxCompat:
RTC_HISTOGRAM_COUNTS_LINEAR(
"WebRTC.PeerConnection.CandidatePoolUsage.MaxCompat",
configuration_.ice_candidate_pool_size, 0, 255, 256);
break;
}
// Record whether there was a local or remote provisional answer.
ProvisionalAnswerUsage pranswer = kProvisionalAnswerNotUsed;
if (local_description()->GetType() == SdpType::kPrAnswer) {
pranswer = kProvisionalAnswerLocal;
} else if (remote_description()->GetType() == SdpType::kPrAnswer) {
pranswer = kProvisionalAnswerRemote;
}
RTC_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.ProvisionalAnswer",
pranswer, kProvisionalAnswerMax);
// Record the number of configured ICE servers for connected connections.
RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.PeerConnection.IceServers.Connected",
configuration_.servers.size(), 0, 31, 32);
ReportFirstConnectUsageMetrics();
}
}
void PeerConnection::ReportFirstConnectUsageMetrics() {
// Record bundle-policy from configuration. Done here from
// connectionStateChange to limit to actually established connections.
BundlePolicyUsage policy = kBundlePolicyUsageMax;
switch (configuration_.bundle_policy) {
case kBundlePolicyBalanced:
policy = kBundlePolicyUsageBalanced;
break;
case kBundlePolicyMaxBundle:
policy = kBundlePolicyUsageMaxBundle;
break;
case kBundlePolicyMaxCompat:
policy = kBundlePolicyUsageMaxCompat;
break;
}
RTC_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.BundlePolicy", policy,
kBundlePolicyUsageMax);
// Record configured ice candidate pool size depending on the
// BUNDLE policy. See
// https://w3c.github.io/webrtc-pc/#dom-rtcconfiguration-icecandidatepoolsize
// The ICE candidate pool size is an optimization and it may be desirable
// to restrict the maximum size of the pre-gathered candidates.
switch (configuration_.bundle_policy) {
case kBundlePolicyBalanced:
RTC_HISTOGRAM_COUNTS_LINEAR(
"WebRTC.PeerConnection.CandidatePoolUsage.Balanced",
configuration_.ice_candidate_pool_size, 0, 255, 256);
break;
case kBundlePolicyMaxBundle:
RTC_HISTOGRAM_COUNTS_LINEAR(
"WebRTC.PeerConnection.CandidatePoolUsage.MaxBundle",
configuration_.ice_candidate_pool_size, 0, 255, 256);
break;
case kBundlePolicyMaxCompat:
RTC_HISTOGRAM_COUNTS_LINEAR(
"WebRTC.PeerConnection.CandidatePoolUsage.MaxCompat",
configuration_.ice_candidate_pool_size, 0, 255, 256);
break;
}
// Record whether there was a local or remote provisional answer.
ProvisionalAnswerUsage pranswer = kProvisionalAnswerNotUsed;
if (local_description()->GetType() == SdpType::kPrAnswer) {
pranswer = kProvisionalAnswerLocal;
} else if (remote_description()->GetType() == SdpType::kPrAnswer) {
pranswer = kProvisionalAnswerRemote;
}
RTC_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.ProvisionalAnswer", pranswer,
kProvisionalAnswerMax);
// Record the number of configured ICE servers for connected connections.
RTC_HISTOGRAM_COUNTS_LINEAR("WebRTC.PeerConnection.IceServers.Connected",
configuration_.servers.size(), 0, 31, 32);
}
void PeerConnection::OnIceGatheringChange(
PeerConnectionInterface::IceGatheringState new_state) {
if (IsClosed()) {

3
pc/peer_connection.h
View File

@ -379,6 +379,9 @@ class PeerConnection : public PeerConnectionInternal,
void ReportSdpBundleUsage(
const SessionDescriptionInterface& remote_description) override;
// Report several UMA metrics on establishing the connection.
void ReportFirstConnectUsageMetrics() RTC_RUN_ON(signaling_thread());
// Returns true if the PeerConnection is configured to use Unified Plan
// semantics for creating offers/answers and setting local/remote
// descriptions. If this is true the RtpTransceiver API will also be available