[CodeHealth][1/2] Remove expired histogram: WebRTC.PeerConnection.IceRestartState
To remove histogram WebRTC.PeerConnection.IceRestartState expired in M77, this CL removes the supporting codebase for it. The removal of the histogram itself will be performed in crrev.com/c/5131874. This CL is a part of Chrome Code Health Rotation project. Bug: chromium:1507998 Change-Id: I0451b6fbe2ae46a9c9d9be7c0302f7f01117af97 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/331881 Reviewed-by: Per Kjellander <perkj@webrtc.org> Commit-Queue: Taiyo Mizuhashi <taiyo@chromium.org> Cr-Commit-Position: refs/heads/main@{#41429}
This commit is contained in:
parent
5366794f3a
commit
4931512cb0
@ -872,20 +872,6 @@ void P2PTransportChannel::MaybeStartGathering() {
|
||||
SendGatheringStateEvent();
|
||||
}
|
||||
|
||||
if (!allocator_sessions_.empty()) {
|
||||
IceRestartState state;
|
||||
if (writable()) {
|
||||
state = IceRestartState::CONNECTED;
|
||||
} else if (IsGettingPorts()) {
|
||||
state = IceRestartState::CONNECTING;
|
||||
} else {
|
||||
state = IceRestartState::DISCONNECTED;
|
||||
}
|
||||
RTC_HISTOGRAM_ENUMERATION("WebRTC.PeerConnection.IceRestartState",
|
||||
static_cast<int>(state),
|
||||
static_cast<int>(IceRestartState::MAX_VALUE));
|
||||
}
|
||||
|
||||
for (const auto& session : allocator_sessions_) {
|
||||
if (session->IsStopped()) {
|
||||
continue;
|
||||
|
||||
@ -79,10 +79,6 @@ class RtcEventLog;
|
||||
|
||||
namespace cricket {
|
||||
|
||||
// Enum for UMA metrics, used to record whether the channel is
|
||||
// connected/connecting/disconnected when ICE restart happens.
|
||||
enum class IceRestartState { CONNECTING, CONNECTED, DISCONNECTED, MAX_VALUE };
|
||||
|
||||
static const int MIN_PINGS_AT_WEAK_PING_INTERVAL = 3;
|
||||
|
||||
bool IceCredentialsChanged(absl::string_view old_ufrag,
|
||||
|
||||
@ -1478,92 +1478,6 @@ TEST_F(P2PTransportChannelTest, GetStatsSwitchConnection) {
|
||||
DestroyChannels();
|
||||
}
|
||||
|
||||
// Tests that UMAs are recorded when ICE restarts while the channel
|
||||
// is disconnected.
|
||||
TEST_F(P2PTransportChannelTest, TestUMAIceRestartWhileDisconnected) {
|
||||
rtc::ScopedFakeClock clock;
|
||||
ConfigureEndpoints(OPEN, OPEN, kOnlyLocalPorts, kOnlyLocalPorts);
|
||||
|
||||
CreateChannels();
|
||||
EXPECT_TRUE_SIMULATED_WAIT(CheckConnected(ep1_ch1(), ep2_ch1()),
|
||||
kDefaultTimeout, clock);
|
||||
|
||||
// Drop all packets so that both channels become not writable.
|
||||
fw()->AddRule(false, rtc::FP_ANY, rtc::FD_ANY, kPublicAddrs[0]);
|
||||
const int kWriteTimeoutDelay = 8000;
|
||||
EXPECT_TRUE_SIMULATED_WAIT(!ep1_ch1()->writable() && !ep2_ch1()->writable(),
|
||||
kWriteTimeoutDelay, clock);
|
||||
|
||||
ep1_ch1()->SetIceParameters(kIceParams[2]);
|
||||
ep1_ch1()->SetRemoteIceParameters(kIceParams[3]);
|
||||
ep1_ch1()->MaybeStartGathering();
|
||||
EXPECT_METRIC_EQ(1, webrtc::metrics::NumEvents(
|
||||
"WebRTC.PeerConnection.IceRestartState",
|
||||
static_cast<int>(IceRestartState::DISCONNECTED)));
|
||||
|
||||
ep2_ch1()->SetIceParameters(kIceParams[3]);
|
||||
ep2_ch1()->SetRemoteIceParameters(kIceParams[2]);
|
||||
ep2_ch1()->MaybeStartGathering();
|
||||
EXPECT_METRIC_EQ(2, webrtc::metrics::NumEvents(
|
||||
"WebRTC.PeerConnection.IceRestartState",
|
||||
static_cast<int>(IceRestartState::DISCONNECTED)));
|
||||
|
||||
DestroyChannels();
|
||||
}
|
||||
|
||||
// Tests that UMAs are recorded when ICE restarts while the channel
|
||||
// is connected.
|
||||
TEST_F(P2PTransportChannelTest, TestUMAIceRestartWhileConnected) {
|
||||
rtc::ScopedFakeClock clock;
|
||||
ConfigureEndpoints(OPEN, OPEN, kOnlyLocalPorts, kOnlyLocalPorts);
|
||||
|
||||
CreateChannels();
|
||||
EXPECT_TRUE_SIMULATED_WAIT(CheckConnected(ep1_ch1(), ep2_ch1()),
|
||||
kDefaultTimeout, clock);
|
||||
|
||||
ep1_ch1()->SetIceParameters(kIceParams[2]);
|
||||
ep1_ch1()->SetRemoteIceParameters(kIceParams[3]);
|
||||
ep1_ch1()->MaybeStartGathering();
|
||||
EXPECT_METRIC_EQ(1, webrtc::metrics::NumEvents(
|
||||
"WebRTC.PeerConnection.IceRestartState",
|
||||
static_cast<int>(IceRestartState::CONNECTED)));
|
||||
|
||||
ep2_ch1()->SetIceParameters(kIceParams[3]);
|
||||
ep2_ch1()->SetRemoteIceParameters(kIceParams[2]);
|
||||
ep2_ch1()->MaybeStartGathering();
|
||||
EXPECT_METRIC_EQ(2, webrtc::metrics::NumEvents(
|
||||
"WebRTC.PeerConnection.IceRestartState",
|
||||
static_cast<int>(IceRestartState::CONNECTED)));
|
||||
|
||||
DestroyChannels();
|
||||
}
|
||||
|
||||
// Tests that UMAs are recorded when ICE restarts while the channel
|
||||
// is connecting.
|
||||
TEST_F(P2PTransportChannelTest, TestUMAIceRestartWhileConnecting) {
|
||||
rtc::ScopedFakeClock clock;
|
||||
ConfigureEndpoints(OPEN, OPEN, kOnlyLocalPorts, kOnlyLocalPorts);
|
||||
|
||||
// Create the channels without waiting for them to become connected.
|
||||
CreateChannels();
|
||||
|
||||
ep1_ch1()->SetIceParameters(kIceParams[2]);
|
||||
ep1_ch1()->SetRemoteIceParameters(kIceParams[3]);
|
||||
ep1_ch1()->MaybeStartGathering();
|
||||
EXPECT_METRIC_EQ(1, webrtc::metrics::NumEvents(
|
||||
"WebRTC.PeerConnection.IceRestartState",
|
||||
static_cast<int>(IceRestartState::CONNECTING)));
|
||||
|
||||
ep2_ch1()->SetIceParameters(kIceParams[3]);
|
||||
ep2_ch1()->SetRemoteIceParameters(kIceParams[2]);
|
||||
ep2_ch1()->MaybeStartGathering();
|
||||
EXPECT_METRIC_EQ(2, webrtc::metrics::NumEvents(
|
||||
"WebRTC.PeerConnection.IceRestartState",
|
||||
static_cast<int>(IceRestartState::CONNECTING)));
|
||||
|
||||
DestroyChannels();
|
||||
}
|
||||
|
||||
// Tests that a UMA on ICE regathering is recorded when there is a network
|
||||
// change if and only if continual gathering is enabled.
|
||||
TEST_F(P2PTransportChannelTest,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user