patches from envoyproxy#6299

Signed-off-by: Joshua Marantz <[email protected]>
jmarantz · Mar 19, 2019 · 61ea4e2 · 61ea4e2
1 parent 9449596
commit 61ea4e2
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 12 deletions.
diff --git a/include/envoy/server/instance.h b/include/envoy/server/instance.h
@@ -203,11 +203,6 @@ class Instance {
    */
   virtual TimeSource& timeSource() PURE;
 
-  /**
-   * @return the statistics symbol table.
-   */
-  virtual Stats::SymbolTable& symbolTable() PURE;
-
   /**
    * @return the flush interval of stats sinks.
    */

diff --git a/source/common/stats/isolated_store_impl.cc b/source/common/stats/isolated_store_impl.cc
@@ -17,7 +17,7 @@ namespace Stats {
 IsolatedStoreImpl::IsolatedStoreImpl()
     : IsolatedStoreImpl(std::make_unique<FakeSymbolTableImpl>()) {}
 
-IsolatedStoreImpl::IsolatedStoreImpl(std::unique_ptr<SymbolTable> symbol_table)
+IsolatedStoreImpl::IsolatedStoreImpl(std::unique_ptr<SymbolTable>&& symbol_table)
     : IsolatedStoreImpl(*symbol_table) {
   symbol_table_storage_ = std::move(symbol_table);
 }

diff --git a/source/common/stats/isolated_store_impl.h b/source/common/stats/isolated_store_impl.h
@@ -60,7 +60,6 @@ template <class Base> class IsolatedStatsCache {
 class IsolatedStoreImpl : public Store {
 public:
   IsolatedStoreImpl();
-  explicit IsolatedStoreImpl(std::unique_ptr<SymbolTable> symbol_table);
   explicit IsolatedStoreImpl(SymbolTable& symbol_table);
 
   // Stats::Scope
@@ -99,6 +98,8 @@ class IsolatedStoreImpl : public Store {
   void clear();
 
 private:
+  IsolatedStoreImpl(std::unique_ptr<SymbolTable>&& symbol_table);
+
   std::unique_ptr<SymbolTable> symbol_table_storage_;
   SymbolTable& symbol_table_;
   HeapStatDataAllocator alloc_;

diff --git a/source/extensions/stat_sinks/hystrix/hystrix.cc b/source/extensions/stat_sinks/hystrix/hystrix.cc
@@ -268,15 +268,15 @@ const std::string HystrixSink::printRollingWindows() {
 HystrixSink::HystrixSink(Server::Instance& server, const uint64_t num_buckets)
     : server_(server), current_index_(num_buckets > 0 ? num_buckets : DEFAULT_NUM_BUCKETS),
       window_size_(current_index_ + 1),
-      cluster_upstream_rq_time_("cluster.upstream_rq_time", server.symbolTable()) {
+      cluster_upstream_rq_time_("cluster.upstream_rq_time", server.stats().symbolTable()) {
   Server::Admin& admin = server_.admin();
   ENVOY_LOG(debug,
             "adding hystrix_event_stream endpoint to enable connection to hystrix dashboard");
   admin.addHandler("/hystrix_event_stream", "send hystrix event stream",
                    MAKE_ADMIN_HANDLER(handlerHystrixEventStream), false, false);
 }
 
-HystrixSink::~HystrixSink() { cluster_upstream_rq_time_.free(server_.symbolTable()); }
+HystrixSink::~HystrixSink() { cluster_upstream_rq_time_.free(server_.stats().symbolTable()); }
 
 Http::Code HystrixSink::handlerHystrixEventStream(absl::string_view,
                                                   Http::HeaderMap& response_headers,

diff --git a/source/server/config_validation/server.h b/source/server/config_validation/server.h
@@ -92,7 +92,6 @@ class ValidationInstance : Logger::Loggable<Logger::Id::main>,
   Http::Context& httpContext() override { return http_context_; }
   ThreadLocal::Instance& threadLocal() override { return thread_local_; }
   const LocalInfo::LocalInfo& localInfo() override { return *local_info_; }
-  Stats::SymbolTable& symbolTable() override { return stats_store_.symbolTable(); }
   TimeSource& timeSource() override { return api_->timeSource(); }
   Envoy::MutexTracer* mutexTracer() override { return mutex_tracer_; }
 

diff --git a/source/server/server.h b/source/server/server.h
@@ -184,7 +184,6 @@ class InstanceImpl : Logger::Loggable<Logger::Id::main>, public Instance {
   Http::Context& httpContext() override { return http_context_; }
   ThreadLocal::Instance& threadLocal() override { return thread_local_; }
   const LocalInfo::LocalInfo& localInfo() override { return *local_info_; }
-  Stats::SymbolTable& symbolTable() override { return stats_store_.symbolTable(); }
   TimeSource& timeSource() override { return time_source_; }
 
   std::chrono::milliseconds statsFlushInterval() const override {

diff --git a/test/mocks/server/mocks.h b/test/mocks/server/mocks.h
@@ -360,7 +360,6 @@ class MockInstance : public Instance {
   MOCK_METHOD0(localInfo, const LocalInfo::LocalInfo&());
   MOCK_CONST_METHOD0(statsFlushInterval, std::chrono::milliseconds());
 
-  Stats::SymbolTable& symbolTable() override { return stats_store_.symbolTable(); }
   TimeSource& timeSource() override { return time_system_; }
 
   std::unique_ptr<Secret::SecretManager> secret_manager_;