Merge e885e62 into ddf7083

core/benchmarks/histogram_bench.cc

@@ -1,6 +1,7 @@
 #include <benchmark/benchmark.h>
 
 #include <chrono>
+#include <cstdint>
 #include <random>
 #include <string>
 #include <vector>
@@ -11,8 +12,9 @@
 
 using prometheus::Histogram;
 
-static Histogram::BucketBoundaries CreateLinearBuckets(double start, double end,
-                                                       double step) {
+static Histogram::BucketBoundaries CreateLinearBuckets(std::int64_t start,
+                                                       std::int64_t end,
+                                                       std::int64_t step) {
   auto bucket_boundaries = Histogram::BucketBoundaries{};
   for (auto i = start; i < end; i += step) {
     bucket_boundaries.push_back(i);

core/include/prometheus/registry.h

@@ -61,8 +61,20 @@ class PROMETHEUS_CPP_CORE_EXPORT Registry : public Collectable {
   /// \param insert_behavior How to handle families with the same name.
   explicit Registry(InsertBehavior insert_behavior = InsertBehavior::Merge);
 
+  /// \brief Deleted copy constructor.
+  Registry(const Registry&) = delete;
+
+  /// \brief Deleted copy assignment.
+  Registry& operator=(const Registry&) = delete;
+
+  /// \brief Deleted move constructor.
+  Registry(Registry&&) = delete;
+
+  /// \brief Deleted move assignment.
+  Registry& operator=(Registry&&) = delete;
+
   /// \brief name Destroys a registry.
-  ~Registry();
+  ~Registry() override;
 
   /// \brief Returns a list of metrics and their samples.
   ///

core/tests/raii_locale.h

@@ -10,6 +10,11 @@ class RAIILocale {
 
   ~RAIILocale() { std::locale::global(savedLocale_); }
 
+  RAIILocale(const RAIILocale&) = delete;
+  RAIILocale(RAIILocale&&) = delete;
+  RAIILocale& operator=(const RAIILocale&) = delete;
+  RAIILocale& operator=(RAIILocale&&) = delete;
+
  private:
   const std::locale savedLocale_;
 };

core/tests/summary_test.cc

@@ -75,7 +75,7 @@ TEST(SummaryTest, max_age) {
                   2};
   summary.Observe(8.0);
 
-  static const auto test_value = [&summary](double ref) {
+  const auto test_value = [&summary](double ref) {
     auto metric = summary.Collect();
     auto s = metric.summary;
     ASSERT_EQ(s.quantile.size(), 1U);

pull/include/prometheus/exposer.h

@@ -26,6 +26,12 @@ class PROMETHEUS_CPP_PULL_EXPORT Exposer {
   explicit Exposer(std::vector<std::string> options,
                    const CivetCallbacks* callbacks = nullptr);
   ~Exposer();
+
+  Exposer(const Exposer&) = delete;
+  Exposer(Exposer&&) = delete;
+  Exposer& operator=(const Exposer&) = delete;
+  Exposer& operator=(Exposer&&) = delete;
+
   void RegisterCollectable(const std::weak_ptr<Collectable>& collectable,
                            const std::string& uri = std::string("/metrics"));
 

pull/src/endpoint.h

@@ -18,6 +18,11 @@ class Endpoint {
   explicit Endpoint(CivetServer& server, std::string uri);
   ~Endpoint();
 
+  Endpoint(const Endpoint&) = delete;
+  Endpoint(Endpoint&&) = delete;
+  Endpoint& operator=(const Endpoint&) = delete;
+  Endpoint& operator=(Endpoint&&) = delete;
+
   void RegisterCollectable(const std::weak_ptr<Collectable>& collectable);
   void RegisterAuth(
       std::function<bool(const std::string&, const std::string&)> authCB,