merged from upstream

Author: malkia

.github/workflows/codeql-analysis.yml

@@ -37,10 +37,10 @@ jobs:
       run: |
         sudo -E ./ci/setup_ci_environment.sh
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+      uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
       with:
        languages: cpp
     - name: Autobuild
-      uses: github/codeql-action/autobuild@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+      uses: github/codeql-action/autobuild@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+      uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6

.github/workflows/ossf-scorecard.yml

@@ -47,6 +47,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+        uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         with:
           sarif_file: results.sarif

CHANGELOG.md

@@ -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

install/cmake/third_party_latest

@@ -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

install/cmake/third_party_stable

@@ -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

sdk/src/configuration/ryml_document.cc

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <stddef.h>
+#include <c4/yml/version.hpp>
 #include <exception>
 #include <memory>
 #include <ostream>
@@ -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_);
-  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);
+#else
+  // Up to rapidyaml 0.9.0
+  auto ryml_loc = parser_->location(node);
+#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;
 }