Skip to content

api: expose root Stats::Scope via Api::Api #6712

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 17 commits into from
May 16, 2019
Merged

api: expose root Stats::Scope via Api::Api #6712

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2728a65
Fix router_upstream_log_test
ahedberg Mar 5, 2019
03442f8
Add rootScope() member function to Api::Api.
ahedberg Apr 25, 2019
4887f8f
Revert "Fix router_upstream_log_test"
ahedberg Apr 25, 2019
76025c1
Merge remote-tracking branch 'upstream/master' into expose_root_scope
ahedberg May 2, 2019
4c1762d
Add getCounter, getGauge, getName to Scope
ahedberg May 2, 2019
901c211
Working towards EDS integration test (still broken, see TODO in
ahedberg May 6, 2019
75737ec
Add debug logging to figure out why the stat doesn't exist when reading
ahedberg May 9, 2019
b869872
Change to absl::optional<std::reference_wrapper<const Stat>>, rename to
ahedberg May 13, 2019
f4fd945
Add ThreadLocalStore tests for find* methods
ahedberg May 13, 2019
48e97ee
Integration test works, clean up some errant log lines
ahedberg May 14, 2019
1b8d010
Merge remote-tracking branch 'upstream/master' into expose_root_scope
ahedberg May 14, 2019
22e9269
Fix test after merge
ahedberg May 14, 2019
b95f77e
Clean up comments, make IsolatedStatsCache::find private.
ahedberg May 15, 2019
ee59b8f
Don't update TLS cache on findStat
ahedberg May 15, 2019
bfe397a
s/findStat/findStatLockHeld, remove early rejects
ahedberg May 15, 2019
e369e30
Use five-arg version of sendLocalReply to appease MacOS
ahedberg May 16, 2019
a145485
Merge remote-tracking branch 'upstream/master' into expose_root_scope
ahedberg May 16, 2019
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
5 changes: 5 additions & 0 deletions include/envoy/api/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ class Api {
* @return a reference to the TimeSource
*/
virtual TimeSource& timeSource() PURE;

/**
* @return a constant reference to the root Stats::Scope
*/
virtual const Stats::Scope& rootScope() PURE;
};

typedef std::unique_ptr<Api> ApiPtr;
Expand Down
7 changes: 4 additions & 3 deletions source/common/api/api_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
namespace Envoy {
namespace Api {

Impl::Impl(Thread::ThreadFactory& thread_factory, Stats::Store&, Event::TimeSystem& time_system,
Filesystem::Instance& file_system)
: thread_factory_(thread_factory), time_system_(time_system), file_system_(file_system) {}
Impl::Impl(Thread::ThreadFactory& thread_factory, Stats::Store& store,
Event::TimeSystem& time_system, Filesystem::Instance& file_system)
: thread_factory_(thread_factory), store_(store), time_system_(time_system),
file_system_(file_system) {}

Event::DispatcherPtr Impl::allocateDispatcher() {
return std::make_unique<Event::DispatcherImpl>(*this, time_system_);
Expand Down
4 changes: 3 additions & 1 deletion source/common/api/api_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace Api {
*/
class Impl : public Api {
public:
Impl(Thread::ThreadFactory& thread_factory, Stats::Store&, Event::TimeSystem& time_system,
Impl(Thread::ThreadFactory& thread_factory, Stats::Store& store, Event::TimeSystem& time_system,
Filesystem::Instance& file_system);

// Api::Api
Expand All @@ -25,9 +25,11 @@ class Impl : public Api {
Thread::ThreadFactory& threadFactory() override { return thread_factory_; }
Filesystem::Instance& fileSystem() override { return file_system_; }
TimeSource& timeSource() override { return time_system_; }
const Stats::Scope& rootScope() override { return store_; }

private:
Thread::ThreadFactory& thread_factory_;
Stats::Store& store_;
Event::TimeSystem& time_system_;
Filesystem::Instance& file_system_;
};
Expand Down
5 changes: 4 additions & 1 deletion test/mocks/api/mocks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ using testing::Return;
namespace Envoy {
namespace Api {

MockApi::MockApi() { ON_CALL(*this, fileSystem()).WillByDefault(ReturnRef(file_system_)); }
MockApi::MockApi() {
ON_CALL(*this, fileSystem()).WillByDefault(ReturnRef(file_system_));
ON_CALL(*this, rootScope()).WillByDefault(ReturnRef(stats_store_));
}

MockApi::~MockApi() {}

Expand Down
1 change: 1 addition & 0 deletions test/mocks/api/mocks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class MockApi : public Api {
Event::TimeSystem&));
MOCK_METHOD0(fileSystem, Filesystem::Instance&());
MOCK_METHOD0(threadFactory, Thread::ThreadFactory&());
MOCK_METHOD0(rootScope, const Stats::Scope&());

testing::NiceMock<Filesystem::MockInstance> file_system_;
Event::GlobalTimeSystem time_system_;
Expand Down