Skip to content

[BUILD] Upgrade to rapidyaml 0.10.0 #3906

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

Open
marcalff wants to merge 6 commits into
base: main
Choose a base branch
from
+18 −8
Open

[BUILD] Upgrade to rapidyaml 0.10.0 #3906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7297966
[BUILD] Upgrade to rapidyaml 0.10.0
marcalff Mar 5, 2026
0394f9c
Changelog
marcalff Mar 5, 2026
e4ea353
install tests
marcalff Mar 5, 2026
a32bb21
Fix support for rapidyaml 0.9.0 for conan build
marcalff Mar 5, 2026
de55995
format
marcalff Mar 5, 2026
2fb48bd
iwyu
marcalff Mar 5, 2026
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 @@ -33,6 +33,9 @@ Increment the:
* [CONFIGURATION] File configuration - spec stability
[#3862](https://github.com/open-telemetry/opentelemetry-cpp/pull/3862)

* [BUILD] Upgrade to rapidyaml 0.10.0
[#3906](https://github.com/open-telemetry/opentelemetry-cpp/pull/3906)

Important changes:

* [BUILD] Revisit EventLogger deprecation
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_o
bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "prometheus-cpp", version = "1.3.0.bcr.2", repo_name = "com_github_jupp0r_prometheus_cpp")
bazel_dep(name = "protobuf", version = "32.0", repo_name = "com_google_protobuf")
bazel_dep(name = "rapidyaml", version = "0.9.0")
bazel_dep(name = "rapidyaml", version = "0.10.0")
bazel_dep(name = "rules_cc", version = "0.2.17")
bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
bazel_dep(name = "rules_proto", version = "7.1.0")
Expand Down
2 changes: 1 addition & 1 deletion install/cmake/third_party_latest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ nlohmann-json=v3.12.0
opentelemetry-proto=v1.8.0
opentracing-cpp=v1.6.0
prometheus-cpp=v1.3.0
ryml=v0.9.0
ryml=v0.10.0
2 changes: 1 addition & 1 deletion install/cmake/third_party_stable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ nlohmann-json=v3.11.3
opentelemetry-proto=v1.6.0
opentracing-cpp=v1.6.0
prometheus-cpp=v1.3.0
ryml=v0.9.0
ryml=v0.10.0
15 changes: 11 additions & 4 deletions sdk/src/configuration/ryml_document.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

#include <stddef.h>
#include <c4/yml/version.hpp>
#include <exception>
#include <memory>
#include <ostream>
Expand Down Expand Up @@ -98,11 +99,17 @@ std::unique_ptr<DocumentNode> RymlDocument::GetRootNode()
DocumentNodeLocation RymlDocument::Location(ryml::ConstNodeRef node) const
{
DocumentNodeLocation loc;
#if RYML_VERSION_MINOR >= 10
// Starting with rapidyaml 0.10.0
auto ryml_loc = node.location(*parser_);
#else
// Up to rapidyaml 0.9.0
auto ryml_loc = parser_->location(node);
loc.offset = ryml_loc.offset;
loc.line = ryml_loc.line;
loc.col = ryml_loc.col;
loc.filename = std::string(ryml_loc.name.str, ryml_loc.name.len);
#endif
loc.offset = ryml_loc.offset;
loc.line = ryml_loc.line;
loc.col = ryml_loc.col;
loc.filename = std::string(ryml_loc.name.str, ryml_loc.name.len);

return loc;
}
Expand Down
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 @@ -25,5 +25,5 @@ nlohmann-json=v3.12.0
opentelemetry-proto=v1.8.0
opentracing-cpp=v1.6.0
prometheus-cpp=v1.3.0
ryml=v0.9.0
ryml=v0.10.0
vcpkg=2024.02.14
Loading