Skip to content

stats: Don't expect vec.front() to be predictable when populated from unordered container #4573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 4 commits into from
Oct 1, 2018
Merged

stats: Don't expect vec.front() to be predictable when populated from unordered container #4573

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e29265
Don't expect vec.front() to be predictable when populated from unorde…
jmarantz Oct 1, 2018
365a8db
add doxygen doc for findByName()
jmarantz Oct 1, 2018
084cc8f
Integrate the new template method for finding a counter by name with
jmarantz Oct 1, 2018
a6b7014
Remove the potentially flaky call to cachedCounters().front() -- the …
jmarantz Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions test/common/stats/thread_local_store_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ class StatsThreadLocalStoreTest : public testing::Test {
store_->addSink(sink_);
}

/**
* Finds a stat in a vector with the given name.
* @param name the stat name to look for.
* @param v the vector of stats.
* @return the stat
*/
template <typename T> T findByName(const std::string& name, const std::vector<T>& v) {
Comment thread
jmarantz marked this conversation as resolved.
Outdated
auto pos = std::find_if(v.begin(), v.end(),
[&name](const T& stat) -> bool { return stat->name() == name; });
EXPECT_TRUE(pos != v.end());
return *pos;
}

NiceMock<Event::MockDispatcher> main_thread_dispatcher_;
NiceMock<ThreadLocal::MockInstance> tls_;
StatsOptionsImpl options_;
Expand Down Expand Up @@ -184,10 +197,10 @@ TEST_F(StatsThreadLocalStoreTest, NoTls) {
store_->deliverHistogramToSinks(h1, 100);

EXPECT_EQ(2UL, store_->counters().size());
EXPECT_EQ(&c1, store_->counters().front().get());
EXPECT_EQ(2L, store_->counters().front().use_count());
EXPECT_EQ(&c1, findByName("c1", store_->counters()).get());
EXPECT_EQ(3L, findByName("c1", store_->counters()).use_count());
EXPECT_EQ(1UL, store_->gauges().size());
EXPECT_EQ(&g1, store_->gauges().front().get());
EXPECT_EQ(&g1, store_->gauges().front().get()); // front() ok when size()==1
EXPECT_EQ(2L, store_->gauges().front().use_count());

// Includes overflow stat.
Expand All @@ -212,20 +225,20 @@ TEST_F(StatsThreadLocalStoreTest, Tls) {
EXPECT_EQ(&h1, &store_->histogram("h1"));

EXPECT_EQ(2UL, store_->counters().size());
EXPECT_EQ(&c1, store_->counters().front().get());
EXPECT_EQ(3L, store_->counters().front().use_count());
EXPECT_EQ(&c1, findByName("c1", store_->counters()).get());
EXPECT_EQ(4L, findByName("c1", store_->counters()).use_count());
EXPECT_EQ(1UL, store_->gauges().size());
EXPECT_EQ(&g1, store_->gauges().front().get());
EXPECT_EQ(&g1, store_->gauges().front().get()); // front() ok when size()==1
EXPECT_EQ(3L, store_->gauges().front().use_count());

store_->shutdownThreading();
tls_.shutdownThread();

EXPECT_EQ(2UL, store_->counters().size());
EXPECT_EQ(&c1, store_->counters().front().get());
EXPECT_EQ(2L, store_->counters().front().use_count());
EXPECT_EQ(&c1, findByName("c1", store_->counters()).get());
EXPECT_EQ(3L, findByName("c1", store_->counters()).use_count());
EXPECT_EQ(1UL, store_->gauges().size());
EXPECT_EQ(&g1, store_->gauges().front().get());
EXPECT_EQ(&g1, store_->gauges().front().get()); // front() ok when size()==1
EXPECT_EQ(2L, store_->gauges().front().use_count());

// Includes overflow stat.
Expand Down Expand Up @@ -291,9 +304,9 @@ TEST_F(StatsThreadLocalStoreTest, ScopeDelete) {
EXPECT_CALL(*alloc_, alloc(_));
scope1->counter("c1");
EXPECT_EQ(2UL, store_->counters().size());
CounterSharedPtr c1 = store_->counters().front();
CounterSharedPtr c1 = findByName("scope1.c1", store_->counters());
EXPECT_EQ("scope1.c1", c1->name());
EXPECT_EQ(store_->source().cachedCounters().front(), c1);
EXPECT_EQ(findByName("scope1.c1", store_->source().cachedCounters()), c1);

EXPECT_CALL(main_thread_dispatcher_, post(_));
EXPECT_CALL(tls_, runOnAllThreads(_));
Expand Down