Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EXPORTER] bump prometheus to v1.3.0 #3122

Merged
merged 7 commits into from
Nov 6, 2024
Merged

[EXPORTER] bump prometheus to v1.3.0 #3122

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a0fc98a
bump prometheus to v1.3.0
esigo Nov 5, 2024
2839ae5
chnagelog
esigo Nov 5, 2024
051f89a
Merge branch 'main' into bump-prometheus-1.3.0
esigo Nov 5, 2024
12fe684
Merge branch 'main' into bump-prometheus-1.3.0
marcalff Nov 6, 2024
42d4950
review comment
esigo Nov 6, 2024
a3150c8
Apply suggestions from code review
marcalff Nov 6, 2024
c35b593
Merge branch 'main' into bump-prometheus-1.3.0
ThomsonTan Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Important changes:
as the Jaeger propagator can be used without the (now removed)
Jaeger exporter.

* Upgrade to prometheus 1.3.0
[#3122](https://github.com/open-telemetry/opentelemetry-cpp/pull/3122)

## [1.17 2024-10-07]

* [CI] Add a clang-tidy build
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ def opentelemetry_cpp_deps():
maybe(
http_archive,
name = "com_github_jupp0r_prometheus_cpp",
sha256 = "48dbad454d314b836cc667ec4def93ec4a6e4255fc8387c20cacb3b8b6faee30",
strip_prefix = "prometheus-cpp-1.2.4",
sha256 = "ac6e958405a29fbbea9db70b00fa3c420e16ad32e1baf941ab233ba031dd72ee",
strip_prefix = "prometheus-cpp-1.3.0",
urls = [
"https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.2.4.tar.gz",
"https://github.com/jupp0r/prometheus-cpp/archive/refs/tags/v1.3.0.tar.gz",
],
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/prometheus-cpp
Open in desktop
Submodule prometheus-cpp updated 27 files
+5 −2 .bazelrc
+1 −1 .github/workflows/bazel-ci.yml
+3 −3 .github/workflows/cmake-ci.yml
+2 −2 .github/workflows/coverage.yml
+1 −1 .github/workflows/doxygen.yml
+2 −2 .github/workflows/linting.yml
+1 −1 .github/workflows/release.yml
+8 −2 CMakeLists.txt
+7 −11 MODULE.bazel
+423 −1,678 MODULE.bazel.lock
+22 −38 README.md
+3 −3 bazel/civetweb.BUILD
+1 −0 bazel/curl.bzl
+6 −15 bazel/repositories.bzl
+4 −0 cmake/project-import-cmake/CMakeLists.txt
+2 −2 cmake/prometheus-cpp-push.pc.in
+3 −3 core/CMakeLists.txt
+1 −13 pull/BUILD.bazel
+1 −4 pull/tests/unit/BUILD.bazel
+1 −1 push/CMakeLists.txt
+12 −1 push/include/prometheus/gateway.h
+11 −14 push/src/detail/curl_wrapper.cc
+4 −3 push/src/detail/curl_wrapper.h
+53 −11 push/src/gateway.cc
+1 −4 push/tests/internal/BUILD.bazel
+1 −7 util/BUILD.bazel
+1 −4 util/tests/unit/BUILD.bazel
2 changes: 1 addition & 1 deletion third_party_release
View file
Open in desktop
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.3.2
opentracing-cpp=v1.6.0
prometheus-cpp=v1.2.4
prometheus-cpp=v1.3.0
vcpkg=2024.02.14