This is an automated email from the ASF dual-hosted git repository.
laiyingchun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new bcb92f0fd chore(thirdparty): Bump prometheus-cpp to 1.2.4 (#1966)
bcb92f0fd is described below
commit bcb92f0fd30374d691d1cc5535ca0bf5ae671988
Author: Yingchun Lai <[email protected]>
AuthorDate: Sun Apr 7 21:24:01 2024 +0800
chore(thirdparty): Bump prometheus-cpp to 1.2.4 (#1966)
https://github.com/apache/incubator-pegasus/issues/1965
After this patch, we can use CheckMetricName() and CheckLabelName() to
check metric
names and labels when register metrics.
---
.licenserc.yaml | 1 -
thirdparty/CMakeLists.txt | 24 ++++--------------------
thirdparty/fix_prometheus-cpp_limits.patch | 10 ----------
3 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 9f7aa61c2..3a15f3201 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -69,7 +69,6 @@ header:
# Used for patches for thirdparties.
- 'thirdparty/fix_jemalloc_for_m1_on_macos.patch'
- 'thirdparty/fix_libevent_for_macos.patch'
- - 'thirdparty/fix_prometheus-cpp_limits.patch'
- 'thirdparty/fix_rocksdb-cmake-PORTABLE-option.patch'
- 'thirdparty/fix_snappy-Wsign-compare-warning.patch'
- 'thirdparty/fix_s2_build_with_absl_and_gtest.patch'
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index da917323c..26a8ae089 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -233,20 +233,6 @@ ExternalProject_Add(fmt
DOWNLOAD_NO_PROGRESS true
)
-# civetweb is one of the dependencies of promemetheus-cpp, do not build &
install
-ExternalProject_Add(civetweb
- URL ${OSS_URL_PREFIX}/civetweb-1.11.tar.gz
- https://codeload.github.com/civetweb/civetweb/tar.gz/v1.11
- URL_MD5 b6d2175650a27924bccb747cbe084cd4
- CONFIGURE_COMMAND ""
- BUILD_COMMAND ""
- INSTALL_COMMAND ""
- DOWNLOAD_EXTRACT_TIMESTAMP true
- DOWNLOAD_NO_PROGRESS true
-)
-ExternalProject_Get_property(civetweb SOURCE_DIR)
-set(civetweb_SRC ${SOURCE_DIR})
-
set(CURL_OPTIONS
--disable-dict
--disable-file
@@ -291,12 +277,10 @@ ExternalProject_Add(curl
)
ExternalProject_Add(prometheus-cpp
- URL ${OSS_URL_PREFIX}/prometheus-cpp-0.7.0.tar.gz
- https://codeload.github.com/jupp0r/prometheus-cpp/tar.gz/v0.7.0
- URL_MD5 dc75c31ceaefd160e978365bdca8eb01
- DEPENDS civetweb curl
- # TODO(yingchun): replace the submodule
- PATCH_COMMAND rm -rf 3rdparty/civetweb && cp -R ${civetweb_SRC}
3rdparty/civetweb && patch -p0 < ${TP_DIR}/fix_prometheus-cpp_limits.patch
+ URL ${OSS_URL_PREFIX}/prometheus-cpp-with-submodules-1.2.4.tar.gz
+
https://github.com/jupp0r/prometheus-cpp/releases/download/v1.2.4/prometheus-cpp-with-submodules.tar.gz
+ URL_MD5 cdb515e802aa9aaaf1f6dde1271a20a2
+ DEPENDS curl
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${TP_OUTPUT}
-DENABLE_TESTING=OFF
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
diff --git a/thirdparty/fix_prometheus-cpp_limits.patch
b/thirdparty/fix_prometheus-cpp_limits.patch
deleted file mode 100644
index 065b04f67..000000000
--- a/thirdparty/fix_prometheus-cpp_limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- core/src/histogram.cc 2023-02-13 13:56:03.678985601 +0800
-+++ core/src/histogram_fix_limits.cc 2023-02-13 13:55:55.303966447 +0800
-@@ -4,6 +4,7 @@
- #include <cassert>
- #include <iterator>
- #include <numeric>
-+#include <limits>
-
- namespace prometheus {
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
