Skip to content

Commit

Permalink
Upgrade to prometheus 1.2.4 (open-telemetry#2598)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalff authored Mar 22, 2024
1 parent d24839e commit f2f0738
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
6 changes: 3 additions & 3 deletions bazel/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ def opentelemetry_cpp_deps():
maybe(
http_archive,
name = "com_github_jupp0r_prometheus_cpp",
sha256 = "397544fe91e183029120b4eebcfab24ed9ec833d15850aae78fd5db19062d13a",
strip_prefix = "prometheus-cpp-1.1.0",
sha256 = "48dbad454d314b836cc667ec4def93ec4a6e4255fc8387c20cacb3b8b6faee30",
strip_prefix = "prometheus-cpp-1.2.4",
urls = [
"https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.1.0.tar.gz",
"https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.2.4.tar.gz",
],
)

Expand Down
6 changes: 5 additions & 1 deletion exporters/prometheus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@ endif()
if(TARGET core)
list(APPEND PROMETHEUS_EXPORTER_TARGETS core)
endif()
if(TARGET util)
list(APPEND PROMETHEUS_EXPORTER_TARGETS util)
endif()
target_link_libraries(
opentelemetry_exporter_prometheus
PUBLIC opentelemetry_metrics prometheus-cpp::pull prometheus-cpp::core)
PUBLIC opentelemetry_metrics prometheus-cpp::pull prometheus-cpp::core
prometheus-cpp::util)

if(OPENTELEMETRY_INSTALL)
install(
Expand Down
2 changes: 1 addition & 1 deletion third_party/prometheus-cpp
Submodule prometheus-cpp updated 66 files
+4 −0 .github/renovate.json5
+11 −20 .github/workflows/bazel-ci.yml
+3 −3 .github/workflows/cmake-ci.yml
+3 −8 .github/workflows/linting.yml
+1 −1 3rdparty/civetweb
+4 −3 CMakeLists.txt
+19 −0 MODULE.bazel
+1,851 −0 MODULE.bazel.lock
+6 −7 README.md
+2 −0 WORKSPACE.bzlmod
+8 −6 bazel/civetweb.BUILD
+7 −19 bazel/curl.BUILD
+5 −24 bazel/curl.bzl
+38 −27 bazel/repositories.bzl
+7 −1 bazel/zlib.BUILD
+1 −1 cmake/project-import-cmake/CMakeLists.txt
+2 −2 cmake/project-import-pkgconfig/CMakeLists.txt
+1 −1 core/CMakeLists.txt
+1 −1 core/benchmarks/histogram_bench.cc
+4 −4 core/include/prometheus/client_metric.h
+3 −0 core/include/prometheus/counter.h
+16 −0 core/include/prometheus/detail/future_std.h
+2 −1 core/include/prometheus/family.h
+6 −0 core/include/prometheus/histogram.h
+3 −0 core/include/prometheus/labels.h
+2 −0 core/src/counter.cc
+0 −1 core/src/family.cc
+6 −1 core/src/gauge.cc
+8 −0 core/src/histogram.cc
+11 −17 core/src/registry.cc
+3 −0 core/tests/check_label_name_test.cc
+3 −0 core/tests/check_metric_name_test.cc
+10 −0 core/tests/counter_test.cc
+9 −6 core/tests/family_test.cc
+20 −0 core/tests/histogram_test.cc
+2 −1 core/tests/serializer_test.cc
+2 −1 pull/BUILD.bazel
+2 −3 pull/CMakeLists.txt
+1 −1 pull/src/basic_auth.cc
+5 −14 pull/src/endpoint.cc
+4 −3 pull/src/exposer.cc
+6 −0 pull/src/handler.cc
+0 −1 pull/tests/CMakeLists.txt
+101 −44 pull/tests/integration/integration_test.cc
+0 −14 pull/tests/internal/CMakeLists.txt
+0 −47 pull/tests/internal/base64_test.cc
+14 −0 push/BUILD.bazel
+12 −3 push/CMakeLists.txt
+4 −1 push/include/prometheus/gateway.h
+3 −1 push/src/detail/curl_wrapper.cc
+1 −1 push/src/detail/curl_wrapper.h
+42 −0 push/src/detail/label_encoder.cc
+14 −0 push/src/detail/label_encoder.h
+18 −11 push/src/gateway.cc
+1 −0 push/tests/CMakeLists.txt
+1 −0 push/tests/integration/CMakeLists.txt
+1 −1 push/tests/internal/BUILD.bazel
+14 −0 push/tests/internal/CMakeLists.txt
+43 −0 push/tests/internal/label_encoder_test.cc
+12 −0 util/BUILD.bazel
+25 −0 util/CMakeLists.txt
+54 −3 util/include/prometheus/detail/base64.h
+1 −0 util/tests/CMakeLists.txt
+13 −0 util/tests/unit/BUILD.bazel
+15 −0 util/tests/unit/CMakeLists.txt
+78 −0 util/tests/unit/base64_test.cc
2 changes: 1 addition & 1 deletion third_party_release
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ ms-gsl=v3.1.0-67-g6f45293
nlohmann-json=v3.11.3
opentelemetry-proto=v1.1.0
opentracing-cpp=v1.6.0
prometheus-cpp=v1.1.0
prometheus-cpp=v1.2.4
vcpkg=2024.02.14

0 comments on commit f2f0738

Please sign in to comment.