api: Put Event::TimeSystem& into API and plumb that instead of TimeSystem in various places.

include/envoy/api/api.h

@@ -22,10 +22,9 @@ class Api {
 
   /**
    * Allocate a dispatcher.
-   * @param time_source the time source.
    * @return Event::DispatcherPtr which is owned by the caller.
    */
-  virtual Event::DispatcherPtr allocateDispatcher(Event::TimeSystem& time_system) PURE;
+  virtual Event::DispatcherPtr allocateDispatcher() PURE;
 
   /**
    * @return a reference to the ThreadFactory
@@ -36,9 +35,14 @@ class Api {
    * @return a reference to the Filesystem::Instance
    */
   virtual Filesystem::Instance& fileSystem() PURE;
+
+  /**
+   * @return a reference to the TimeSystem
+   */
+  virtual Event::TimeSystem& timeSystem() PURE;
 };
 
 typedef std::unique_ptr<Api> ApiPtr;
 
 } // namespace Api
-} // namespace Envoy
+} // namespace Envoy

include/envoy/server/BUILD

@@ -145,6 +145,7 @@ envoy_cc_library(
     deps = [
         ":admin_interface",
         "//include/envoy/access_log:access_log_interface",
+        "//include/envoy/api:api_interface",
         "//include/envoy/http:codes_interface",
         "//include/envoy/http:context_interface",
         "//include/envoy/http:filter_interface",

source/common/api/api_impl.cc

@@ -10,12 +10,14 @@ namespace Envoy {
 namespace Api {
 
 Impl::Impl(std::chrono::milliseconds file_flush_interval_msec,
-           Thread::ThreadFactory& thread_factory, Stats::Store& stats_store)
+           Thread::ThreadFactory& thread_factory, Stats::Store& stats_store,
+           Event::TimeSystem& time_system)
     : thread_factory_(thread_factory),
-      file_system_(file_flush_interval_msec, thread_factory, stats_store) {}
+      file_system_(file_flush_interval_msec, thread_factory, stats_store),
+      time_system_(time_system) {}
 
-Event::DispatcherPtr Impl::allocateDispatcher(Event::TimeSystem& time_system) {
-  return std::make_unique<Event::DispatcherImpl>(time_system, *this);
+Event::DispatcherPtr Impl::allocateDispatcher() {
+  return std::make_unique<Event::DispatcherImpl>(*this);
 }
 
 Thread::ThreadFactory& Impl::threadFactory() { return thread_factory_; }

source/common/api/api_impl.h

@@ -19,16 +19,18 @@ namespace Api {
 class Impl : public Api {
 public:
   Impl(std::chrono::milliseconds file_flush_interval_msec, Thread::ThreadFactory& thread_factory,
-       Stats::Store& stats_store);
+       Stats::Store& stats_store, Event::TimeSystem& time_system);
 
   // Api::Api
-  Event::DispatcherPtr allocateDispatcher(Event::TimeSystem& time_system) override;
+  Event::DispatcherPtr allocateDispatcher() override;
   Thread::ThreadFactory& threadFactory() override;
   Filesystem::Instance& fileSystem() override;
+  Event::TimeSystem& timeSystem() override { return time_system_; }
 
 private:
   Thread::ThreadFactory& thread_factory_;
   Filesystem::InstanceImpl file_system_;
+  Event::TimeSystem& time_system_;
 };
 
 } // namespace Api

source/common/event/dispatched_thread.h

@@ -39,8 +39,7 @@ namespace Event {
  */
 class DispatchedThreadImpl : Logger::Loggable<Envoy::Logger::Id::main> {
 public:
-  DispatchedThreadImpl(Api::Api& api, TimeSystem& time_system)
-      : api_(api), dispatcher_(new DispatcherImpl(time_system, api_)) {}
+  explicit DispatchedThreadImpl(Api::Api& api) : api_(api), dispatcher_(new DispatcherImpl(api_)) {}
 
   /**
    * Start the thread.

source/common/event/dispatcher_impl.cc

@@ -26,17 +26,15 @@
 namespace Envoy {
 namespace Event {
 
-DispatcherImpl::DispatcherImpl(TimeSystem& time_system, Api::Api& api)
-    : DispatcherImpl(time_system, Buffer::WatermarkFactoryPtr{new Buffer::WatermarkBufferFactory},
-                     api) {
+DispatcherImpl::DispatcherImpl(Api::Api& api)
+    : DispatcherImpl(Buffer::WatermarkFactoryPtr{new Buffer::WatermarkBufferFactory}, api) {
   // The dispatcher won't work as expected if libevent hasn't been configured to use threads.
   RELEASE_ASSERT(Libevent::Global::initialized(), "");
 }
 
-DispatcherImpl::DispatcherImpl(TimeSystem& time_system, Buffer::WatermarkFactoryPtr&& factory,
-                               Api::Api& api)
-    : api_(api), time_system_(time_system), buffer_factory_(std::move(factory)),
-      base_(event_base_new()), scheduler_(time_system_.createScheduler(base_)),
+DispatcherImpl::DispatcherImpl(Buffer::WatermarkFactoryPtr&& factory, Api::Api& api)
+    : api_(api), buffer_factory_(std::move(factory)), base_(event_base_new()),
+      scheduler_(api.timeSystem().createScheduler(base_)),
       deferred_delete_timer_(createTimer([this]() -> void { clearDeferredDeleteList(); })),
       post_timer_(createTimer([this]() -> void { runPostCallbacks(); })),
       current_to_delete_(&to_delete_1_) {

source/common/event/dispatcher_impl.h

@@ -23,8 +23,8 @@ namespace Event {
  */
 class DispatcherImpl : Logger::Loggable<Logger::Id::main>, public Dispatcher {
 public:
-  explicit DispatcherImpl(TimeSystem& time_system, Api::Api& api);
-  DispatcherImpl(TimeSystem& time_system, Buffer::WatermarkFactoryPtr&& factory, Api::Api& api);
+  explicit DispatcherImpl(Api::Api& api);
+  DispatcherImpl(Buffer::WatermarkFactoryPtr&& factory, Api::Api& api);
   ~DispatcherImpl();
 
   /**
@@ -33,7 +33,7 @@ class DispatcherImpl : Logger::Loggable<Logger::Id::main>, public Dispatcher {
   event_base& base() { return *base_; }
 
   // Event::Dispatcher
-  TimeSystem& timeSystem() override { return time_system_; }
+  TimeSystem& timeSystem() override { return api_.timeSystem(); }
   void clearDeferredDeleteList() override;
   Network::ConnectionPtr
   createServerConnection(Network::ConnectionSocketPtr&& socket,
@@ -70,7 +70,6 @@ class DispatcherImpl : Logger::Loggable<Logger::Id::main>, public Dispatcher {
   bool isThreadSafe() const { return run_tid_ == nullptr || run_tid_->isCurrentThreadId(); }
 
   Api::Api& api_;
-  TimeSystem& time_system_;
   Thread::ThreadIdPtr run_tid_;
   Buffer::WatermarkFactoryPtr buffer_factory_;
   Libevent::BasePtr base_;

source/common/router/router.h

@@ -112,7 +112,7 @@ class FilterConfig {
                      context.runtime(), context.random(), std::move(shadow_writer),
                      PROTOBUF_GET_WRAPPED_OR_DEFAULT(config, dynamic_stats, true),
                      config.start_child_span(), config.suppress_envoy_headers(),
-                     context.timeSource(), context.httpContext()) {
+                     context.api().timeSystem(), context.httpContext()) {
     for (const auto& upstream_log : config.upstream_log()) {
       upstream_logs_.push_back(AccessLog::AccessLogFactory::fromProto(upstream_log, context));
     }

source/server/config_validation/api.cc

@@ -6,11 +6,12 @@ namespace Envoy {
 namespace Api {
 
 ValidationImpl::ValidationImpl(std::chrono::milliseconds file_flush_interval_msec,
-                               Thread::ThreadFactory& thread_factory, Stats::Store& stats_store)
-    : Impl(file_flush_interval_msec, thread_factory, stats_store) {}
+                               Thread::ThreadFactory& thread_factory, Stats::Store& stats_store,
+                               Event::TimeSystem& time_system)
+    : Impl(file_flush_interval_msec, thread_factory, stats_store, time_system) {}
 
-Event::DispatcherPtr ValidationImpl::allocateDispatcher(Event::TimeSystem& time_system) {
-  return Event::DispatcherPtr{new Event::ValidationDispatcher(time_system, *this)};
+Event::DispatcherPtr ValidationImpl::allocateDispatcher() {
+  return Event::DispatcherPtr{new Event::ValidationDispatcher(*this)};
 }
 
 } // namespace Api

source/server/config_validation/api.h

@@ -16,9 +16,10 @@ namespace Api {
 class ValidationImpl : public Impl {
 public:
   ValidationImpl(std::chrono::milliseconds file_flush_interval_msec,
-                 Thread::ThreadFactory& thread_factory, Stats::Store& stats_store);
+                 Thread::ThreadFactory& thread_factory, Stats::Store& stats_store,
+                 Event::TimeSystem& time_system);
 
-  Event::DispatcherPtr allocateDispatcher(Event::TimeSystem&) override;
+  Event::DispatcherPtr allocateDispatcher() override;
 };
 
 } // namespace Api

source/server/config_validation/async_client.cc

@@ -3,8 +3,7 @@
 namespace Envoy {
 namespace Http {
 
-ValidationAsyncClient::ValidationAsyncClient(Event::TimeSystem& time_system, Api::Api& api)
-    : dispatcher_(time_system, api) {}
+ValidationAsyncClient::ValidationAsyncClient(Api::Api& api) : dispatcher_(api) {}
 
 AsyncClient::Request* ValidationAsyncClient::send(MessagePtr&&, Callbacks&, const RequestOptions&) {
   return nullptr;

source/server/config_validation/async_client.h

@@ -19,7 +19,7 @@ namespace Http {
  */
 class ValidationAsyncClient : public AsyncClient {
 public:
-  ValidationAsyncClient(Event::TimeSystem& time_system, Api::Api& api);
+  ValidationAsyncClient(Api::Api& api);
 
   // Http::AsyncClient
   AsyncClient::Request* send(MessagePtr&& request, Callbacks& callbacks,

source/server/config_validation/cluster_manager.cc

@@ -29,7 +29,7 @@ ValidationClusterManager::ValidationClusterManager(
     Server::Admin& admin, Api::Api& api, Http::Context& http_context)
     : ClusterManagerImpl(bootstrap, factory, stats, tls, runtime, random, local_info, log_manager,
                          main_thread_dispatcher, admin, api, http_context),
-      async_client_(main_thread_dispatcher.timeSystem(), api) {}
+      async_client_(api) {}
 
 Http::ConnectionPool::Instance*
 ValidationClusterManager::httpConnPoolForCluster(const std::string&, ResourcePriority,

source/server/config_validation/dispatcher.h

@@ -16,7 +16,7 @@ namespace Event {
  */
 class ValidationDispatcher : public DispatcherImpl {
 public:
-  ValidationDispatcher(TimeSystem& time_system, Api::Api& api) : DispatcherImpl(time_system, api) {}
+  ValidationDispatcher(Api::Api& api) : DispatcherImpl(api) {}
 
   Network::ClientConnectionPtr
   createClientConnection(Network::Address::InstanceConstSharedPtr,

source/server/config_validation/server.cc

@@ -40,9 +40,10 @@ ValidationInstance::ValidationInstance(Options& options, Event::TimeSystem& time
                                        Thread::BasicLockable& access_log_lock,
                                        ComponentFactory& component_factory,
                                        Thread::ThreadFactory& thread_factory)
-    : options_(options), time_system_(time_system), stats_store_(store),
-      api_(new Api::ValidationImpl(options.fileFlushIntervalMsec(), thread_factory, store)),
-      dispatcher_(api_->allocateDispatcher(time_system)),
+    : options_(options), stats_store_(store),
+      api_(new Api::ValidationImpl(options.fileFlushIntervalMsec(), thread_factory, store,
+                                   time_system)),
+      dispatcher_(api_->allocateDispatcher()),
       singleton_manager_(new Singleton::ManagerImpl(api_->threadFactory().currentThreadId())),
       access_log_manager_(*api_, *dispatcher_, access_log_lock), mutex_tracer_(nullptr) {
   try {
@@ -82,12 +83,12 @@ void ValidationInstance::initialize(Options& options,
   Configuration::InitialImpl initial_config(bootstrap);
   overload_manager_ = std::make_unique<OverloadManagerImpl>(dispatcher(), stats(), threadLocal(),
                                                             bootstrap.overload_manager(), api());
-  listener_manager_ = std::make_unique<ListenerManagerImpl>(*this, *this, *this, time_system_);
+  listener_manager_ = std::make_unique<ListenerManagerImpl>(*this, *this, *this);
   thread_local_.registerThread(*dispatcher_, true);
   runtime_loader_ = component_factory.createRuntime(*this, initial_config);
   secret_manager_ = std::make_unique<Secret::SecretManagerImpl>();
   ssl_context_manager_ =
-      std::make_unique<Extensions::TransportSockets::Tls::ContextManagerImpl>(time_system_);
+      std::make_unique<Extensions::TransportSockets::Tls::ContextManagerImpl>(api_->timeSystem());
   cluster_manager_factory_ = std::make_unique<Upstream::ValidationClusterManagerFactory>(
       admin(), runtime(), stats(), threadLocal(), random(), dnsResolver(), sslContextManager(),
       dispatcher(), localInfo(), *secret_manager_, api(), http_context_, accessLogManager(),

source/server/config_validation/server.h

@@ -92,7 +92,7 @@ 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_; }
-  Event::TimeSystem& timeSystem() override { return time_system_; }
+  Event::TimeSystem& timeSystem() override { return api_->timeSystem(); }
   Envoy::MutexTracer* mutexTracer() override { return mutex_tracer_; }
 
   std::chrono::milliseconds statsFlushInterval() const override {
@@ -140,7 +140,6 @@ class ValidationInstance : Logger::Loggable<Logger::Id::main>,
                   ComponentFactory& component_factory);
 
   Options& options_;
-  Event::TimeSystem& time_system_;
   Stats::IsolatedStoreImpl& stats_store_;
   ThreadLocal::InstanceImpl thread_local_;
   Api::ApiPtr api_;

source/server/listener_manager_impl.cc

@@ -665,9 +665,8 @@ void ListenerImpl::setSocket(const Network::SocketSharedPtr& socket) {
 
 ListenerManagerImpl::ListenerManagerImpl(Instance& server,
                                          ListenerComponentFactory& listener_factory,
-                                         WorkerFactory& worker_factory, TimeSource& time_source)
-    : server_(server), time_source_(time_source), factory_(listener_factory),
-      stats_(generateStats(server.stats())),
+                                         WorkerFactory& worker_factory)
+    : server_(server), factory_(listener_factory), stats_(generateStats(server.stats())),
       config_tracker_entry_(server.admin().getConfigTracker().add(
           "listeners", [this] { return dumpListenerConfigs(); })) {
   for (uint32_t i = 0; i < server.options().concurrency(); i++) {

source/server/listener_manager_impl.h

@@ -104,7 +104,7 @@ struct ListenerManagerStats {
 class ListenerManagerImpl : public ListenerManager, Logger::Loggable<Logger::Id::config> {
 public:
   ListenerManagerImpl(Instance& server, ListenerComponentFactory& listener_factory,
-                      WorkerFactory& worker_factory, TimeSource& time_source);
+                      WorkerFactory& worker_factory);
 
   void onListenerWarmed(ListenerImpl& listener);
 
@@ -124,7 +124,6 @@ class ListenerManagerImpl : public ListenerManager, Logger::Loggable<Logger::Id:
   Http::Context& httpContext() { return server_.httpContext(); }
 
   Instance& server_;
-  TimeSource& time_source_;
   ListenerComponentFactory& factory_;
 
 private:
@@ -282,7 +281,7 @@ class ListenerImpl : public Network::ListenerConfig,
   const envoy::api::v2::core::Metadata& listenerMetadata() const override {
     return config_.metadata();
   };
-  TimeSource& timeSource() override { return parent_.time_source_; }
+  TimeSource& timeSource() override { return api().timeSystem(); }
   void ensureSocketOptions() {
     if (!listen_socket_options_) {
       listen_socket_options_ =

source/server/server.cc

@@ -55,13 +55,13 @@ InstanceImpl::InstanceImpl(Options& options, Event::TimeSystem& time_system,
     : shutdown_(false), options_(options), time_system_(time_system), restarter_(restarter),
       start_time_(time(nullptr)), original_start_time_(start_time_), stats_store_(store),
       thread_local_(tls),
-      api_(new Api::Impl(options.fileFlushIntervalMsec(), thread_factory, store)),
+      api_(new Api::Impl(options.fileFlushIntervalMsec(), thread_factory, store, time_system)),
       secret_manager_(std::make_unique<Secret::SecretManagerImpl>()),
-      dispatcher_(api_->allocateDispatcher(time_system)),
+      dispatcher_(api_->allocateDispatcher()),
       singleton_manager_(new Singleton::ManagerImpl(api_->threadFactory().currentThreadId())),
       handler_(new ConnectionHandlerImpl(ENVOY_LOGGER(), *dispatcher_)),
       random_generator_(std::move(random_generator)), listener_component_factory_(*this),
-      worker_factory_(thread_local_, *api_, hooks, time_system),
+      worker_factory_(thread_local_, *api_, hooks),
       dns_resolver_(dispatcher_->createDnsResolver({})),
       access_log_manager_(*api_, *dispatcher_, access_log_lock), terminated_(false),
       mutex_tracer_(options.mutexTracingEnabled() ? &Envoy::MutexTracerImpl::getOrCreateTracer()
@@ -288,8 +288,8 @@ void InstanceImpl::initialize(Options& options,
                                                             bootstrap_.overload_manager(), api());
 
   // Workers get created first so they register for thread local updates.
-  listener_manager_ = std::make_unique<ListenerManagerImpl>(*this, listener_component_factory_,
-                                                            worker_factory_, time_system_);
+  listener_manager_ =
+      std::make_unique<ListenerManagerImpl>(*this, listener_component_factory_, worker_factory_);
 
   // The main thread is also registered for thread local updates so that code that does not care
   // whether it runs on the main thread or on workers can still use TLS.

source/server/worker_impl.cc

@@ -14,7 +14,7 @@ namespace Envoy {
 namespace Server {
 
 WorkerPtr ProdWorkerFactory::createWorker(OverloadManager& overload_manager) {
-  Event::DispatcherPtr dispatcher(api_.allocateDispatcher(time_system_));
+  Event::DispatcherPtr dispatcher(api_.allocateDispatcher());
   return WorkerPtr{new WorkerImpl(
       tls_, hooks_, std::move(dispatcher),
       Network::ConnectionHandlerPtr{new ConnectionHandlerImpl(ENVOY_LOGGER(), *dispatcher)},

source/server/worker_impl.h

@@ -19,9 +19,8 @@ namespace Server {
 
 class ProdWorkerFactory : public WorkerFactory, Logger::Loggable<Logger::Id::main> {
 public:
-  ProdWorkerFactory(ThreadLocal::Instance& tls, Api::Api& api, TestHooks& hooks,
-                    Event::TimeSystem& time_system)
-      : tls_(tls), api_(api), hooks_(hooks), time_system_(time_system) {}
+  ProdWorkerFactory(ThreadLocal::Instance& tls, Api::Api& api, TestHooks& hooks)
+      : tls_(tls), api_(api), hooks_(hooks) {}
 
   // Server::WorkerFactory
   WorkerPtr createWorker(OverloadManager& overload_manager) override;
@@ -30,7 +29,6 @@ class ProdWorkerFactory : public WorkerFactory, Logger::Loggable<Logger::Id::mai
   ThreadLocal::Instance& tls_;
   Api::Api& api_;
   TestHooks& hooks_;
-  Event::TimeSystem& time_system_;
 };
 
 /**

test/common/config/filesystem_subscription_test_harness.h

@@ -11,7 +11,6 @@
 #include "test/common/config/subscription_test_harness.h"
 #include "test/mocks/config/mocks.h"
 #include "test/test_common/environment.h"
-#include "test/test_common/test_time.h"
 #include "test/test_common/utility.h"
 
 #include "gmock/gmock.h"
@@ -31,7 +30,7 @@ class FilesystemSubscriptionTestHarness : public SubscriptionTestHarness {
 public:
   FilesystemSubscriptionTestHarness()
       : path_(TestEnvironment::temporaryPath("eds.json")),
-        api_(Api::createApiForTest(stats_store_)), dispatcher_(test_time_.timeSystem(), *api_),
+        api_(Api::createApiForTest(stats_store_)), dispatcher_(*api_),
         subscription_(dispatcher_, path_, stats_, *api_) {}
 
   ~FilesystemSubscriptionTestHarness() { EXPECT_EQ(0, ::unlink(path_.c_str())); }
@@ -100,7 +99,6 @@ class FilesystemSubscriptionTestHarness : public SubscriptionTestHarness {
   std::string version_;
   Stats::IsolatedStoreImpl stats_store_;
   Api::ApiPtr api_;
-  DangerousDeprecatedTestTime test_time_;
   Event::DispatcherImpl dispatcher_;
   NiceMock<Config::MockSubscriptionCallbacks<envoy::api::v2::ClusterLoadAssignment>> callbacks_;
   FilesystemEdsSubscriptionImpl subscription_;

test/common/event/BUILD

@@ -17,7 +17,6 @@ envoy_cc_test(
         "//source/common/event:dispatcher_lib",
         "//source/common/stats:isolated_store_lib",
         "//test/mocks:common_lib",
-        "//test/test_common:test_time_lib",
         "//test/test_common:utility_lib",
     ],
 )
@@ -32,7 +31,6 @@ envoy_cc_test(
         "//source/common/stats:isolated_store_lib",
         "//test/mocks:common_lib",
         "//test/test_common:environment_lib",
-        "//test/test_common:test_time_lib",
         "//test/test_common:utility_lib",
     ],
 )