From 61ec0083a3e8ab2392feef3c03f338e659ca4090 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Mon, 26 May 2025 16:45:35 +0200 Subject: [PATCH 1/2] Upgrade to opentelemetry-proto 1.7.0 --- CHANGELOG.md | 3 +++ MODULE.bazel | 2 +- bazel/repository.bzl | 6 +++--- cmake/opentelemetry-proto.cmake | 2 +- third_party/opentelemetry-proto | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 741642377b..dcc0c6cead 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,6 +64,9 @@ Increment the: * [EXPORTER] ostream log exporter, fixed memory ownership issues [#3417](https://github.com/open-telemetry/opentelemetry-cpp/pull/3417) +* [BUILD] Upgrade opentelemetry-proto to 1.7.0 + [#XXXX](https://github.com/open-telemetry/opentelemetry-cpp/pull/XXXX) + Important changes: * [EXPORTER] ostream log exporter, fixed memory ownership issues diff --git a/MODULE.bazel b/MODULE.bazel index e01fcbaf17..185350481d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -13,7 +13,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "curl", version = "8.8.0") bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc") bazel_dep(name = "nlohmann_json", version = "3.12.0", repo_name = "github_nlohmann_json") -bazel_dep(name = "opentelemetry-proto", version = "1.6.0", repo_name = "com_github_opentelemetry_proto") +bazel_dep(name = "opentelemetry-proto", version = "1.7.0", repo_name = "com_github_opentelemetry_proto") bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing") bazel_dep(name = "platforms", version = "0.0.8") bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp") diff --git a/bazel/repository.bzl b/bazel/repository.bzl index 0656331708..bea604cbba 100644 --- a/bazel/repository.bzl +++ b/bazel/repository.bzl @@ -88,10 +88,10 @@ def opentelemetry_cpp_deps(): http_archive, name = "com_github_opentelemetry_proto", build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD", - sha256 = "92682778affe8d00cd36f68308b49295db34fce379bef0a781c50837eccbc3c0", - strip_prefix = "opentelemetry-proto-1.6.0", + sha256 = "11330d850f5e24d34c4246bc8cb21fcd311e7565d219195713455a576bb11bed", + strip_prefix = "opentelemetry-proto-1.7.0", urls = [ - "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.6.0.tar.gz", + "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.7.0.tar.gz", ], ) diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake index 60b3472845..5aad69495b 100644 --- a/cmake/opentelemetry-proto.cmake +++ b/cmake/opentelemetry-proto.cmake @@ -49,7 +49,7 @@ else() "opentelemetry-proto=[ \\t]*([A-Za-z0-9_\\.\\-]+)") set(opentelemetry-proto "${CMAKE_MATCH_1}") else() - set(opentelemetry-proto "v1.6.0") + set(opentelemetry-proto "v1.7.0") endif() unset(OTELCPP_THIRD_PARTY_RELEASE_CONTENT) endif() diff --git a/third_party/opentelemetry-proto b/third_party/opentelemetry-proto index be5d584704..8654ab7a5a 160000 --- a/third_party/opentelemetry-proto +++ b/third_party/opentelemetry-proto @@ -1 +1 @@ -Subproject commit be5d58470429d0255ffdd49491f0815a3a63d6ef +Subproject commit 8654ab7a5a43ca25fe8046e59dcd6935c3f76de0 From 6996342f6a674417b743876c8f3db982199d48f6 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Tue, 10 Jun 2025 08:39:00 +0200 Subject: [PATCH 2/2] cleanup --- third_party_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party_release b/third_party_release index 8761dc9338..ace5c74cd2 100644 --- a/third_party_release +++ b/third_party_release @@ -19,7 +19,7 @@ benchmark=v1.8.3 googletest=1.14.0 ms-gsl=v3.1.0-67-g6f45293 nlohmann-json=v3.12.0 -opentelemetry-proto=v1.6.0 +opentelemetry-proto=v1.7.0 opentracing-cpp=v1.6.0 prometheus-cpp=v1.3.0 vcpkg=2024.02.14