Merge 55191f5 into d2c9d38

jupp0r · Mar 29, 2022 · 026f9dd · 026f9dd
2 parents d2c9d38 + 55191f5
commit 026f9dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/core/src/histogram.cc b/core/src/histogram.cc
@@ -1,8 +1,8 @@
 #include "prometheus/histogram.h"
 
 #include <algorithm>
-#include <cassert>
 #include <cstddef>
+#include <functional>
 #include <iterator>
 #include <limits>
 #include <memory>
@@ -13,8 +13,10 @@ namespace prometheus {
 
 Histogram::Histogram(const BucketBoundaries& buckets)
     : bucket_boundaries_{buckets}, bucket_counts_{buckets.size() + 1}, sum_{} {
-  assert(std::is_sorted(std::begin(bucket_boundaries_),
-                        std::end(bucket_boundaries_)));
+  if (!std::is_sorted(begin(bucket_boundaries_), end(bucket_boundaries_),
+                      std::less_equal<BucketBoundaries::value_type>())) {
+    throw std::invalid_argument("Bucket Boundaries must be incrementing");
+  }
 }
 
 void Histogram::Observe(const double value) {

diff --git a/core/tests/histogram_test.cc b/core/tests/histogram_test.cc
@@ -53,6 +53,14 @@ TEST(HistogramTest, bucket_bounds) {
             std::numeric_limits<double>::infinity());
 }
 
+TEST(HistogramTest, reject_unsorted_bucket_bounds) {
+  EXPECT_ANY_THROW(Histogram({2, 1}));
+}
+
+TEST(HistogramTest, reject_non_incrementing_bucket_bounds) {
+  EXPECT_ANY_THROW(Histogram({1, 2, 2, 3}));
+}
+
 TEST(HistogramTest, bucket_counts_not_reset_by_collection) {
   Histogram histogram{{1, 2}};
   histogram.Observe(1.5);