[BUILD] Upgrade to rapidyaml 0.12.1 (open-telemetry#4076)

Author: marcalff

CHANGELOG.md

@@ -104,6 +104,9 @@ Increment the:
 * [SEMANTIC CONVENTIONS] Upgrade to semantic conventions 1.41.1
   [#4075](https://github.com/open-telemetry/opentelemetry-cpp/pull/4075)
 
+* [BUILD] Upgrade to rapidyaml 0.12.1
+  [#4076](https://github.com/open-telemetry/opentelemetry-cpp/pull/4076)
+
 Important changes:
 
 * Enable WITH_OTLP_RETRY_PREVIEW by default

MODULE.bazel

@@ -18,7 +18,7 @@ bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_o
 bazel_dep(name = "platforms", version = "1.1.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.10.0")
+bazel_dep(name = "rapidyaml", version = "0.12.1")
 bazel_dep(name = "rules_cc", version = "0.2.18")
 bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
 bazel_dep(name = "rules_proto", version = "7.1.0")

install/cmake/third_party_latest

@@ -16,4 +16,4 @@ nlohmann-json=v3.12.0
 opentelemetry-proto=v1.10.0
 opentracing-cpp=v1.6.0
 prometheus-cpp=v1.3.0
-ryml=v0.10.0
+ryml=v0.12.1

sdk/include/opentelemetry/sdk/configuration/ryml_document.h

@@ -37,10 +37,6 @@ class RymlDocument : public Document
 
 private:
   static ryml::Callbacks MakeCallbacks();
-  [[noreturn]] static void OnError(const char *msg,
-                                   size_t msg_len,
-                                   ryml::Location location,
-                                   void *user_data);
 
   ryml::ParserOptions opts_;
   ryml::Parser::handler_type event_handler_;

sdk/src/configuration/ryml_document.cc

@@ -24,13 +24,52 @@ namespace sdk
 namespace configuration
 {
 
-// Custom ryml error callback that throws instead of calling abort().
-// This ensures the try-catch in ParseDocument works regardless of how
-// ryml was compiled (with or without RYML_DEFAULT_CALLBACK_USES_EXCEPTIONS).
-void RymlDocument::OnError(const char *msg,
-                           size_t msg_len,
-                           ryml::Location location,
-                           void * /*user_data*/)
+#if RYML_VERSION_MINOR >= 11
+[[noreturn]] static void OnErrorBasic(c4::csubstr msg,
+                                      const ryml::ErrorDataBasic &errdata,
+                                      void * /*user_data*/)
+{
+  DocumentNodeLocation loc;
+  loc.offset   = errdata.location.offset;
+  loc.line     = errdata.location.line;
+  loc.col      = errdata.location.col;
+  loc.filename = std::string(errdata.location.name.str, errdata.location.name.len);
+
+  throw InvalidSchemaException(loc, std::string(msg.str, msg.len));
+}
+
+[[noreturn]] static void OnErrorParse(c4::csubstr msg,
+                                      const ryml::ErrorDataParse &errdata,
+                                      void * /*user_data*/)
+{
+  DocumentNodeLocation loc;
+  loc.offset   = errdata.ymlloc.offset;
+  loc.line     = errdata.ymlloc.line;
+  loc.col      = errdata.ymlloc.col;
+  loc.filename = std::string(errdata.ymlloc.name.str, errdata.ymlloc.name.len);
+
+  throw InvalidSchemaException(loc, std::string(msg.str, msg.len));
+}
+
+[[noreturn]] static void OnErrorVisit(c4::csubstr msg,
+                                      const ryml::ErrorDataVisit &errdata,
+                                      void * /*user_data*/)
+{
+  DocumentNodeLocation loc;
+  loc.offset   = errdata.cpploc.offset;
+  loc.line     = errdata.cpploc.line;
+  loc.col      = errdata.cpploc.col;
+  loc.filename = std::string(errdata.cpploc.name.str, errdata.cpploc.name.len);
+
+  // If rapidyaml fails internally, we declare the yaml document invalid.
+  throw InvalidSchemaException(loc, std::string(msg.str, msg.len));
+}
+
+#else
+[[noreturn]] static void OnError(const char *msg,
+                                 size_t msg_len,
+                                 ryml::Location location,
+                                 void * /*user_data*/)
 {
   DocumentNodeLocation loc;
   loc.offset   = location.offset;
@@ -40,11 +79,23 @@ void RymlDocument::OnError(const char *msg,
 
   throw InvalidSchemaException(loc, std::string(msg, msg_len));
 }
+#endif
 
+// Custom ryml error callback that throws instead of calling abort().
+// This ensures the try-catch in ParseDocument works regardless of how
+// ryml was compiled (with or without RYML_DEFAULT_CALLBACK_USES_EXCEPTIONS).
 ryml::Callbacks RymlDocument::MakeCallbacks()
 {
   ryml::Callbacks cb = ryml::get_callbacks();
-  cb.m_error         = &RymlDocument::OnError;
+#if RYML_VERSION_MINOR >= 11
+  // Starting with rapidyaml 0.11.0
+  cb.m_error_basic = OnErrorBasic;
+  cb.m_error_parse = OnErrorParse;
+  cb.m_error_visit = OnErrorVisit;
+#else
+  // Up to rapidyaml 0.10.0
+  cb.m_error = OnError;
+#endif
   return cb;
 }
 

third_party_release

@@ -25,4 +25,4 @@ nlohmann-json=v3.12.0
 opentelemetry-proto=v1.10.0
 opentracing-cpp=v1.6.0
 prometheus-cpp=v1.3.0
-ryml=v0.10.0
+ryml=v0.12.1