Merge fffb05fbed into 63007cfa39

deps/Makefile

@@ -329,7 +329,7 @@ prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
 	cd prometheus-cpp && tar --strip-components=1 -zxf civetweb-*.tar.gz -C prometheus-cpp/3rdparty/civetweb
 	cd prometheus-cpp/prometheus-cpp && patch -p1 < ../serial_exposer.patch
 	cd prometheus-cpp/prometheus-cpp && patch -p1 < ../registry_counters_reset.patch
-	cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch
+#	cd prometheus-cpp/prometheus-cpp && patch -p1 < ../fix_old_distros.patch
 	cd prometheus-cpp/prometheus-cpp && cmake . -DBUILD_SHARED_LIBS=OFF -DENABLE_TESTING=OFF -DENABLE_PUSH=OFF
 	cd prometheus-cpp/prometheus-cpp && CC=${CC} CXX=${CXX} ${MAKE}
 

deps/prometheus-cpp/prometheus-cpp

@@ -1 +1 @@
-prometheus-cpp-1.1.0
+prometheus-cpp-1.3.0

deps/prometheus-cpp/registry_counters_reset.patch

@@ -1,25 +1,8 @@
-diff --git a/core/include/prometheus/counter.h b/core/include/prometheus/counter.h
-index 9b2ad19..4fa1fba 100644
---- a/core/include/prometheus/counter.h
-+++ b/core/include/prometheus/counter.h
-@@ -46,6 +46,12 @@ class PROMETHEUS_CPP_CORE_EXPORT Counter {
-   /// Collect is called by the Registry when collecting metrics.
-   ClientMetric Collect() const;
- 
-+  /// \brief Reset this counter metric to a value of 'zero'.
-+  ///
-+  /// This function shall only be used in case of 'PROXYSQL STOP' operation
-+  /// which invalidates all ProxySQL internal counters for a fresh start.
-+  void Reset();
-+
-  private:
-   Gauge gauge_{0.0};
- };
 diff --git a/core/include/prometheus/family.h b/core/include/prometheus/family.h
 index 0bc0723..4f62fda 100644
 --- a/core/include/prometheus/family.h
 +++ b/core/include/prometheus/family.h
-@@ -141,6 +141,12 @@ class PROMETHEUS_CPP_CORE_EXPORT Family : public Collectable {
+@@ -142,6 +142,12 @@ class PROMETHEUS_CPP_CORE_EXPORT Family : public Collectable {
    /// \return Zero or more samples for each dimensional data.
    std::vector<MetricFamily> Collect() const override;
  
@@ -49,24 +32,11 @@ index 6603f6c..877c085 100644
   private:
    template <typename T>
    friend class detail::Builder;
-diff --git a/core/src/counter.cc b/core/src/counter.cc
-index 2a93463..a12885d 100644
---- a/core/src/counter.cc
-+++ b/core/src/counter.cc
-@@ -13,6 +13,8 @@ void Counter::Increment(const double val) {
- 
- double Counter::Value() const { return gauge_.Value(); }
- 
-+void Counter::Reset() { gauge_.Set(0.0); }
-+
- ClientMetric Counter::Collect() const {
-   ClientMetric metric;
-   metric.counter.value = Value();
 diff --git a/core/src/family.cc b/core/src/family.cc
 index f087586..8f9d276 100644
 --- a/core/src/family.cc
 +++ b/core/src/family.cc
-@@ -122,6 +122,19 @@ ClientMetric Family<T>::CollectMetric(const Labels& metric_labels,
+@@ -121,6 +121,19 @@ ClientMetric Family<T>::CollectMetric(const Labels& metric_labels,
    return collected;
  }
  

deps/prometheus-cpp/serial_exposer.patch

@@ -52,7 +52,7 @@ index 38a28e0..0d62bf3 100644
  
  #include <algorithm>
  #include <iterator>
-@@ -63,4 +64,28 @@ detail::Endpoint& Exposer::GetEndpointForUri(const std::string& uri) {
+@@ -64,4 +65,28 @@ detail::Endpoint& Exposer::GetEndpointForUri(const std::string& uri) {
    return *endpoints_.back().get();
  }
  
@@ -85,7 +85,7 @@ diff --git a/pull/src/handler.cc b/pull/src/handler.cc
 index 5a55001..b6ffa85 100644
 --- a/pull/src/handler.cc
 +++ b/pull/src/handler.cc
-@@ -172,5 +172,124 @@ void MetricsHandler::CleanupStalePointers(
+@@ -178,5 +178,124 @@ void MetricsHandler::CleanupStalePointers(
                       }),
        std::end(collectables));
  }