open-telemetry
/
opentelemetry-cpp
mirror of https://github.com/open-telemetry/opentelemetry-cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUILD] Upgrade opentelemetry-proto to 1.6.0 (#3407)

This commit is contained in:
Marc Alff 2025-05-15 04:29:56 +02:00 committed by GitHub
parent cacfe443bb
commit 364b860a3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -46,6 +46,9 @@ Increment the:
[#3320](https://github.com/open-telemetry/opentelemetry-cpp/pull/3220) [#3320](https://github.com/open-telemetry/opentelemetry-cpp/pull/3220)
[#3368](https://github.com/open-telemetry/opentelemetry-cpp/pull/3368) [#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 * [BUILD] Upgrade nlohmann_json to 3.12.0
[#3406](https://github.com/open-telemetry/opentelemetry-cpp/pull/3406) [#3406](https://github.com/open-telemetry/opentelemetry-cpp/pull/3406)

2
MODULE.bazel
View File

@ -13,7 +13,7 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "curl", version = "8.8.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 = "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 = "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 = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
bazel_dep(name = "platforms", version = "0.0.8") bazel_dep(name = "platforms", version = "0.0.8")
bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp") bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")

6
bazel/repository.bzl
View File

@ -88,10 +88,10 @@ def opentelemetry_cpp_deps():
http_archive, http_archive,
name = "com_github_opentelemetry_proto", name = "com_github_opentelemetry_proto",
build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD", build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
sha256 = "08f40636adbc5f33d2084bd8e7b64e491dd0239d1a95021dbffbdf1ca8cea454", sha256 = "92682778affe8d00cd36f68308b49295db34fce379bef0a781c50837eccbc3c0",
strip_prefix = "opentelemetry-proto-1.5.0", strip_prefix = "opentelemetry-proto-1.6.0",
urls = [ 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",
], ],
) )

2
cmake/opentelemetry-proto.cmake
View File

@ -49,7 +49,7 @@ else()
"opentelemetry-proto=[ \\t]*([A-Za-z0-9_\\.\\-]+)") "opentelemetry-proto=[ \\t]*([A-Za-z0-9_\\.\\-]+)")
set(opentelemetry-proto "${CMAKE_MATCH_1}") set(opentelemetry-proto "${CMAKE_MATCH_1}")
else() else()
set(opentelemetry-proto "v1.5.0") set(opentelemetry-proto "v1.6.0")
endif() endif()
unset(OTELCPP_THIRD_PARTY_RELEASE_CONTENT) unset(OTELCPP_THIRD_PARTY_RELEASE_CONTENT)
endif() endif()

2
third_party/opentelemetry-proto vendored

@ -1 +1 @@
Subproject commit 2bd940b2b77c1ab57c27166af21384906da7bb2b Subproject commit be5d58470429d0255ffdd49491f0815a3a63d6ef

2
third_party_release
View File

@ -19,7 +19,7 @@ benchmark=v1.8.3
googletest=1.14.0 googletest=1.14.0
ms-gsl=v3.1.0-67-g6f45293 ms-gsl=v3.1.0-67-g6f45293
nlohmann-json=v3.12.0 nlohmann-json=v3.12.0
opentelemetry-proto=v1.5.0 opentelemetry-proto=v1.6.0
opentracing-cpp=v1.6.0 opentracing-cpp=v1.6.0
prometheus-cpp=v1.3.0 prometheus-cpp=v1.3.0
vcpkg=2024.02.14 vcpkg=2024.02.14