Skip to content

Commit

Permalink
chore(thirdparty): Bump prometheus-cpp to 1.2.4 (#1966)
Browse files Browse the repository at this point in the history
#1965

After this patch, we can use CheckMetricName() and CheckLabelName() to check metric
names and labels when register metrics.
  • Loading branch information
acelyc111 authored Apr 7, 2024
1 parent f5e1b81 commit bcb92f0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 31 deletions.
1 change: 0 additions & 1 deletion .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
24 changes: 4 additions & 20 deletions thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
10 changes: 0 additions & 10 deletions thirdparty/fix_prometheus-cpp_limits.patch

This file was deleted.

0 comments on commit bcb92f0

Please sign in to comment.