This is a reland of 1a2cc0acba6a66f89249455d8e5775849b56f755 Original change's description: > Reland "Replace the usage of MetricsObserverInterface by RTC_HISTOGRAM_*." > > This is a reland of 870bca1f418a1abf445169a638a61f9a649d557f > > Original change's description: > > Replace the usage of MetricsObserverInterface by RTC_HISTOGRAM_*. > > > > We now use RTC_HISTOGRAM_* macros in system_wrappers/include/metrics.h > > to report the metrics in pc/ and p2p/ that are currently been reported > > using MetricsObserverInterface. > > > > TBR=tommi@webrtc.org > > > > Bug: webrtc:9409 > > Change-Id: I47c9975402293c72250203fa1ec19eb1668766f6 > > Reviewed-on: https://webrtc-review.googlesource.com/83782 > > Commit-Queue: Qingsi Wang <qingsi@google.com> > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Reviewed-by: Taylor (left Google) <deadbeef@webrtc.org> > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#23914} > > TBR=steveanton@webrtc.org,hta@webrtc.org,tommi@webrtc.org > > Bug: webrtc:9409 > Change-Id: I37fc95ced60dea25aa9b4f5ad44bdf7174c8bd5c > Reviewed-on: https://webrtc-review.googlesource.com/88060 > Reviewed-by: Qingsi Wang <qingsi@webrtc.org> > Commit-Queue: Qingsi Wang <qingsi@google.com> > Cr-Commit-Position: refs/heads/master@{#23919} TBR=steveanton@webrtc.org,tommi@webrtc.org Bug: webrtc:9409 Change-Id: Ib55f0b6c9bcb9d9585924a4dfac5cf643ff4d76b Reviewed-on: https://webrtc-review.googlesource.com/88343 Commit-Queue: Qingsi Wang <qingsi@google.com> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23957}
321 lines
12 KiB
C++
321 lines
12 KiB
C++
/*
|
|
* Copyright 2017 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.
|
|
*/
|
|
|
|
#include <tuple>
|
|
|
|
#include "absl/memory/memory.h"
|
|
#include "api/jsep.h"
|
|
#include "api/peerconnectionproxy.h"
|
|
#include "media/base/fakemediaengine.h"
|
|
#include "pc/mediasession.h"
|
|
#include "pc/peerconnection.h"
|
|
#include "pc/peerconnectionfactory.h"
|
|
#include "pc/peerconnectionwrapper.h"
|
|
#include "pc/sdputils.h"
|
|
#include "pc/test/fakesctptransport.h"
|
|
#include "rtc_base/gunit.h"
|
|
#include "rtc_base/virtualsocketserver.h"
|
|
#include "system_wrappers/include/metrics_default.h"
|
|
|
|
namespace webrtc {
|
|
|
|
using RTCConfiguration = PeerConnectionInterface::RTCConfiguration;
|
|
using RTCOfferAnswerOptions = PeerConnectionInterface::RTCOfferAnswerOptions;
|
|
using ::testing::Values;
|
|
|
|
static constexpr int kDefaultTimeout = 10000;
|
|
|
|
int MakeUsageFingerprint(std::set<PeerConnection::UsageEvent> events) {
|
|
int signature = 0;
|
|
for (const auto it : events) {
|
|
signature |= static_cast<int>(it);
|
|
}
|
|
return signature;
|
|
}
|
|
|
|
class PeerConnectionFactoryForUsageHistogramTest
|
|
: public rtc::RefCountedObject<PeerConnectionFactory> {
|
|
public:
|
|
PeerConnectionFactoryForUsageHistogramTest()
|
|
: rtc::RefCountedObject<PeerConnectionFactory>(
|
|
rtc::Thread::Current(),
|
|
rtc::Thread::Current(),
|
|
rtc::Thread::Current(),
|
|
absl::make_unique<cricket::FakeMediaEngine>(),
|
|
CreateCallFactory(),
|
|
nullptr) {}
|
|
|
|
void ActionsBeforeInitializeForTesting(PeerConnectionInterface* pc) override {
|
|
PeerConnection* internal_pc = static_cast<PeerConnection*>(pc);
|
|
if (return_histogram_very_quickly_) {
|
|
internal_pc->ReturnHistogramVeryQuicklyForTesting();
|
|
}
|
|
}
|
|
|
|
void ReturnHistogramVeryQuickly() { return_histogram_very_quickly_ = true; }
|
|
|
|
private:
|
|
bool return_histogram_very_quickly_ = false;
|
|
};
|
|
|
|
class PeerConnectionWrapperForUsageHistogramTest;
|
|
typedef PeerConnectionWrapperForUsageHistogramTest* RawWrapperPtr;
|
|
|
|
class ObserverForUsageHistogramTest : public MockPeerConnectionObserver {
|
|
public:
|
|
void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
|
|
void PrepareToExchangeCandidates(RawWrapperPtr other) {
|
|
candidate_target_ = other;
|
|
}
|
|
|
|
bool HaveDataChannel() { return last_datachannel_; }
|
|
|
|
private:
|
|
RawWrapperPtr candidate_target_; // Note: Not thread-safe against deletions.
|
|
};
|
|
|
|
class PeerConnectionWrapperForUsageHistogramTest
|
|
: public PeerConnectionWrapper {
|
|
public:
|
|
using PeerConnectionWrapper::PeerConnectionWrapper;
|
|
|
|
PeerConnection* GetInternalPeerConnection() {
|
|
auto* pci =
|
|
static_cast<PeerConnectionProxyWithInternal<PeerConnectionInterface>*>(
|
|
pc());
|
|
return static_cast<PeerConnection*>(pci->internal());
|
|
}
|
|
|
|
void PrepareToExchangeCandidates(
|
|
PeerConnectionWrapperForUsageHistogramTest* other) {
|
|
static_cast<ObserverForUsageHistogramTest*>(observer())
|
|
->PrepareToExchangeCandidates(other);
|
|
static_cast<ObserverForUsageHistogramTest*>(other->observer())
|
|
->PrepareToExchangeCandidates(this);
|
|
}
|
|
|
|
bool IsConnected() {
|
|
return pc()->ice_connection_state() ==
|
|
PeerConnectionInterface::kIceConnectionConnected ||
|
|
pc()->ice_connection_state() ==
|
|
PeerConnectionInterface::kIceConnectionCompleted;
|
|
}
|
|
|
|
bool HaveDataChannel() {
|
|
return static_cast<ObserverForUsageHistogramTest*>(observer())
|
|
->HaveDataChannel();
|
|
}
|
|
void AddOrBufferIceCandidate(const webrtc::IceCandidateInterface* candidate) {
|
|
if (!pc()->AddIceCandidate(candidate)) {
|
|
std::string sdp;
|
|
EXPECT_TRUE(candidate->ToString(&sdp));
|
|
std::unique_ptr<webrtc::IceCandidateInterface> candidate_copy(
|
|
CreateIceCandidate(candidate->sdp_mid(), candidate->sdp_mline_index(),
|
|
sdp, nullptr));
|
|
buffered_candidates_.push_back(std::move(candidate_copy));
|
|
}
|
|
}
|
|
void AddBufferedIceCandidates() {
|
|
for (const auto& candidate : buffered_candidates_) {
|
|
EXPECT_TRUE(pc()->AddIceCandidate(candidate.get()));
|
|
}
|
|
buffered_candidates_.clear();
|
|
}
|
|
bool ConnectTo(PeerConnectionWrapperForUsageHistogramTest* callee) {
|
|
PrepareToExchangeCandidates(callee);
|
|
EXPECT_TRUE(ExchangeOfferAnswerWith(callee));
|
|
AddBufferedIceCandidates();
|
|
callee->AddBufferedIceCandidates();
|
|
EXPECT_TRUE_WAIT(IsConnected(), kDefaultTimeout);
|
|
EXPECT_TRUE_WAIT(callee->IsConnected(), kDefaultTimeout);
|
|
return IsConnected() && callee->IsConnected();
|
|
}
|
|
|
|
private:
|
|
// Candidates that have been sent but not yet configured
|
|
std::vector<std::unique_ptr<webrtc::IceCandidateInterface>>
|
|
buffered_candidates_;
|
|
};
|
|
|
|
void ObserverForUsageHistogramTest::OnIceCandidate(
|
|
const webrtc::IceCandidateInterface* candidate) {
|
|
if (candidate_target_) {
|
|
this->candidate_target_->AddOrBufferIceCandidate(candidate);
|
|
} else {
|
|
FAIL() << "Early candidate detected";
|
|
}
|
|
}
|
|
|
|
class PeerConnectionUsageHistogramTest : public ::testing::Test {
|
|
protected:
|
|
typedef std::unique_ptr<PeerConnectionWrapperForUsageHistogramTest>
|
|
WrapperPtr;
|
|
|
|
PeerConnectionUsageHistogramTest()
|
|
: vss_(new rtc::VirtualSocketServer()), main_(vss_.get()) {
|
|
webrtc::metrics::Reset();
|
|
}
|
|
|
|
WrapperPtr CreatePeerConnection() {
|
|
return CreatePeerConnection(
|
|
RTCConfiguration(), PeerConnectionFactoryInterface::Options(), false);
|
|
}
|
|
|
|
WrapperPtr CreatePeerConnection(const RTCConfiguration& config) {
|
|
return CreatePeerConnection(
|
|
config, PeerConnectionFactoryInterface::Options(), false);
|
|
}
|
|
|
|
WrapperPtr CreatePeerConnectionWithImmediateReport() {
|
|
return CreatePeerConnection(
|
|
RTCConfiguration(), PeerConnectionFactoryInterface::Options(), true);
|
|
}
|
|
|
|
WrapperPtr CreatePeerConnection(
|
|
const RTCConfiguration& config,
|
|
const PeerConnectionFactoryInterface::Options factory_options,
|
|
bool immediate_report) {
|
|
rtc::scoped_refptr<PeerConnectionFactoryForUsageHistogramTest> pc_factory(
|
|
new PeerConnectionFactoryForUsageHistogramTest());
|
|
pc_factory->SetOptions(factory_options);
|
|
RTC_CHECK(pc_factory->Initialize());
|
|
if (immediate_report) {
|
|
pc_factory->ReturnHistogramVeryQuickly();
|
|
}
|
|
auto observer = absl::make_unique<ObserverForUsageHistogramTest>();
|
|
auto pc = pc_factory->CreatePeerConnection(config, nullptr, nullptr,
|
|
observer.get());
|
|
if (!pc) {
|
|
return nullptr;
|
|
}
|
|
|
|
auto wrapper =
|
|
absl::make_unique<PeerConnectionWrapperForUsageHistogramTest>(
|
|
pc_factory, pc, std::move(observer));
|
|
return wrapper;
|
|
}
|
|
|
|
std::unique_ptr<rtc::VirtualSocketServer> vss_;
|
|
rtc::AutoSocketServerThread main_;
|
|
};
|
|
|
|
TEST_F(PeerConnectionUsageHistogramTest, UsageFingerprintHistogramFromTimeout) {
|
|
auto pc = CreatePeerConnectionWithImmediateReport();
|
|
|
|
int expected_fingerprint = MakeUsageFingerprint({});
|
|
ASSERT_TRUE_WAIT(
|
|
1u == webrtc::metrics::NumSamples("WebRTC.PeerConnection.UsagePattern"),
|
|
kDefaultTimeout);
|
|
EXPECT_EQ(1, webrtc::metrics::NumEvents("WebRTC.PeerConnection.UsagePattern",
|
|
expected_fingerprint));
|
|
}
|
|
|
|
#ifndef WEBRTC_ANDROID
|
|
// These tests do not work on Android. Why is unclear.
|
|
// https://bugs.webrtc.org/9461
|
|
|
|
// Test getting the usage fingerprint for an audio/video connection.
|
|
TEST_F(PeerConnectionUsageHistogramTest, FingerprintAudioVideo) {
|
|
auto caller = CreatePeerConnection();
|
|
auto callee = CreatePeerConnection();
|
|
caller->AddAudioTrack("audio");
|
|
caller->AddVideoTrack("video");
|
|
ASSERT_TRUE(caller->ConnectTo(callee.get()));
|
|
caller->pc()->Close();
|
|
callee->pc()->Close();
|
|
int expected_fingerprint = MakeUsageFingerprint(
|
|
{PeerConnection::UsageEvent::AUDIO_ADDED,
|
|
PeerConnection::UsageEvent::VIDEO_ADDED,
|
|
PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_CALLED,
|
|
PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_CALLED,
|
|
PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
|
|
PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
|
|
PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
|
|
PeerConnection::UsageEvent::CLOSE_CALLED});
|
|
EXPECT_EQ(2,
|
|
webrtc::metrics::NumSamples("WebRTC.PeerConnection.UsagePattern"));
|
|
EXPECT_EQ(2, webrtc::metrics::NumEvents("WebRTC.PeerConnection.UsagePattern",
|
|
expected_fingerprint));
|
|
}
|
|
|
|
#ifdef HAVE_SCTP
|
|
TEST_F(PeerConnectionUsageHistogramTest, FingerprintDataOnly) {
|
|
auto caller = CreatePeerConnection();
|
|
auto callee = CreatePeerConnection();
|
|
caller->CreateDataChannel("foodata");
|
|
ASSERT_TRUE(caller->ConnectTo(callee.get()));
|
|
ASSERT_TRUE_WAIT(callee->HaveDataChannel(), kDefaultTimeout);
|
|
caller->pc()->Close();
|
|
callee->pc()->Close();
|
|
int expected_fingerprint = MakeUsageFingerprint(
|
|
{PeerConnection::UsageEvent::DATA_ADDED,
|
|
PeerConnection::UsageEvent::SET_LOCAL_DESCRIPTION_CALLED,
|
|
PeerConnection::UsageEvent::SET_REMOTE_DESCRIPTION_CALLED,
|
|
PeerConnection::UsageEvent::CANDIDATE_COLLECTED,
|
|
PeerConnection::UsageEvent::REMOTE_CANDIDATE_ADDED,
|
|
PeerConnection::UsageEvent::ICE_STATE_CONNECTED,
|
|
PeerConnection::UsageEvent::CLOSE_CALLED});
|
|
EXPECT_EQ(2,
|
|
webrtc::metrics::NumSamples("WebRTC.PeerConnection.UsagePattern"));
|
|
EXPECT_EQ(2, webrtc::metrics::NumEvents("WebRTC.PeerConnection.UsagePattern",
|
|
expected_fingerprint));
|
|
}
|
|
#endif // HAVE_SCTP
|
|
#endif // WEBRTC_ANDROID
|
|
|
|
TEST_F(PeerConnectionUsageHistogramTest, FingerprintStunTurn) {
|
|
RTCConfiguration configuration;
|
|
PeerConnection::IceServer server;
|
|
server.urls = {"stun:dummy.stun.server/"};
|
|
configuration.servers.push_back(server);
|
|
server.urls = {"turn:dummy.turn.server/"};
|
|
server.username = "username";
|
|
server.password = "password";
|
|
configuration.servers.push_back(server);
|
|
auto caller = CreatePeerConnection(configuration);
|
|
ASSERT_TRUE(caller);
|
|
caller->pc()->Close();
|
|
int expected_fingerprint =
|
|
MakeUsageFingerprint({PeerConnection::UsageEvent::STUN_SERVER_ADDED,
|
|
PeerConnection::UsageEvent::TURN_SERVER_ADDED,
|
|
PeerConnection::UsageEvent::CLOSE_CALLED});
|
|
EXPECT_EQ(1,
|
|
webrtc::metrics::NumSamples("WebRTC.PeerConnection.UsagePattern"));
|
|
EXPECT_EQ(1, webrtc::metrics::NumEvents("WebRTC.PeerConnection.UsagePattern",
|
|
expected_fingerprint));
|
|
}
|
|
|
|
TEST_F(PeerConnectionUsageHistogramTest, FingerprintStunTurnInReconfiguration) {
|
|
RTCConfiguration configuration;
|
|
PeerConnection::IceServer server;
|
|
server.urls = {"stun:dummy.stun.server/"};
|
|
configuration.servers.push_back(server);
|
|
server.urls = {"turn:dummy.turn.server/"};
|
|
server.username = "username";
|
|
server.password = "password";
|
|
configuration.servers.push_back(server);
|
|
auto caller = CreatePeerConnection();
|
|
ASSERT_TRUE(caller);
|
|
RTCError error;
|
|
caller->pc()->SetConfiguration(configuration, &error);
|
|
ASSERT_TRUE(error.ok());
|
|
caller->pc()->Close();
|
|
int expected_fingerprint =
|
|
MakeUsageFingerprint({PeerConnection::UsageEvent::STUN_SERVER_ADDED,
|
|
PeerConnection::UsageEvent::TURN_SERVER_ADDED,
|
|
PeerConnection::UsageEvent::CLOSE_CALLED});
|
|
EXPECT_EQ(1,
|
|
webrtc::metrics::NumSamples("WebRTC.PeerConnection.UsagePattern"));
|
|
EXPECT_EQ(1, webrtc::metrics::NumEvents("WebRTC.PeerConnection.UsagePattern",
|
|
expected_fingerprint));
|
|
}
|
|
|
|
} // namespace webrtc
|