From 364b860a3f54d6910cae60c582005e94d823548c Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 15 May 2025 04:29:56 +0200 Subject: [PATCH] [BUILD] Upgrade opentelemetry-proto to 1.6.0 (#3407) --- CHANGELOG.md | 3 +++ MODULE.bazel | 2 +- bazel/repository.bzl | 6 +++--- cmake/opentelemetry-proto.cmake | 2 +- third_party/opentelemetry-proto | 2 +- third_party_release | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 649e11043..ab2db27c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,9 @@ Increment the: [#3320](https://github.com/open-telemetry/opentelemetry-cpp/pull/3220) [#3368](https://github.com/open-telemetry/opentelemetry-cpp/pull/3368) +* [BUILD] Upgrade opentelemetry-proto to 1.6.0 + [#3407](https://github.com/open-telemetry/opentelemetry-cpp/pull/3407) + * [BUILD] Upgrade nlohmann_json to 3.12.0 [#3406](https://github.com/open-telemetry/opentelemetry-cpp/pull/3406) diff --git a/MODULE.bazel b/MODULE.bazel index 70f22d017..e01fcbaf1 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.5.0", repo_name = "com_github_opentelemetry_proto") +bazel_dep(name = "opentelemetry-proto", version = "1.6.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 e0424c665..065633170 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 = "08f40636adbc5f33d2084bd8e7b64e491dd0239d1a95021dbffbdf1ca8cea454", - strip_prefix = "opentelemetry-proto-1.5.0", + sha256 = "92682778affe8d00cd36f68308b49295db34fce379bef0a781c50837eccbc3c0", + strip_prefix = "opentelemetry-proto-1.6.0", urls = [ - "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.5.0.tar.gz", + "https://github.com/open-telemetry/opentelemetry-proto/archive/v1.6.0.tar.gz", ], ) diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake index 67e54149d..246a41e5d 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.5.0") + set(opentelemetry-proto "v1.6.0") endif() unset(OTELCPP_THIRD_PARTY_RELEASE_CONTENT) endif() diff --git a/third_party/opentelemetry-proto b/third_party/opentelemetry-proto index 2bd940b2b..be5d58470 160000 --- a/third_party/opentelemetry-proto +++ b/third_party/opentelemetry-proto @@ -1 +1 @@ -Subproject commit 2bd940b2b77c1ab57c27166af21384906da7bb2b +Subproject commit be5d58470429d0255ffdd49491f0815a3a63d6ef diff --git a/third_party_release b/third_party_release index b3561a9a4..8761dc933 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.5.0 +opentelemetry-proto=v1.6.0 opentracing-cpp=v1.6.0 prometheus-cpp=v1.3.0 vcpkg=2024.02.14