diff --git a/include/envoy/event/dispatcher.h b/include/envoy/event/dispatcher.h index 634a811f23266..3c565c6139161 100644 --- a/include/envoy/event/dispatcher.h +++ b/include/envoy/event/dispatcher.h @@ -35,10 +35,8 @@ class Dispatcher { /** * Returns a time-source to use with this dispatcher. - * - * TODO(#4160) Rename to timeSystem(). */ - virtual TimeSystem& timeSource() PURE; + virtual TimeSystem& timeSystem() PURE; /** * Clear any items in the deferred deletion queue. diff --git a/include/envoy/server/instance.h b/include/envoy/server/instance.h index 855e42d526ba4..576cf8c4eef4f 100644 --- a/include/envoy/server/instance.h +++ b/include/envoy/server/instance.h @@ -194,10 +194,9 @@ class Instance { virtual const LocalInfo::LocalInfo& localInfo() PURE; /** - * @return the time source used for the server. - * TODO(#4160): rename this to timeSystem(). + * @return the time system used for the server. */ - virtual Event::TimeSystem& timeSource() PURE; + virtual Event::TimeSystem& timeSystem() PURE; /** * @return the flush interval of stats sinks. diff --git a/source/common/config/grpc_mux_impl.cc b/source/common/config/grpc_mux_impl.cc index 3481859da1734..4303b4bf85a46 100644 --- a/source/common/config/grpc_mux_impl.cc +++ b/source/common/config/grpc_mux_impl.cc @@ -14,7 +14,7 @@ GrpcMuxImpl::GrpcMuxImpl(const LocalInfo::LocalInfo& local_info, Grpc::AsyncClie const Protobuf::MethodDescriptor& service_method, Runtime::RandomGenerator& random) : local_info_(local_info), async_client_(std::move(async_client)), - service_method_(service_method), random_(random), time_source_(dispatcher.timeSource()) { + service_method_(service_method), random_(random), time_source_(dispatcher.timeSystem()) { Config::Utility::checkLocalInfo("ads", local_info); retry_timer_ = dispatcher.createTimer([this]() -> void { establishNewStream(); }); backoff_strategy_ = std::make_unique(RETRY_INITIAL_DELAY_MS, diff --git a/source/common/event/dispatcher_impl.h b/source/common/event/dispatcher_impl.h index 268eb81642d39..e5badc5d7958c 100644 --- a/source/common/event/dispatcher_impl.h +++ b/source/common/event/dispatcher_impl.h @@ -32,7 +32,7 @@ class DispatcherImpl : Logger::Loggable, public Dispatcher { event_base& base() { return *base_; } // Event::Dispatcher - TimeSystem& timeSource() override { return time_system_; } + TimeSystem& timeSystem() override { return time_system_; } void clearDeferredDeleteList() override; Network::ConnectionPtr createServerConnection(Network::ConnectionSocketPtr&& socket, diff --git a/source/common/grpc/google_async_client_impl.h b/source/common/grpc/google_async_client_impl.h index 1c91801c60612..1feec12df87c8 100644 --- a/source/common/grpc/google_async_client_impl.h +++ b/source/common/grpc/google_async_client_impl.h @@ -165,7 +165,7 @@ class GoogleAsyncClientImpl final : public AsyncClient, Logger::Loggable diff --git a/source/common/http/async_client_impl.cc b/source/common/http/async_client_impl.cc index 8b968c242032d..53df6b1c52dc4 100644 --- a/source/common/http/async_client_impl.cc +++ b/source/common/http/async_client_impl.cc @@ -37,7 +37,7 @@ AsyncClientImpl::AsyncClientImpl(const Upstream::ClusterInfo& cluster, Stats::St Router::ShadowWriterPtr&& shadow_writer) : cluster_(cluster), config_("http.async-client.", local_info, stats_store, cm, runtime, random, - std::move(shadow_writer), true, false, false, dispatcher.timeSource()), + std::move(shadow_writer), true, false, false, dispatcher.timeSystem()), dispatcher_(dispatcher) {} AsyncClientImpl::~AsyncClientImpl() { diff --git a/source/common/upstream/cluster_manager_impl.cc b/source/common/upstream/cluster_manager_impl.cc index 9453725073402..8eb07ee7b55b6 100644 --- a/source/common/upstream/cluster_manager_impl.cc +++ b/source/common/upstream/cluster_manager_impl.cc @@ -180,7 +180,7 @@ ClusterManagerImpl::ClusterManagerImpl(const envoy::config::bootstrap::v2::Boots init_helper_([this](Cluster& cluster) { onClusterInit(cluster); }), config_tracker_entry_( admin.getConfigTracker().add("clusters", [this] { return dumpClusterConfigs(); })), - time_source_(main_thread_dispatcher.timeSource()), dispatcher_(main_thread_dispatcher) { + time_source_(main_thread_dispatcher.timeSystem()), dispatcher_(main_thread_dispatcher) { async_client_manager_ = std::make_unique(*this, tls, time_source_); const auto& cm_config = bootstrap.cluster_manager(); if (cm_config.has_outlier_detection()) { diff --git a/source/common/upstream/health_checker_impl.cc b/source/common/upstream/health_checker_impl.cc index 6d4abb030671e..a4f0f8714d740 100644 --- a/source/common/upstream/health_checker_impl.cc +++ b/source/common/upstream/health_checker_impl.cc @@ -50,7 +50,7 @@ HealthCheckerFactory::create(const envoy::api::v2::core::HealthCheck& hc_config, HealthCheckEventLoggerPtr event_logger; if (!hc_config.event_log_path().empty()) { event_logger = std::make_unique( - log_manager, dispatcher.timeSource(), hc_config.event_log_path()); + log_manager, dispatcher.timeSystem(), hc_config.event_log_path()); } switch (hc_config.health_checker_case()) { case envoy::api::v2::core::HealthCheck::HealthCheckerCase::kHttpHealthCheck: diff --git a/source/common/upstream/load_stats_reporter.cc b/source/common/upstream/load_stats_reporter.cc index 1662ddd5167d0..66ae613461f56 100644 --- a/source/common/upstream/load_stats_reporter.cc +++ b/source/common/upstream/load_stats_reporter.cc @@ -16,7 +16,7 @@ LoadStatsReporter::LoadStatsReporter(const LocalInfo::LocalInfo& local_info, async_client_(std::move(async_client)), service_method_(*Protobuf::DescriptorPool::generated_pool()->FindMethodByName( "envoy.service.load_stats.v2.LoadReportingService.StreamLoadStats")), - time_source_(dispatcher.timeSource()) { + time_source_(dispatcher.timeSystem()) { request_.mutable_node()->MergeFrom(local_info.node()); retry_timer_ = dispatcher.createTimer([this]() -> void { establishNewStream(); }); response_timer_ = dispatcher.createTimer([this]() -> void { sendLoadStatsRequest(); }); diff --git a/source/common/upstream/outlier_detection_impl.cc b/source/common/upstream/outlier_detection_impl.cc index 001110d44d9bd..0b21e79771d22 100644 --- a/source/common/upstream/outlier_detection_impl.cc +++ b/source/common/upstream/outlier_detection_impl.cc @@ -25,7 +25,7 @@ DetectorSharedPtr DetectorImplFactory::createForCluster( Runtime::Loader& runtime, EventLoggerSharedPtr event_logger) { if (cluster_config.has_outlier_detection()) { return DetectorImpl::create(cluster, cluster_config.outlier_detection(), dispatcher, runtime, - dispatcher.timeSource(), event_logger); + dispatcher.timeSystem(), event_logger); } else { return nullptr; } diff --git a/source/extensions/stat_sinks/metrics_service/config.cc b/source/extensions/stat_sinks/metrics_service/config.cc index 22e9e58fad1ff..182bcfac2f977 100644 --- a/source/extensions/stat_sinks/metrics_service/config.cc +++ b/source/extensions/stat_sinks/metrics_service/config.cc @@ -29,7 +29,7 @@ Stats::SinkPtr MetricsServiceSinkFactory::createStatsSink(const Protobuf::Messag grpc_service, server.stats(), false), server.threadLocal(), server.localInfo()); - return std::make_unique(grpc_metrics_streamer, server.timeSource()); + return std::make_unique(grpc_metrics_streamer, server.timeSystem()); } ProtobufTypes::MessagePtr MetricsServiceSinkFactory::createEmptyConfigProto() { diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc index b218a57f1c74e..b42e12520a877 100644 --- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc +++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.cc @@ -62,8 +62,8 @@ void GrpcMetricsStreamerImpl::ThreadLocalStreamer::send( } MetricsServiceSink::MetricsServiceSink(const GrpcMetricsStreamerSharedPtr& grpc_metrics_streamer, - TimeSource& time_source) - : grpc_metrics_streamer_(grpc_metrics_streamer), time_source_(time_source) {} + Event::TimeSystem& time_system) + : grpc_metrics_streamer_(grpc_metrics_streamer), time_system_(time_system) {} void MetricsServiceSink::flushCounter(const Stats::Counter& counter) { io::prometheus::client::MetricFamily* metrics_family = message_.add_envoy_metrics(); @@ -71,7 +71,7 @@ void MetricsServiceSink::flushCounter(const Stats::Counter& counter) { metrics_family->set_name(counter.name()); auto* metric = metrics_family->add_metric(); metric->set_timestamp_ms(std::chrono::duration_cast( - time_source_.systemTime().time_since_epoch()) + time_system_.systemTime().time_since_epoch()) .count()); auto* counter_metric = metric->mutable_counter(); counter_metric->set_value(counter.value()); @@ -83,7 +83,7 @@ void MetricsServiceSink::flushGauge(const Stats::Gauge& gauge) { metrics_family->set_name(gauge.name()); auto* metric = metrics_family->add_metric(); metric->set_timestamp_ms(std::chrono::duration_cast( - time_source_.systemTime().time_since_epoch()) + time_system_.systemTime().time_since_epoch()) .count()); auto* gauage_metric = metric->mutable_gauge(); gauage_metric->set_value(gauge.value()); @@ -94,7 +94,7 @@ void MetricsServiceSink::flushHistogram(const Stats::ParentHistogram& histogram) metrics_family->set_name(histogram.name()); auto* metric = metrics_family->add_metric(); metric->set_timestamp_ms(std::chrono::duration_cast( - time_source_.systemTime().time_since_epoch()) + time_system_.systemTime().time_since_epoch()) .count()); auto* summary_metric = metric->mutable_summary(); const Stats::HistogramStatistics& hist_stats = histogram.intervalStatistics(); diff --git a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h index bb796052a311b..f2531b18b8f13 100644 --- a/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h +++ b/source/extensions/stat_sinks/metrics_service/grpc_metrics_service_impl.h @@ -112,7 +112,7 @@ class MetricsServiceSink : public Stats::Sink { public: // MetricsService::Sink MetricsServiceSink(const GrpcMetricsStreamerSharedPtr& grpc_metrics_streamer, - TimeSource& time_source); + Event::TimeSystem& time_system); void flush(Stats::Source& source) override; void onHistogramComplete(const Stats::Histogram&, uint64_t) override {} @@ -123,7 +123,7 @@ class MetricsServiceSink : public Stats::Sink { private: GrpcMetricsStreamerSharedPtr grpc_metrics_streamer_; envoy::service::metrics::v2::StreamMetricsMessage message_; - TimeSource& time_source_; + Event::TimeSystem& time_system_; }; } // namespace MetricsService diff --git a/source/extensions/tracers/zipkin/config.cc b/source/extensions/tracers/zipkin/config.cc index 1884b938cf216..51a92001032fe 100644 --- a/source/extensions/tracers/zipkin/config.cc +++ b/source/extensions/tracers/zipkin/config.cc @@ -20,7 +20,7 @@ Tracing::HttpTracerPtr ZipkinTracerFactory::createHttpTracer(const Json::Object& Tracing::DriverPtr zipkin_driver( new Zipkin::Driver(json_config, server.clusterManager(), server.stats(), server.threadLocal(), - server.runtime(), server.localInfo(), rand, server.timeSource())); + server.runtime(), server.localInfo(), rand, server.timeSystem())); return Tracing::HttpTracerPtr( new Tracing::HttpTracerImpl(std::move(zipkin_driver), server.localInfo())); diff --git a/source/server/config_validation/cluster_manager.cc b/source/server/config_validation/cluster_manager.cc index f90877ed4d761..27507b203fce2 100644 --- a/source/server/config_validation/cluster_manager.cc +++ b/source/server/config_validation/cluster_manager.cc @@ -40,7 +40,7 @@ ValidationClusterManager::ValidationClusterManager( Server::Admin& admin) : ClusterManagerImpl(bootstrap, factory, stats, tls, runtime, random, local_info, log_manager, main_thread_dispatcher, admin), - async_client_(main_thread_dispatcher.timeSource()) {} + async_client_(main_thread_dispatcher.timeSystem()) {} Http::ConnectionPool::Instance* ValidationClusterManager::httpConnPoolForCluster(const std::string&, ResourcePriority, diff --git a/source/server/config_validation/server.h b/source/server/config_validation/server.h index 7e28a076946e3..6f9dafcaf6c5f 100644 --- a/source/server/config_validation/server.h +++ b/source/server/config_validation/server.h @@ -94,7 +94,7 @@ class ValidationInstance : Logger::Loggable, Tracing::HttpTracer& httpTracer() override { return config_->httpTracer(); } ThreadLocal::Instance& threadLocal() override { return thread_local_; } const LocalInfo::LocalInfo& localInfo() override { return *local_info_; } - Event::TimeSystem& timeSource() override { return time_system_; } + Event::TimeSystem& timeSystem() override { return time_system_; } std::chrono::milliseconds statsFlushInterval() const override { return config_->statsFlushInterval(); diff --git a/source/server/http/admin.cc b/source/server/http/admin.cc index 84ba9ae9fb381..85c29f31ae3a6 100644 --- a/source/server/http/admin.cc +++ b/source/server/http/admin.cc @@ -885,7 +885,7 @@ AdminImpl::AdminImpl(const std::string& access_log_path, const std::string& prof stats_(Http::ConnectionManagerImpl::generateStats("http.admin.", server_.stats())), tracing_stats_( Http::ConnectionManagerImpl::generateTracingStats("http.admin.", no_op_store_)), - route_config_provider_(server.timeSource()), + route_config_provider_(server.timeSystem()), handlers_{ {"/", "Admin home page", MAKE_ADMIN_HANDLER(handlerAdminHome), false, false}, {"/certs", "print certs on machine", MAKE_ADMIN_HANDLER(handlerCerts), false, false}, diff --git a/source/server/server.h b/source/server/server.h index 4a90b8b138b7c..e675be441083e 100644 --- a/source/server/server.h +++ b/source/server/server.h @@ -180,7 +180,7 @@ class InstanceImpl : Logger::Loggable, public Instance { Tracing::HttpTracer& httpTracer() override; ThreadLocal::Instance& threadLocal() override { return thread_local_; } const LocalInfo::LocalInfo& localInfo() override { return *local_info_; } - Event::TimeSystem& timeSource() override { return time_system_; } + Event::TimeSystem& timeSystem() override { return time_system_; } std::chrono::milliseconds statsFlushInterval() const override { return config_->statsFlushInterval(); diff --git a/test/common/config/filesystem_subscription_test_harness.h b/test/common/config/filesystem_subscription_test_harness.h index 155cabb0c8acc..b9376a6b814d9 100644 --- a/test/common/config/filesystem_subscription_test_harness.h +++ b/test/common/config/filesystem_subscription_test_harness.h @@ -28,7 +28,7 @@ typedef FilesystemSubscriptionImpl class FilesystemSubscriptionTestHarness : public SubscriptionTestHarness { public: FilesystemSubscriptionTestHarness() - : path_(TestEnvironment::temporaryPath("eds.json")), dispatcher_(test_time_.timeSource()), + : path_(TestEnvironment::temporaryPath("eds.json")), dispatcher_(test_time_.timeSystem()), subscription_(dispatcher_, path_, stats_) {} ~FilesystemSubscriptionTestHarness() { EXPECT_EQ(0, ::unlink(path_.c_str())); } diff --git a/test/common/event/dispatched_thread_impl_test.cc b/test/common/event/dispatched_thread_impl_test.cc index 915dc9bee5028..fbd4321b02b5f 100644 --- a/test/common/event/dispatched_thread_impl_test.cc +++ b/test/common/event/dispatched_thread_impl_test.cc @@ -22,8 +22,8 @@ namespace Event { class DispatchedThreadTest : public testing::Test { protected: DispatchedThreadTest() - : config_(1000, 1000, 1000, 1000), guard_dog_(fakestats_, config_, test_time_.timeSource()), - thread_(test_time_.timeSource()) {} + : config_(1000, 1000, 1000, 1000), guard_dog_(fakestats_, config_, test_time_.timeSystem()), + thread_(test_time_.timeSystem()) {} void SetUp() { thread_.start(guard_dog_); } NiceMock config_; diff --git a/test/common/event/dispatcher_impl_test.cc b/test/common/event/dispatcher_impl_test.cc index 5a8ed141b26e5..ebb76e029ffae 100644 --- a/test/common/event/dispatcher_impl_test.cc +++ b/test/common/event/dispatcher_impl_test.cc @@ -27,7 +27,7 @@ class TestDeferredDeletable : public DeferredDeletable { TEST(DeferredDeleteTest, DeferredDelete) { InSequence s; DangerousDeprecatedTestTime test_time; - DispatcherImpl dispatcher(test_time.timeSource()); + DispatcherImpl dispatcher(test_time.timeSystem()); ReadyWatcher watcher1; dispatcher.deferredDelete( @@ -58,7 +58,7 @@ TEST(DeferredDeleteTest, DeferredDelete) { class DispatcherImplTest : public ::testing::Test { protected: DispatcherImplTest() - : dispatcher_(std::make_unique(test_time_.timeSource())), + : dispatcher_(std::make_unique(test_time_.timeSystem())), work_finished_(false) { dispatcher_thread_ = std::make_unique([this]() { // Must create a keepalive timer to keep the dispatcher from exiting. diff --git a/test/common/event/file_event_impl_test.cc b/test/common/event/file_event_impl_test.cc index 888247a006b21..48542baf42cb7 100644 --- a/test/common/event/file_event_impl_test.cc +++ b/test/common/event/file_event_impl_test.cc @@ -16,7 +16,7 @@ namespace Event { class FileEventImplTest : public testing::Test { public: - FileEventImplTest() : dispatcher_(test_time_.timeSource()) {} + FileEventImplTest() : dispatcher_(test_time_.timeSystem()) {} void SetUp() override { int rc = socketpair(AF_UNIX, SOCK_DGRAM, 0, fds_); @@ -53,7 +53,7 @@ TEST_P(FileEventImplActivateTest, Activate) { ASSERT_NE(-1, fd); DangerousDeprecatedTestTime test_time; - DispatcherImpl dispatcher(test_time.timeSource()); + DispatcherImpl dispatcher(test_time.timeSystem()); ReadyWatcher read_event; EXPECT_CALL(read_event, ready()).Times(1); ReadyWatcher write_event; diff --git a/test/common/filesystem/watcher_impl_test.cc b/test/common/filesystem/watcher_impl_test.cc index 4ddb442beced4..efdc68a0e4a96 100644 --- a/test/common/filesystem/watcher_impl_test.cc +++ b/test/common/filesystem/watcher_impl_test.cc @@ -16,7 +16,7 @@ namespace Filesystem { class WatcherImplTest : public testing::Test { protected: - WatcherImplTest() : dispatcher_(test_time_.timeSource()) {} + WatcherImplTest() : dispatcher_(test_time_.timeSystem()) {} DangerousDeprecatedTestTime test_time_; Event::DispatcherImpl dispatcher_; diff --git a/test/common/grpc/async_client_impl_test.cc b/test/common/grpc/async_client_impl_test.cc index 59c19c41b4e3e..a9c306783c37c 100644 --- a/test/common/grpc/async_client_impl_test.cc +++ b/test/common/grpc/async_client_impl_test.cc @@ -25,7 +25,7 @@ class EnvoyAsyncClientImplTest : public testing::Test { : method_descriptor_(helloworld::Greeter::descriptor()->FindMethodByName("SayHello")) { envoy::api::v2::core::GrpcService config; config.mutable_envoy_grpc()->set_cluster_name("test_cluster"); - grpc_client_ = std::make_unique(cm_, config, test_time_.timeSource()); + grpc_client_ = std::make_unique(cm_, config, test_time_.timeSystem()); ON_CALL(cm_, httpAsyncClientForCluster("test_cluster")).WillByDefault(ReturnRef(http_client_)); } diff --git a/test/common/grpc/async_client_manager_impl_test.cc b/test/common/grpc/async_client_manager_impl_test.cc index 76edadb6cec89..64161351c0c5b 100644 --- a/test/common/grpc/async_client_manager_impl_test.cc +++ b/test/common/grpc/async_client_manager_impl_test.cc @@ -24,7 +24,7 @@ class AsyncClientManagerImplTest : public testing::Test { }; TEST_F(AsyncClientManagerImplTest, EnvoyGrpcOk) { - AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSource()); + AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSystem()); envoy::api::v2::core::GrpcService grpc_service; grpc_service.mutable_envoy_grpc()->set_cluster_name("foo"); @@ -39,7 +39,7 @@ TEST_F(AsyncClientManagerImplTest, EnvoyGrpcOk) { } TEST_F(AsyncClientManagerImplTest, EnvoyGrpcUnknown) { - AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSource()); + AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSystem()); envoy::api::v2::core::GrpcService grpc_service; grpc_service.mutable_envoy_grpc()->set_cluster_name("foo"); @@ -49,7 +49,7 @@ TEST_F(AsyncClientManagerImplTest, EnvoyGrpcUnknown) { } TEST_F(AsyncClientManagerImplTest, EnvoyGrpcDynamicCluster) { - AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSource()); + AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSystem()); envoy::api::v2::core::GrpcService grpc_service; grpc_service.mutable_envoy_grpc()->set_cluster_name("foo"); @@ -65,7 +65,7 @@ TEST_F(AsyncClientManagerImplTest, EnvoyGrpcDynamicCluster) { TEST_F(AsyncClientManagerImplTest, GoogleGrpc) { EXPECT_CALL(scope_, createScope_("grpc.foo.")); - AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSource()); + AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSystem()); envoy::api::v2::core::GrpcService grpc_service; grpc_service.mutable_google_grpc()->set_stat_prefix("foo"); @@ -78,7 +78,7 @@ TEST_F(AsyncClientManagerImplTest, GoogleGrpc) { } TEST_F(AsyncClientManagerImplTest, EnvoyGrpcUnknownOk) { - AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSource()); + AsyncClientManagerImpl async_client_manager(cm_, tls_, test_time_.timeSystem()); envoy::api::v2::core::GrpcService grpc_service; grpc_service.mutable_envoy_grpc()->set_cluster_name("foo"); diff --git a/test/common/grpc/google_async_client_impl_test.cc b/test/common/grpc/google_async_client_impl_test.cc index 8f0e85d77bf04..52e91dda32606 100644 --- a/test/common/grpc/google_async_client_impl_test.cc +++ b/test/common/grpc/google_async_client_impl_test.cc @@ -45,7 +45,7 @@ class MockStubFactory : public GoogleStubFactory { class EnvoyGoogleAsyncClientImplTest : public testing::Test { public: EnvoyGoogleAsyncClientImplTest() - : dispatcher_(test_time_.timeSource()), + : dispatcher_(test_time_.timeSystem()), method_descriptor_(helloworld::Greeter::descriptor()->FindMethodByName("SayHello")) { envoy::api::v2::core::GrpcService config; auto* google_grpc = config.mutable_google_grpc(); diff --git a/test/common/grpc/grpc_client_integration_test_harness.h b/test/common/grpc/grpc_client_integration_test_harness.h index 9a7f50855c128..c2212e054ba4a 100644 --- a/test/common/grpc/grpc_client_integration_test_harness.h +++ b/test/common/grpc/grpc_client_integration_test_harness.h @@ -204,7 +204,7 @@ class GrpcClientIntegrationTest : public GrpcClientIntegrationParamTest { public: GrpcClientIntegrationTest() : method_descriptor_(helloworld::Greeter::descriptor()->FindMethodByName("SayHello")), - dispatcher_(test_time_.timeSource()) {} + dispatcher_(test_time_.timeSystem()) {} virtual void initialize() { if (fake_upstream_ == nullptr) { @@ -276,7 +276,7 @@ class GrpcClientIntegrationTest : public GrpcClientIntegrationParamTest { envoy::api::v2::core::GrpcService config; config.mutable_envoy_grpc()->set_cluster_name(fake_cluster_name_); fillServiceWideInitialMetadata(config); - return std::make_unique(cm_, config, dispatcher_.timeSource()); + return std::make_unique(cm_, config, dispatcher_.timeSystem()); } virtual envoy::api::v2::core::GrpcService createGoogleGrpcConfig() { diff --git a/test/common/http/codec_client_test.cc b/test/common/http/codec_client_test.cc index b2175f45fc454..ea5055c92bc36 100644 --- a/test/common/http/codec_client_test.cc +++ b/test/common/http/codec_client_test.cc @@ -262,7 +262,7 @@ TEST_F(CodecClientTest, WatermarkPassthrough) { class CodecNetworkTest : public testing::TestWithParam { public: CodecNetworkTest() { - dispatcher_.reset(new Event::DispatcherImpl(test_time_.timeSource())); + dispatcher_.reset(new Event::DispatcherImpl(test_time_.timeSystem())); upstream_listener_ = dispatcher_->createListener(socket_, listener_callbacks_, true, false); Network::ClientConnectionPtr client_connection = dispatcher_->createClientConnection( socket_.localAddress(), source_address_, Network::Test::createRawBufferSocket(), nullptr); diff --git a/test/common/http/conn_manager_impl_fuzz_test.cc b/test/common/http/conn_manager_impl_fuzz_test.cc index b5ecda7de0748..656c1838bf3bb 100644 --- a/test/common/http/conn_manager_impl_fuzz_test.cc +++ b/test/common/http/conn_manager_impl_fuzz_test.cc @@ -55,7 +55,7 @@ class FuzzConfig : public ConnectionManagerConfig { }; FuzzConfig() - : route_config_provider_(test_time_.timeSource()), + : route_config_provider_(test_time_.timeSystem()), stats_{{ALL_HTTP_CONN_MAN_STATS(POOL_COUNTER(fake_stats_), POOL_GAUGE(fake_stats_), POOL_HISTOGRAM(fake_stats_))}, "", diff --git a/test/common/http/conn_manager_impl_test.cc b/test/common/http/conn_manager_impl_test.cc index 266a705a5fb97..f87af36edd7d6 100644 --- a/test/common/http/conn_manager_impl_test.cc +++ b/test/common/http/conn_manager_impl_test.cc @@ -75,7 +75,7 @@ class HttpConnectionManagerImplTest : public Test, public ConnectionManagerConfi }; HttpConnectionManagerImplTest() - : route_config_provider_(test_time_.timeSource()), access_log_path_("dummy_path"), + : route_config_provider_(test_time_.timeSystem()), access_log_path_("dummy_path"), access_logs_{ AccessLog::InstanceSharedPtr{new Extensions::AccessLoggers::File::FileAccessLog( access_log_path_, {}, AccessLog::AccessLogFormatUtils::defaultAccessLogFormatter(), diff --git a/test/common/http/http1/conn_pool_test.cc b/test/common/http/http1/conn_pool_test.cc index cf7ffb2eb4f27..9a3a06746d4a3 100644 --- a/test/common/http/http1/conn_pool_test.cc +++ b/test/common/http/http1/conn_pool_test.cc @@ -80,7 +80,7 @@ class ConnPoolImplForTest : public ConnPoolImpl { test_client.codec_ = new NiceMock(); test_client.connect_timer_ = new NiceMock(&mock_dispatcher_); std::shared_ptr cluster{new NiceMock()}; - test_client.client_dispatcher_.reset(new Event::DispatcherImpl(test_time_.timeSource())); + test_client.client_dispatcher_.reset(new Event::DispatcherImpl(test_time_.timeSystem())); Network::ClientConnectionPtr connection{test_client.connection_}; test_client.codec_client_ = new CodecClientForTest( std::move(connection), test_client.codec_, diff --git a/test/common/http/http2/conn_pool_test.cc b/test/common/http/http2/conn_pool_test.cc index 40e98992c2d3e..f0c089fb90afb 100644 --- a/test/common/http/http2/conn_pool_test.cc +++ b/test/common/http/http2/conn_pool_test.cc @@ -78,7 +78,7 @@ class Http2ConnPoolImplTest : public testing::Test { test_client.connection_ = new NiceMock(); test_client.codec_ = new NiceMock(); test_client.connect_timer_ = new NiceMock(&dispatcher_); - test_client.client_dispatcher_.reset(new Event::DispatcherImpl(test_time_.timeSource())); + test_client.client_dispatcher_.reset(new Event::DispatcherImpl(test_time_.timeSystem())); std::shared_ptr cluster{new NiceMock()}; Network::ClientConnectionPtr connection{test_client.connection_}; diff --git a/test/common/network/dns_impl_test.cc b/test/common/network/dns_impl_test.cc index d90029cd576be..4dbbae683c9f3 100644 --- a/test/common/network/dns_impl_test.cc +++ b/test/common/network/dns_impl_test.cc @@ -322,7 +322,7 @@ class DnsResolverImplPeer { class DnsImplConstructor : public testing::Test { protected: - DnsImplConstructor() : dispatcher_(test_time_.timeSource()) {} + DnsImplConstructor() : dispatcher_(test_time_.timeSystem()) {} DangerousDeprecatedTestTime test_time_; Event::DispatcherImpl dispatcher_; }; @@ -402,7 +402,7 @@ TEST_F(DnsImplConstructor, BadCustomResolvers) { class DnsImplTest : public testing::TestWithParam { public: - DnsImplTest() : dispatcher_(test_time_.timeSource()) {} + DnsImplTest() : dispatcher_(test_time_.timeSystem()) {} void SetUp() override { resolver_ = dispatcher_.createDnsResolver({}); diff --git a/test/common/network/listener_impl_test.cc b/test/common/network/listener_impl_test.cc index b674b2a02ce9e..805a8deb51c81 100644 --- a/test/common/network/listener_impl_test.cc +++ b/test/common/network/listener_impl_test.cc @@ -24,7 +24,7 @@ static void errorCallbackTest(Address::IpVersion version) { // test in the forked process to avoid confusion when the fork happens. Stats::IsolatedStoreImpl stats_store; DangerousDeprecatedTestTime test_time; - Event::DispatcherImpl dispatcher(test_time.timeSource()); + Event::DispatcherImpl dispatcher(test_time.timeSystem()); Network::TcpListenSocket socket(Network::Test::getCanonicalLoopbackAddress(version), nullptr, true); @@ -79,7 +79,7 @@ class ListenerImplTest : public testing::TestWithParam { : version_(GetParam()), alt_address_(Network::Test::findOrCheckFreePort( Network::Test::getCanonicalLoopbackAddress(version_), Address::SocketType::Stream)), - dispatcher_(test_time_.timeSource()) {} + dispatcher_(test_time_.timeSystem()) {} const Address::IpVersion version_; const Address::InstanceConstSharedPtr alt_address_; diff --git a/test/common/router/router_test.cc b/test/common/router/router_test.cc index 067bd01b47ba1..f5bb84b7ccb31 100644 --- a/test/common/router/router_test.cc +++ b/test/common/router/router_test.cc @@ -71,7 +71,7 @@ class RouterTestBase : public testing::Test { : shadow_writer_(new MockShadowWriter()), config_("test.", local_info_, stats_store_, cm_, runtime_, random_, ShadowWriterPtr{shadow_writer_}, true, start_child_span, suppress_envoy_headers, - test_time_.timeSource()), + test_time_.timeSystem()), router_(config_) { router_.setDecoderFilterCallbacks(callbacks_); upstream_locality_.set_zone("to_az"); diff --git a/test/common/ssl/ssl_socket_test.cc b/test/common/ssl/ssl_socket_test.cc index 8cbda11fb8143..dc9efcdec77f2 100644 --- a/test/common/ssl/ssl_socket_test.cc +++ b/test/common/ssl/ssl_socket_test.cc @@ -62,7 +62,7 @@ void testUtil(const std::string& client_ctx_json, const std::string& server_ctx_ std::vector{}); DangerousDeprecatedTestTime test_time; - Event::DispatcherImpl dispatcher(test_time.timeSource()); + Event::DispatcherImpl dispatcher(test_time.timeSystem()); Network::TcpListenSocket socket(Network::Test::getCanonicalLoopbackAddress(version), nullptr, true); Network::MockListenerCallbacks callbacks; @@ -166,7 +166,7 @@ const std::string testUtilV2(const envoy::api::v2::Listener& server_proto, server_names); DangerousDeprecatedTestTime test_time; - Event::DispatcherImpl dispatcher(test_time.timeSource()); + Event::DispatcherImpl dispatcher(test_time.timeSystem()); Network::TcpListenSocket socket(Network::Test::getCanonicalLoopbackAddress(version), nullptr, true); NiceMock callbacks; @@ -302,7 +302,7 @@ void configureServerAndExpiredClientCertificate(envoy::api::v2::Listener& listen class SslSocketTest : public SslCertsTest, public testing::WithParamInterface { protected: - SslSocketTest() : dispatcher_(std::make_unique(test_time_.timeSource())) {} + SslSocketTest() : dispatcher_(std::make_unique(test_time_.timeSystem())) {} DangerousDeprecatedTestTime test_time_; std::unique_ptr dispatcher_; @@ -1785,7 +1785,7 @@ void testTicketSessionResumption(const std::string& server_ctx_json1, NiceMock callbacks; Network::MockConnectionHandler connection_handler; DangerousDeprecatedTestTime test_time; - Event::DispatcherImpl dispatcher(test_time.timeSource()); + Event::DispatcherImpl dispatcher(test_time.timeSystem()); Network::ListenerPtr listener1 = dispatcher.createListener(socket1, callbacks, true, false); Network::ListenerPtr listener2 = dispatcher.createListener(socket2, callbacks, true, false); @@ -2756,7 +2756,7 @@ class SslReadBufferLimitTest : public SslSocketTest { MockWatermarkBuffer* client_write_buffer = nullptr; MockBufferFactory* factory = new StrictMock; dispatcher_.reset( - new Event::DispatcherImpl(test_time_.timeSource(), Buffer::WatermarkFactoryPtr{factory})); + new Event::DispatcherImpl(test_time_.timeSystem(), Buffer::WatermarkFactoryPtr{factory})); // By default, expect 4 buffers to be created - the client and server read and write buffers. EXPECT_CALL(*factory, create_(_, _)) diff --git a/test/common/thread_local/thread_local_impl_test.cc b/test/common/thread_local/thread_local_impl_test.cc index cc523d79b2e63..e368be02d65c5 100644 --- a/test/common/thread_local/thread_local_impl_test.cc +++ b/test/common/thread_local/thread_local_impl_test.cc @@ -116,8 +116,8 @@ TEST(ThreadLocalInstanceImplDispatcherTest, Dispatcher) { InstanceImpl tls; DangerousDeprecatedTestTime test_time; - Event::DispatcherImpl main_dispatcher(test_time.timeSource()); - Event::DispatcherImpl thread_dispatcher(test_time.timeSource()); + Event::DispatcherImpl main_dispatcher(test_time.timeSystem()); + Event::DispatcherImpl thread_dispatcher(test_time.timeSystem()); tls.registerThread(main_dispatcher, true); tls.registerThread(thread_dispatcher, false); diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index 94c09fb639410..dc9cce203b9ed 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -163,7 +163,7 @@ envoy::config::bootstrap::v2::Bootstrap parseBootstrapFromV2Yaml(const std::stri class ClusterManagerImplTest : public testing::Test { public: - ClusterManagerImplTest() { factory_.dispatcher_.setTimeSystem(time_source_); } + ClusterManagerImplTest() { factory_.dispatcher_.setTimeSystem(time_system_); } void create(const envoy::config::bootstrap::v2::Bootstrap& bootstrap) { cluster_manager_.reset(new ClusterManagerImpl( @@ -238,7 +238,7 @@ class ClusterManagerImplTest : public testing::Test { std::unique_ptr cluster_manager_; AccessLog::MockAccessLogManager log_manager_; NiceMock admin_; - NiceMock time_source_; + NiceMock time_system_; MockLocalClusterUpdate local_cluster_update_; }; @@ -289,7 +289,7 @@ TEST_F(ClusterManagerImplTest, MultipleHealthCheckFail) { } TEST_F(ClusterManagerImplTest, MultipleProtocolCluster) { - EXPECT_CALL(time_source_, systemTime()) + EXPECT_CALL(time_system_, systemTime()) .WillRepeatedly(Return(SystemTime(std::chrono::milliseconds(1234567891234)))); const std::string yaml = R"EOF( @@ -766,7 +766,7 @@ TEST_F(ClusterManagerImplTest, ShutdownOrder) { } TEST_F(ClusterManagerImplTest, InitializeOrder) { - EXPECT_CALL(time_source_, systemTime()) + EXPECT_CALL(time_system_, systemTime()) .WillRepeatedly(Return(SystemTime(std::chrono::milliseconds(1234567891234)))); const std::string json = fmt::sprintf( @@ -985,7 +985,7 @@ TEST_F(ClusterManagerImplTest, DynamicRemoveWithLocalCluster) { } TEST_F(ClusterManagerImplTest, RemoveWarmingCluster) { - EXPECT_CALL(time_source_, systemTime()) + EXPECT_CALL(time_system_, systemTime()) .WillRepeatedly(Return(SystemTime(std::chrono::milliseconds(1234567891234)))); const std::string json = R"EOF( diff --git a/test/config_test/config_test.cc b/test/config_test/config_test.cc index 2ead1479033a0..05678362ac1e2 100644 --- a/test/config_test/config_test.cc +++ b/test/config_test/config_test.cc @@ -84,7 +84,7 @@ class ConfigTest { NiceMock component_factory_; NiceMock worker_factory_; Server::ListenerManagerImpl listener_manager_{server_, component_factory_, worker_factory_, - server_.timeSource()}; + server_.timeSystem()}; Runtime::RandomGeneratorImpl random_; NiceMock os_sys_calls_; TestThreadsafeSingletonInjector os_calls{&os_sys_calls_}; diff --git a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc index 362a2e9c1d6c9..003a76e59cb05 100644 --- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc +++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc @@ -50,7 +50,7 @@ class ProxyProtocolTest : public testing::TestWithParam { public: ProxyProtocolTest() - : dispatcher_(test_time_.timeSource()), + : dispatcher_(test_time_.timeSystem()), socket_(Network::Test::getCanonicalLoopbackAddress(GetParam()), nullptr, true), connection_handler_(new Server::ConnectionHandlerImpl(ENVOY_LOGGER(), dispatcher_)), name_("proxy"), filter_chain_(Network::Test::createEmptyFilterChainWithRawBufferSockets()) { @@ -863,7 +863,7 @@ class WildcardProxyProtocolTest : public testing::TestWithParam { public: WildcardProxyProtocolTest() - : dispatcher_(test_time_.timeSource()), + : dispatcher_(test_time_.timeSystem()), socket_(Network::Test::getAnyAddress(GetParam()), nullptr, true), local_dst_address_(Network::Utility::getAddressWithPort( *Network::Test::getCanonicalLoopbackAddress(GetParam()), diff --git a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc index 627eabf08dab0..ab078fe6953f1 100644 --- a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc +++ b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc @@ -99,7 +99,7 @@ class MetricsServiceSinkTest : public testing::Test {}; TEST(MetricsServiceSinkTest, CheckSendCall) { NiceMock source; - NiceMock mock_time; + NiceMock mock_time; std::shared_ptr streamer_{new MockGrpcMetricsStreamer()}; MetricsServiceSink sink(streamer_, mock_time); @@ -127,7 +127,7 @@ TEST(MetricsServiceSinkTest, CheckSendCall) { TEST(MetricsServiceSinkTest, CheckStatsCount) { NiceMock source; - NiceMock mock_time; + NiceMock mock_time; std::shared_ptr streamer_{new TestGrpcMetricsStreamer()}; MetricsServiceSink sink(streamer_, mock_time); diff --git a/test/extensions/tracers/zipkin/span_buffer_test.cc b/test/extensions/tracers/zipkin/span_buffer_test.cc index c151478c72fa0..987e059efdbb6 100644 --- a/test/extensions/tracers/zipkin/span_buffer_test.cc +++ b/test/extensions/tracers/zipkin/span_buffer_test.cc @@ -15,13 +15,13 @@ TEST(ZipkinSpanBufferTest, defaultConstructorEndToEnd) { EXPECT_EQ(0ULL, buffer.pendingSpans()); EXPECT_EQ("[]", buffer.toStringifiedJsonArray()); - EXPECT_FALSE(buffer.addSpan(Span(test_time.timeSource()))); + EXPECT_FALSE(buffer.addSpan(Span(test_time.timeSystem()))); buffer.allocateBuffer(2); EXPECT_EQ(0ULL, buffer.pendingSpans()); EXPECT_EQ("[]", buffer.toStringifiedJsonArray()); - buffer.addSpan(Span(test_time.timeSource())); + buffer.addSpan(Span(test_time.timeSystem())); EXPECT_EQ(1ULL, buffer.pendingSpans()); std::string expected_json_array_string = "[{" R"("traceId":"0000000000000000",)" @@ -36,8 +36,8 @@ TEST(ZipkinSpanBufferTest, defaultConstructorEndToEnd) { EXPECT_EQ(0ULL, buffer.pendingSpans()); EXPECT_EQ("[]", buffer.toStringifiedJsonArray()); - buffer.addSpan(Span(test_time.timeSource())); - buffer.addSpan(Span(test_time.timeSource())); + buffer.addSpan(Span(test_time.timeSystem())); + buffer.addSpan(Span(test_time.timeSystem())); expected_json_array_string = "[" "{" R"("traceId":"0000000000000000",)" @@ -69,7 +69,7 @@ TEST(ZipkinSpanBufferTest, sizeConstructorEndtoEnd) { EXPECT_EQ(0ULL, buffer.pendingSpans()); EXPECT_EQ("[]", buffer.toStringifiedJsonArray()); - buffer.addSpan(Span(test_time.timeSource())); + buffer.addSpan(Span(test_time.timeSystem())); EXPECT_EQ(1ULL, buffer.pendingSpans()); std::string expected_json_array_string = "[{" R"("traceId":"0000000000000000",)" @@ -84,8 +84,8 @@ TEST(ZipkinSpanBufferTest, sizeConstructorEndtoEnd) { EXPECT_EQ(0ULL, buffer.pendingSpans()); EXPECT_EQ("[]", buffer.toStringifiedJsonArray()); - buffer.addSpan(Span(test_time.timeSource())); - buffer.addSpan(Span(test_time.timeSource())); + buffer.addSpan(Span(test_time.timeSystem())); + buffer.addSpan(Span(test_time.timeSystem())); expected_json_array_string = "[" "{" R"("traceId":"0000000000000000",)" diff --git a/test/extensions/tracers/zipkin/tracer_test.cc b/test/extensions/tracers/zipkin/tracer_test.cc index 6c21d6f157077..81743c4061b49 100644 --- a/test/extensions/tracers/zipkin/tracer_test.cc +++ b/test/extensions/tracers/zipkin/tracer_test.cc @@ -37,7 +37,7 @@ class TestReporterImpl : public Reporter { class ZipkinTracerTest : public testing::Test { protected: - ZipkinTracerTest() : time_source_(test_time_.timeSource()) {} + ZipkinTracerTest() : time_source_(test_time_.timeSystem()) {} DangerousDeprecatedTestTime test_time_; TimeSource& time_source_; @@ -184,7 +184,7 @@ TEST_F(ZipkinTracerTest, spanCreation) { // ============== ON_CALL(config, operationName()).WillByDefault(Return(Tracing::OperationName::Ingress)); - const uint generated_parent_id = Util::generateRandom64(test_time_.timeSource()); + const uint generated_parent_id = Util::generateRandom64(test_time_.timeSystem()); SpanContext modified_root_span_context(root_span_context.trace_id_high(), root_span_context.trace_id(), root_span_context.id(), generated_parent_id, root_span_context.sampled()); @@ -230,7 +230,7 @@ TEST_F(ZipkinTracerTest, finishSpan) { Network::Address::InstanceConstSharedPtr addr = Network::Utility::parseInternetAddressAndPort("127.0.0.1:9000"); NiceMock random_generator; - Tracer tracer("my_service_name", addr, random_generator, false, test_time_.timeSource()); + Tracer tracer("my_service_name", addr, random_generator, false, test_time_.timeSystem()); NiceMock mock_start_time; SystemTime timestamp = mock_start_time.systemTime(); diff --git a/test/extensions/tracers/zipkin/util_test.cc b/test/extensions/tracers/zipkin/util_test.cc index 0472b640ed093..3383409837e3e 100644 --- a/test/extensions/tracers/zipkin/util_test.cc +++ b/test/extensions/tracers/zipkin/util_test.cc @@ -11,7 +11,7 @@ namespace Zipkin { TEST(ZipkinUtilTest, utilTests) { DangerousDeprecatedTestTime time; - EXPECT_EQ(typeid(uint64_t).name(), typeid(Util::generateRandom64(time.timeSource())).name()); + EXPECT_EQ(typeid(uint64_t).name(), typeid(Util::generateRandom64(time.timeSystem())).name()); // Test JSON merging diff --git a/test/extensions/tracers/zipkin/zipkin_core_types_test.cc b/test/extensions/tracers/zipkin/zipkin_core_types_test.cc index e9a569fee4232..62a431ca4f890 100644 --- a/test/extensions/tracers/zipkin/zipkin_core_types_test.cc +++ b/test/extensions/tracers/zipkin/zipkin_core_types_test.cc @@ -90,7 +90,7 @@ TEST(ZipkinCoreTypesAnnotationTest, defaultConstructor) { DangerousDeprecatedTestTime test_time; uint64_t timestamp = std::chrono::duration_cast( - test_time.timeSource().systemTime().time_since_epoch()) + test_time.timeSystem().systemTime().time_since_epoch()) .count(); ann.setTimestamp(timestamp); EXPECT_EQ(timestamp, ann.timestamp()); @@ -149,7 +149,7 @@ TEST(ZipkinCoreTypesAnnotationTest, customConstructor) { Endpoint ep(std::string("my_service"), addr); DangerousDeprecatedTestTime test_time; uint64_t timestamp = std::chrono::duration_cast( - test_time.timeSource().systemTime().time_since_epoch()) + test_time.timeSystem().systemTime().time_since_epoch()) .count(); Annotation ann(timestamp, ZipkinCoreConstants::get().CLIENT_SEND, ep); @@ -174,7 +174,7 @@ TEST(ZipkinCoreTypesAnnotationTest, copyConstructor) { Endpoint ep(std::string("my_service"), addr); DangerousDeprecatedTestTime test_time; uint64_t timestamp = std::chrono::duration_cast( - test_time.timeSource().systemTime().time_since_epoch()) + test_time.timeSystem().systemTime().time_since_epoch()) .count(); Annotation ann(timestamp, ZipkinCoreConstants::get().CLIENT_SEND, ep); Annotation ann2(ann); @@ -192,7 +192,7 @@ TEST(ZipkinCoreTypesAnnotationTest, assignmentOperator) { Endpoint ep(std::string("my_service"), addr); DangerousDeprecatedTestTime test_time; uint64_t timestamp = std::chrono::duration_cast( - test_time.timeSource().systemTime().time_since_epoch()) + test_time.timeSystem().systemTime().time_since_epoch()) .count(); Annotation ann(timestamp, ZipkinCoreConstants::get().CLIENT_SEND, ep); Annotation ann2 = ann; @@ -290,7 +290,7 @@ TEST(ZipkinCoreTypesBinaryAnnotationTest, assignmentOperator) { TEST(ZipkinCoreTypesSpanTest, defaultConstructor) { DangerousDeprecatedTestTime test_time; - Span span(test_time.timeSource()); + Span span(test_time.timeSystem()); EXPECT_EQ(0ULL, span.id()); EXPECT_EQ(0ULL, span.traceId()); @@ -310,40 +310,40 @@ TEST(ZipkinCoreTypesSpanTest, defaultConstructor) { R"("annotations":[],"binaryAnnotations":[]})", span.toJson()); - uint64_t id = Util::generateRandom64(test_time.timeSource()); + uint64_t id = Util::generateRandom64(test_time.timeSystem()); std::string id_hex = Hex::uint64ToHex(id); span.setId(id); EXPECT_EQ(id, span.id()); EXPECT_EQ(id_hex, span.idAsHexString()); - id = Util::generateRandom64(test_time.timeSource()); + id = Util::generateRandom64(test_time.timeSystem()); id_hex = Hex::uint64ToHex(id); span.setParentId(id); EXPECT_EQ(id, span.parentId()); EXPECT_EQ(id_hex, span.parentIdAsHexString()); EXPECT_TRUE(span.isSetParentId()); - id = Util::generateRandom64(test_time.timeSource()); + id = Util::generateRandom64(test_time.timeSystem()); id_hex = Hex::uint64ToHex(id); span.setTraceId(id); EXPECT_EQ(id, span.traceId()); EXPECT_EQ(id_hex, span.traceIdAsHexString()); - id = Util::generateRandom64(test_time.timeSource()); + id = Util::generateRandom64(test_time.timeSystem()); id_hex = Hex::uint64ToHex(id); span.setTraceIdHigh(id); EXPECT_EQ(id, span.traceIdHigh()); EXPECT_TRUE(span.isSetTraceIdHigh()); int64_t timestamp = std::chrono::duration_cast( - test_time.timeSource().systemTime().time_since_epoch()) + test_time.timeSystem().systemTime().time_since_epoch()) .count(); span.setTimestamp(timestamp); EXPECT_EQ(timestamp, span.timestamp()); EXPECT_TRUE(span.isSetTimestamp()); int64_t start_time = std::chrono::duration_cast( - test_time.timeSource().monotonicTime().time_since_epoch()) + test_time.timeSystem().monotonicTime().time_since_epoch()) .count(); span.setStartTime(start_time); EXPECT_EQ(start_time, span.startTime()); @@ -491,15 +491,15 @@ TEST(ZipkinCoreTypesSpanTest, defaultConstructor) { TEST(ZipkinCoreTypesSpanTest, copyConstructor) { DangerousDeprecatedTestTime test_time; - Span span(test_time.timeSource()); + Span span(test_time.timeSystem()); - uint64_t id = Util::generateRandom64(test_time.timeSource()); + uint64_t id = Util::generateRandom64(test_time.timeSystem()); std::string id_hex = Hex::uint64ToHex(id); span.setId(id); span.setParentId(id); span.setTraceId(id); int64_t timestamp = std::chrono::duration_cast( - test_time.timeSource().systemTime().time_since_epoch()) + test_time.timeSystem().systemTime().time_since_epoch()) .count(); span.setTimestamp(timestamp); span.setDuration(3000LL); @@ -528,15 +528,15 @@ TEST(ZipkinCoreTypesSpanTest, copyConstructor) { TEST(ZipkinCoreTypesSpanTest, assignmentOperator) { DangerousDeprecatedTestTime test_time; - Span span(test_time.timeSource()); + Span span(test_time.timeSystem()); - uint64_t id = Util::generateRandom64(test_time.timeSource()); + uint64_t id = Util::generateRandom64(test_time.timeSystem()); std::string id_hex = Hex::uint64ToHex(id); span.setId(id); span.setParentId(id); span.setTraceId(id); int64_t timestamp = std::chrono::duration_cast( - test_time.timeSource().systemTime().time_since_epoch()) + test_time.timeSystem().systemTime().time_since_epoch()) .count(); span.setTimestamp(timestamp); span.setDuration(3000LL); @@ -565,7 +565,7 @@ TEST(ZipkinCoreTypesSpanTest, assignmentOperator) { TEST(ZipkinCoreTypesSpanTest, setTag) { DangerousDeprecatedTestTime test_time; - Span span(test_time.timeSource()); + Span span(test_time.timeSystem()); span.setTag("key1", "value1"); span.setTag("key2", "value2"); diff --git a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc index 4de0a78078bbd..05ad40b746e84 100644 --- a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc +++ b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc @@ -38,7 +38,7 @@ namespace Zipkin { class ZipkinDriverTest : public Test { public: - ZipkinDriverTest() : time_source_(test_time_.timeSource()) {} + ZipkinDriverTest() : time_source_(test_time_.timeSystem()) {} void setup(Json::Object& config, bool init_timer) { ON_CALL(cm_, httpAsyncClientForCluster("fake_cluster")) @@ -67,7 +67,7 @@ class ZipkinDriverTest : public Test { setup(*loader, true); } - // TODO(#4160): Currently time_source_ is initialized from DangerousDeprecatedTestTime, which uses + // TODO(#4160): Currently time_system_ is initialized from DangerousDeprecatedTestTime, which uses // real time, not mock-time. When that is switched to use mock-time intead, I think // generateRandom64() may not be as random as we want, and we'll need to inject entropy // appropriate for the test. diff --git a/test/integration/fake_upstream.cc b/test/integration/fake_upstream.cc index 571184ffa75bf..e122ff098c25c 100644 --- a/test/integration/fake_upstream.cc +++ b/test/integration/fake_upstream.cc @@ -359,7 +359,7 @@ FakeUpstream::FakeUpstream(Network::TransportSocketFactoryPtr&& transport_socket Network::SocketPtr&& listen_socket, FakeHttpConnection::Type type, bool enable_half_close) : http_type_(type), socket_(std::move(listen_socket)), api_(new Api::Impl(milliseconds(10000))), - dispatcher_(api_->allocateDispatcher(test_time_.timeSource())), + dispatcher_(api_->allocateDispatcher(test_time_.timeSystem())), handler_(new Server::ConnectionHandlerImpl(ENVOY_LOGGER(), *dispatcher_)), allow_unexpected_disconnects_(false), enable_half_close_(enable_half_close), listener_(*this), filter_chain_(Network::Test::createEmptyFilterChain(std::move(transport_socket_factory))) { diff --git a/test/integration/integration.cc b/test/integration/integration.cc index b0e854e803b9f..1e849f2a4d74c 100644 --- a/test/integration/integration.cc +++ b/test/integration/integration.cc @@ -214,7 +214,7 @@ BaseIntegrationTest::BaseIntegrationTest(Network::Address::IpVersion version, const std::string& config) : api_(new Api::Impl(std::chrono::milliseconds(10000))), mock_buffer_factory_(new NiceMock), - dispatcher_(new Event::DispatcherImpl(test_time_.timeSource(), + dispatcher_(new Event::DispatcherImpl(test_time_.timeSystem(), Buffer::WatermarkFactoryPtr{mock_buffer_factory_})), version_(version), config_helper_(version, config), default_log_level_(TestEnvironment::getOptions().logLevel()) { diff --git a/test/integration/server.cc b/test/integration/server.cc index fa8bb9a8c18f3..2cb73966a31fd 100644 --- a/test/integration/server.cc +++ b/test/integration/server.cc @@ -104,7 +104,7 @@ void IntegrationTestServer::threadRoutine(const Network::Address::IpVersion vers random_generator = std::make_unique(); } server_.reset(new Server::InstanceImpl( - options, test_time_.timeSource(), Network::Utility::getLocalAddress(version), *this, + options, test_time_.timeSystem(), Network::Utility::getLocalAddress(version), *this, restarter, stats_store, lock, *this, std::move(random_generator), tls)); pending_listeners_ = server_->listenerManager().listeners().size(); ENVOY_LOG(info, "waiting for {} test server listeners", pending_listeners_); diff --git a/test/integration/utility.cc b/test/integration/utility.cc index 9e136407254fd..3355bf2015f63 100644 --- a/test/integration/utility.cc +++ b/test/integration/utility.cc @@ -62,7 +62,7 @@ IntegrationUtil::makeSingleRequest(const Network::Address::InstanceConstSharedPt const std::string& host, const std::string& content_type) { Api::Impl api(std::chrono::milliseconds(9000)); - Event::DispatcherPtr dispatcher(api.allocateDispatcher(evil_singleton_test_time_.timeSource())); + Event::DispatcherPtr dispatcher(api.allocateDispatcher(evil_singleton_test_time_.timeSystem())); std::shared_ptr cluster{new NiceMock()}; Upstream::HostDescriptionConstSharedPtr host_description{ Upstream::makeTestHostDescription(cluster, "tcp://127.0.0.1:80")}; @@ -110,7 +110,7 @@ RawConnectionDriver::RawConnectionDriver(uint32_t port, Buffer::Instance& initia ReadCallback data_callback, Network::Address::IpVersion version) { api_.reset(new Api::Impl(std::chrono::milliseconds(10000))); - dispatcher_ = api_->allocateDispatcher(IntegrationUtil::evil_singleton_test_time_.timeSource()); + dispatcher_ = api_->allocateDispatcher(IntegrationUtil::evil_singleton_test_time_.timeSystem()); callbacks_ = std::make_unique(); client_ = dispatcher_->createClientConnection( Network::Utility::resolveUrl( diff --git a/test/mocks/common.h b/test/mocks/common.h index 96ae428bf37d3..5b1b5268f0db3 100644 --- a/test/mocks/common.h +++ b/test/mocks/common.h @@ -62,7 +62,6 @@ class MockTimeSystem : public Event::TimeSystem { MOCK_METHOD0(monotonicTime, MonotonicTime()); Event::RealTimeSystem real_time_system_; - MockTimeSource mock_time_source_; }; class MockTokenBucket : public TokenBucket { diff --git a/test/mocks/event/mocks.cc b/test/mocks/event/mocks.cc index 36650b5aff056..b5e2f9a1bee6c 100644 --- a/test/mocks/event/mocks.cc +++ b/test/mocks/event/mocks.cc @@ -13,7 +13,7 @@ using testing::SaveArg; namespace Envoy { namespace Event { -MockDispatcher::MockDispatcher() : time_system_(&test_time_.timeSource()) { +MockDispatcher::MockDispatcher() : time_system_(&test_time_.timeSystem()) { ON_CALL(*this, clearDeferredDeleteList()).WillByDefault(Invoke([this]() -> void { to_delete_.clear(); })); diff --git a/test/mocks/event/mocks.h b/test/mocks/event/mocks.h index 915231bddca31..6f11b90b1cc56 100644 --- a/test/mocks/event/mocks.h +++ b/test/mocks/event/mocks.h @@ -33,7 +33,7 @@ class MockDispatcher : public Dispatcher { void setTimeSystem(TimeSystem& time_system) { time_system_ = &time_system; } // Dispatcher - TimeSystem& timeSource() override { return *time_system_; } + TimeSystem& timeSystem() override { return *time_system_; } Network::ConnectionPtr createServerConnection(Network::ConnectionSocketPtr&& socket, Network::TransportSocketPtr&& transport_socket) override { diff --git a/test/mocks/server/mocks.cc b/test/mocks/server/mocks.cc index 3a3e6935b2c3b..c321ce86183fe 100644 --- a/test/mocks/server/mocks.cc +++ b/test/mocks/server/mocks.cc @@ -133,7 +133,7 @@ MockInstance::MockInstance() ON_CALL(*this, listenerManager()).WillByDefault(ReturnRef(listener_manager_)); ON_CALL(*this, singletonManager()).WillByDefault(ReturnRef(*singleton_manager_)); ON_CALL(*this, overloadManager()).WillByDefault(ReturnRef(overload_manager_)); - ON_CALL(*this, timeSource()).WillByDefault(ReturnRef(test_time_.timeSource())); + ON_CALL(*this, timeSystem()).WillByDefault(ReturnRef(test_time_.timeSystem())); } MockInstance::~MockInstance() {} diff --git a/test/mocks/server/mocks.h b/test/mocks/server/mocks.h index 50f53ccd71c1e..ca920f66727de 100644 --- a/test/mocks/server/mocks.h +++ b/test/mocks/server/mocks.h @@ -327,7 +327,7 @@ class MockInstance : public Instance { MOCK_METHOD0(httpTracer, Tracing::HttpTracer&()); MOCK_METHOD0(threadLocal, ThreadLocal::Instance&()); MOCK_METHOD0(localInfo, const LocalInfo::LocalInfo&()); - MOCK_METHOD0(timeSource, Event::TimeSystem&()); + MOCK_METHOD0(timeSystem, Event::TimeSystem&()); MOCK_CONST_METHOD0(statsFlushInterval, std::chrono::milliseconds()); std::unique_ptr secret_manager_; diff --git a/test/server/config_validation/async_client_test.cc b/test/server/config_validation/async_client_test.cc index 53a172c3394ea..4fdb22b84659b 100644 --- a/test/server/config_validation/async_client_test.cc +++ b/test/server/config_validation/async_client_test.cc @@ -17,7 +17,7 @@ TEST(ValidationAsyncClientTest, MockedMethods) { MockAsyncClientStreamCallbacks stream_callbacks; DangerousDeprecatedTestTime test_time; - ValidationAsyncClient client(test_time.timeSource()); + ValidationAsyncClient client(test_time.timeSystem()); EXPECT_EQ(nullptr, client.send(std::move(message), callbacks, absl::optional())); EXPECT_EQ(nullptr, diff --git a/test/server/config_validation/dispatcher_test.cc b/test/server/config_validation/dispatcher_test.cc index 3476ea525668a..8f9757bb7e72f 100644 --- a/test/server/config_validation/dispatcher_test.cc +++ b/test/server/config_validation/dispatcher_test.cc @@ -23,7 +23,7 @@ class ConfigValidation : public ::testing::TestWithParam(std::chrono::milliseconds(1000)); - dispatcher_ = validation_->allocateDispatcher(test_time_.timeSource()); + dispatcher_ = validation_->allocateDispatcher(test_time_.timeSystem()); } DangerousDeprecatedTestTime test_time_; diff --git a/test/server/server_fuzz_test.cc b/test/server/server_fuzz_test.cc index af38634b42cf2..cdb8e47ed3776 100644 --- a/test/server/server_fuzz_test.cc +++ b/test/server/server_fuzz_test.cc @@ -77,7 +77,7 @@ DEFINE_PROTO_FUZZER(const envoy::config::bootstrap::v2::Bootstrap& input) { std::unique_ptr server; try { server = std::make_unique( - options, test_time.timeSource(), + options, test_time.timeSystem(), std::make_shared("127.0.0.1"), hooks, restart, stats_store, fakelock, component_factory, std::make_unique(), thread_local_instance); diff --git a/test/server/server_test.cc b/test/server/server_test.cc index 89607ff98edba..0a4865a0783c0 100644 --- a/test/server/server_test.cc +++ b/test/server/server_test.cc @@ -113,7 +113,7 @@ class ServerInstanceImplTest : public testing::TestWithParam>(), thread_local_)); @@ -129,7 +129,7 @@ class ServerInstanceImplTest : public testing::TestWithParam>(), thread_local_)); @@ -298,7 +298,7 @@ TEST_P(ServerInstanceImplTest, LogToFileError) { TEST_P(ServerInstanceImplTest, NoOptionsPassed) { EXPECT_THROW_WITH_MESSAGE( server_.reset(new InstanceImpl( - options_, test_time_.timeSource(), + options_, test_time_.timeSystem(), Network::Address::InstanceConstSharedPtr(new Network::Address::Ipv4Instance("127.0.0.1")), hooks_, restart_, stats_store_, fakelock_, component_factory_, std::make_unique>(), thread_local_)), diff --git a/test/server/worker_impl_test.cc b/test/server/worker_impl_test.cc index af730229348f6..6bb93191ea327 100644 --- a/test/server/worker_impl_test.cc +++ b/test/server/worker_impl_test.cc @@ -31,7 +31,7 @@ class WorkerImplTest : public testing::Test { NiceMock tls_; DangerousDeprecatedTestTime test_time; - Event::DispatcherImpl* dispatcher_ = new Event::DispatcherImpl(test_time.timeSource()); + Event::DispatcherImpl* dispatcher_ = new Event::DispatcherImpl(test_time.timeSystem()); Network::MockConnectionHandler* handler_ = new Network::MockConnectionHandler(); NiceMock guard_dog_; DefaultTestHooks hooks_; diff --git a/test/test_common/test_time.h b/test/test_common/test_time.h index a1885808317da..64cb3d1a42222 100644 --- a/test/test_common/test_time.h +++ b/test/test_common/test_time.h @@ -13,8 +13,7 @@ class DangerousDeprecatedTestTime { public: DangerousDeprecatedTestTime(); - // TODO(#4160) rename this method and all call-sites to timeSystem(). - Event::TimeSystem& timeSource() { return time_system_; } + Event::TimeSystem& timeSystem() { return time_system_; } private: Event::RealTimeSystem time_system_;