fix dynamic summary.

fix missed argument

Author: qicosmos

include/ylt/metric/summary.hpp

@@ -149,10 +149,10 @@ class basic_dynamic_summary
       dynamic_metric_impl<ylt::metric::detail::summary_impl<uint32_t>, N>;
 
  public:
-  basic_dynamic_summary(
-      std::string name, std::string help, std::vector<double> quantiles,
-      std::array<std::string, N> labels_name,
-      std::chrono::milliseconds max_age = std::chrono::seconds{60})
+  basic_dynamic_summary(std::string name, std::string help,
+                        std::vector<double> quantiles,
+                        std::array<std::string, N> labels_name,
+                        std::chrono::seconds max_age = std::chrono::seconds{60})
       : Base(MetricType::Summary, std::move(name), std::move(help),
              std::move(labels_name)),
         quantiles_(std::move(quantiles)),
@@ -162,33 +162,35 @@ class basic_dynamic_summary
   }
 
   void observe(const std::array<std::string, N>& labels_value, float value) {
-    Base::try_emplace(labels_value, quantiles_).first->value.insert(value);
+    has_refreshed_.store(true, std::memory_order_relaxed);
+    Base::try_emplace(labels_value, quantiles_, max_age_)
+        .first->value.insert(value);
   }
 
   std::vector<float> get_rates(const std::array<std::string, N>& labels_value) {
     double sum;
     uint64_t count;
-    return Base::try_emplace(labels_value, quantiles_)
+    return Base::try_emplace(labels_value, quantiles_, max_age_)
         .first->value.get_rates(sum, count);
   }
 
   std::vector<float> get_rates(const std::array<std::string, N>& labels_value,
                                uint64_t& count) {
     double sum;
-    return Base::try_emplace(labels_value, quantiles_)
+    return Base::try_emplace(labels_value, quantiles_, max_age_)
         .first->value.get_rates(sum, count);
   }
 
   std::vector<float> get_rates(const std::array<std::string, N>& labels_value,
                                double& sum) {
     uint64_t count;
-    return Base::try_emplace(labels_value, quantiles_)
+    return Base::try_emplace(labels_value, quantiles_, max_age_)
         .first->value.get_rates(sum, count);
   }
 
   std::vector<float> get_rates(const std::array<std::string, N>& labels_value,
                                double& sum, uint64_t& count) {
-    return Base::try_emplace(labels_value, quantiles_)
+    return Base::try_emplace(labels_value, quantiles_, max_age_)
         .first->value.stat(sum, count);
   }
 
@@ -238,8 +240,9 @@ class basic_dynamic_summary
       double sum = 0;
       uint64_t count = 0;
       auto rates = summary_value.stat(sum, count);
-      if (count == 0)
+      if (count == 0 && !has_refreshed_.load(std::memory_order_relaxed)) {
         continue;
+      }
       summary.metrics.emplace_back();
       json_summary_metric_t& metric = summary.metrics.back();
       metric.count = count;
@@ -254,7 +257,8 @@ class basic_dynamic_summary
 
  private:
   std::vector<double> quantiles_;
-  std::chrono::milliseconds max_age_;
+  std::chrono::seconds max_age_;
+  std::atomic<bool> has_refreshed_;
 };
 
 using dynamic_summary_1 = basic_dynamic_summary<1>;

include/ylt/metric/summary_impl.hpp

@@ -333,8 +333,7 @@ class summary_impl {
     return result;
   }
 
-  summary_impl(std::vector<double>& rate,
-               std::chrono::seconds refresh_time = std::chrono::seconds{0})
+  summary_impl(std::vector<double>& rate, std::chrono::seconds refresh_time)
       : rate_(rate),
         refresh_time_(refresh_time.count() * 1000 / 2),
         tp_(std::chrono::steady_clock::now().time_since_epoch().count()){};

src/metric/tests/test_metric.cpp

@@ -14,6 +14,55 @@ struct metrc_tag {};
 
 struct test_tag {};
 
+TEST_CASE("summary test zero") {
+  std::map<std::string, std::string> customMap = {};
+  summary_t summary{"test_summary",
+                    "summary help",
+                    {0.5, 0.9, 0.95, 0.99},
+                    customMap,
+                    std::chrono::seconds(2)};
+  summary.observe(1);
+  std::string str;
+  summary.serialize_to_json(str);
+
+  basic_dynamic_summary<2> dy_summary(
+      std::string("test_summary"), std::string("summary help"),
+      std::vector<double>{0.5, 0.9, 0.95, 0.99},
+      std::array<std::string, 2>{"method", "url"}, std::chrono::seconds(1));
+  dy_summary.observe({"GET", "test"}, 10);
+  std::string str2;
+  dy_summary.serialize_to_json(str2);
+
+  std::cout << str << "\n";
+  std::cout << str2 << "\n";
+  double sum{};
+  uint64_t count{};
+  summary.get_rates(sum, count);
+  CHECK(sum > 0);
+  CHECK(count > 0);
+  sum = 0;
+  count = 0;
+  dy_summary.get_rates({"GET", "test"}, sum, count);
+  CHECK(sum > 0);
+  CHECK(count > 0);
+
+  std::this_thread::sleep_for(3s);
+
+  str.clear();
+  str2.clear();
+
+  summary.serialize_to_json(str);
+  dy_summary.serialize_to_json(str2);
+
+  std::cout << str << "\n";
+  std::cout << str2 << "\n";
+  sum = 0;
+  count = 0;
+  summary.get_rates(sum, count);
+  CHECK(sum == 0);
+  CHECK(count == 0);
+}
+
 TEST_CASE("serialize zero") {
   {
     std::string str;