Replace steady_clock with system_clock

ljbade · ljbade · commit dc50045b9d96 · 2022-03-30T19:52:46.000+11:00
diff --git a/core/include/prometheus/collectable.h b/core/include/prometheus/collectable.h
@@ -22,7 +22,7 @@ class PROMETHEUS_CPP_CORE_EXPORT Collectable {
   /// \brief Returns a list of metrics and their samples.
   virtual std::vector<MetricFamily> Collect() const = 0;
   virtual std::vector<MetricFamily> Collect(
-      const std::chrono::steady_clock::time_point& time) const = 0;
+      const std::chrono::system_clock::time_point& time) const = 0;
 };
 
 }  // namespace prometheus
diff --git a/core/include/prometheus/counter.h b/core/include/prometheus/counter.h
@@ -53,7 +53,7 @@ class PROMETHEUS_CPP_CORE_EXPORT Counter {
   /// Expires is called by the Registry when collecting metrics.
   ///
   /// A counter never expires.
-  static bool Expired(const std::chrono::steady_clock::time_point& time,
+  static bool Expired(const std::chrono::system_clock::time_point& time,
                       const std::chrono::seconds& ttl);
 
  private:
diff --git a/core/include/prometheus/detail/time_window_quantiles.h b/core/include/prometheus/detail/time_window_quantiles.h
@@ -13,7 +13,7 @@ namespace prometheus {
 namespace detail {
 
 class PROMETHEUS_CPP_CORE_EXPORT TimeWindowQuantiles {
-  using Clock = std::chrono::steady_clock;
+  using Clock = std::chrono::system_clock;
 
  public:
   TimeWindowQuantiles(const std::vector<CKMSQuantiles::Quantile>& quantiles,
diff --git a/core/include/prometheus/family.h b/core/include/prometheus/family.h
@@ -158,7 +158,7 @@ class PROMETHEUS_CPP_CORE_EXPORT Family : public Collectable {
   ///
   /// \return Zero or more samples for each dimensional data.
   std::vector<MetricFamily> Collect(
-      const std::chrono::steady_clock::time_point& time) const override;
+      const std::chrono::system_clock::time_point& time) const override;
 
  private:
   std::unordered_map<Labels, std::unique_ptr<T>, detail::LabelHasher> metrics_;
diff --git a/core/include/prometheus/gauge.h b/core/include/prometheus/gauge.h
@@ -69,14 +69,14 @@ class PROMETHEUS_CPP_CORE_EXPORT Gauge {
   /// \param time Time to live in seconds.
   ///
   /// \return Has the gauge expired.
-  bool Expired(const std::chrono::steady_clock::time_point& time,
+  bool Expired(const std::chrono::system_clock::time_point& time,
                const std::chrono::seconds& ttl) const;
 
  private:
   void Change(double);
   std::atomic<double> value_{0.0};
-  std::atomic<std::chrono::steady_clock::time_point> time_{
-      std::chrono::steady_clock::now()};
+  std::atomic<std::chrono::system_clock::time_point> time_{
+      std::chrono::system_clock::now()};
 };
 
 /// \brief Return a builder to configure and register a Gauge metric.
diff --git a/core/include/prometheus/histogram.h b/core/include/prometheus/histogram.h
@@ -73,7 +73,7 @@ class PROMETHEUS_CPP_CORE_EXPORT Histogram {
   /// Expires is called by the Registry when collecting metrics.
   ///
   /// A histogram never expires.
-  static bool Expired(const std::chrono::steady_clock::time_point& time,
+  static bool Expired(const std::chrono::system_clock::time_point& time,
                       const std::chrono::seconds& ttl);
 
  private:
diff --git a/core/include/prometheus/registry.h b/core/include/prometheus/registry.h
@@ -91,7 +91,7 @@ class PROMETHEUS_CPP_CORE_EXPORT Registry : public Collectable {
   ///
   /// \return Zero or more metrics and their samples.
   std::vector<MetricFamily> Collect(
-      const std::chrono::steady_clock::time_point& time) const override;
+      const std::chrono::system_clock::time_point& time) const override;
 
   /// \brief Removes a metrics family from the registry.
   ///
diff --git a/core/include/prometheus/summary.h b/core/include/prometheus/summary.h
@@ -88,7 +88,7 @@ class PROMETHEUS_CPP_CORE_EXPORT Summary {
   /// Expires is called by the Registry when collecting metrics.
   ///
   /// A summary never expires.
-  static bool Expired(const std::chrono::steady_clock::time_point& time,
+  static bool Expired(const std::chrono::system_clock::time_point& time,
                       const std::chrono::seconds& ttl);
 
  private:
diff --git a/core/src/counter.cc b/core/src/counter.cc
@@ -19,7 +19,7 @@ ClientMetric Counter::Collect() const {
   return metric;
 }
 
-bool Counter::Expired(const std::chrono::steady_clock::time_point& time,
+bool Counter::Expired(const std::chrono::system_clock::time_point& time,
                       const std::chrono::seconds& ttl) {
   (void)time;
   (void)ttl;
diff --git a/core/src/family.cc b/core/src/family.cc
@@ -89,12 +89,12 @@ const Labels Family<T>::GetConstantLabels() const {
 
 template <typename T>
 std::vector<MetricFamily> Family<T>::Collect() const {
-  return Collect(std::chrono::steady_clock::now());
+  return Collect(std::chrono::system_clock::now());
 }
 
 template <typename T>
 std::vector<MetricFamily> Family<T>::Collect(
-    const std::chrono::steady_clock::time_point& time) const {
+    const std::chrono::system_clock::time_point& time) const {
   std::lock_guard<std::mutex> lock{mutex_};
 
   if (metrics_.empty()) {
diff --git a/core/src/gauge.cc b/core/src/gauge.cc
@@ -16,7 +16,7 @@ void Gauge::Decrement(const double value) { Change(-1.0 * value); }
 
 void Gauge::Set(const double value) {
   value_.store(value);
-  time_.store(std::chrono::steady_clock::now());
+  time_.store(std::chrono::system_clock::now());
 }
 
 void Gauge::Change(const double value) {
@@ -25,7 +25,7 @@ void Gauge::Change(const double value) {
   while (!value_.compare_exchange_weak(current, current + value)) {
     // intentionally empty block
   }
-  time_.store(std::chrono::steady_clock::now());
+  time_.store(std::chrono::system_clock::now());
 }
 
 void Gauge::SetToCurrentTime() {
@@ -41,7 +41,7 @@ ClientMetric Gauge::Collect() const {
   return metric;
 }
 
-bool Gauge::Expired(const std::chrono::steady_clock::time_point& time,
+bool Gauge::Expired(const std::chrono::system_clock::time_point& time,
                     const std::chrono::seconds& ttl) const {
   return std::chrono::duration_cast<std::chrono::seconds>(time -
                                                           time_.load()) >= ttl;
diff --git a/core/src/histogram.cc b/core/src/histogram.cc
@@ -80,7 +80,7 @@ ClientMetric Histogram::Collect() const {
   return metric;
 }
 
-bool Histogram::Expired(const std::chrono::steady_clock::time_point& time,
+bool Histogram::Expired(const std::chrono::system_clock::time_point& time,
                         const std::chrono::seconds& ttl) {
   (void)time;
   (void)ttl;
diff --git a/core/src/registry.cc b/core/src/registry.cc
@@ -17,7 +17,7 @@ namespace prometheus {
 namespace {
 template <typename T>
 void CollectAll(std::vector<MetricFamily>& results, const T& families,
-                const std::chrono::steady_clock::time_point& time) {
+                const std::chrono::system_clock::time_point& time) {
   for (auto&& collectable : families) {
     auto metrics = collectable->Collect(time);
     results.insert(results.end(), std::make_move_iterator(metrics.begin()),
@@ -45,11 +45,11 @@ Registry::Registry(InsertBehavior insert_behavior)
 Registry::~Registry() = default;
 
 std::vector<MetricFamily> Registry::Collect() const {
-  return Collect(std::chrono::steady_clock::now());
+  return Collect(std::chrono::system_clock::now());
 }
 
 std::vector<MetricFamily> Registry::Collect(
-    const std::chrono::steady_clock::time_point& time) const {
+    const std::chrono::system_clock::time_point& time) const {
   std::lock_guard<std::mutex> lock{mutex_};
   auto results = std::vector<MetricFamily>{};
 
diff --git a/core/src/summary.cc b/core/src/summary.cc
@@ -37,7 +37,7 @@ ClientMetric Summary::Collect() const {
   return metric;
 }
 
-bool Summary::Expired(const std::chrono::steady_clock::time_point& time,
+bool Summary::Expired(const std::chrono::system_clock::time_point& time,
                       const std::chrono::seconds& ttl) {
   (void)time;
   (void)ttl;
diff --git a/core/tests/counter_test.cc b/core/tests/counter_test.cc
@@ -44,7 +44,7 @@ TEST(CounterTest, not_expired) {
   Counter counter;
   counter.Increment();
   std::this_thread::sleep_for(std::chrono::seconds(1));
-  EXPECT_FALSE(counter.Expired(std::chrono::steady_clock::now(),
+  EXPECT_FALSE(counter.Expired(std::chrono::system_clock::now(),
                                std::chrono::seconds(1)));
 }
 
diff --git a/core/tests/gauge_test.cc b/core/tests/gauge_test.cc
@@ -84,29 +84,29 @@ TEST(GaugeTest, set_expired) {
   gauge.Set(1.0);
   std::this_thread::sleep_for(std::chrono::seconds(1));
   EXPECT_TRUE(
-      gauge.Expired(std::chrono::steady_clock::now(), std::chrono::seconds(1)));
+      gauge.Expired(std::chrono::system_clock::now(), std::chrono::seconds(1)));
 }
 
 TEST(GaugeTest, set_not_expired) {
   Gauge gauge;
   gauge.Set(1.0);
   EXPECT_FALSE(
-      gauge.Expired(std::chrono::steady_clock::now(), std::chrono::seconds(1)));
+      gauge.Expired(std::chrono::system_clock::now(), std::chrono::seconds(1)));
 }
 
 TEST(GaugeTest, increment_expired) {
   Gauge gauge;
   gauge.Increment();
   std::this_thread::sleep_for(std::chrono::seconds(1));
   EXPECT_TRUE(
-      gauge.Expired(std::chrono::steady_clock::now(), std::chrono::seconds(1)));
+      gauge.Expired(std::chrono::system_clock::now(), std::chrono::seconds(1)));
 }
 
 TEST(GaugeTest, increment_not_expired) {
   Gauge gauge;
   gauge.Increment();
   EXPECT_FALSE(
-      gauge.Expired(std::chrono::steady_clock::now(), std::chrono::seconds(1)));
+      gauge.Expired(std::chrono::system_clock::now(), std::chrono::seconds(1)));
 }
 
 }  // namespace
diff --git a/core/tests/histogram_test.cc b/core/tests/histogram_test.cc
@@ -132,7 +132,7 @@ TEST(HistogramTest, not_expired) {
   Histogram histogram{{1}};
   histogram.Observe(0);
   std::this_thread::sleep_for(std::chrono::seconds(1));
-  EXPECT_FALSE(histogram.Expired(std::chrono::steady_clock::now(),
+  EXPECT_FALSE(histogram.Expired(std::chrono::system_clock::now(),
                                  std::chrono::seconds(1)));
 }
 
diff --git a/core/tests/summary_test.cc b/core/tests/summary_test.cc
@@ -105,7 +105,7 @@ TEST(SummaryTest, not_expired) {
   Summary summary{Summary::Quantiles{{0.5, 0.05}}};
   summary.Observe(0);
   std::this_thread::sleep_for(std::chrono::seconds(1));
-  EXPECT_FALSE(summary.Expired(std::chrono::steady_clock::now(),
+  EXPECT_FALSE(summary.Expired(std::chrono::system_clock::now(),
                                std::chrono::seconds(1)));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ ClientMetric Counter::Collect() const {`
`19`	`19`	`return metric;`
`20`	`20`	`}`
`21`	`21`
`22`		`-bool Counter::Expired(const std::chrono::steady_clock::time_point& time,`
	`22`	`+bool Counter::Expired(const std::chrono::system_clock::time_point& time,`
`23`	`23`	`const std::chrono::seconds& ttl) {`
`24`	`24`	`(void)time;`
`25`	`25`	`(void)ttl;`