Merge branch 'main' into kjtsanaktsidis/multi_observable

Author: lalitb

.github/workflows/ossf-scorecard.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+      - uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif

CHANGELOG.md

@@ -20,6 +20,9 @@ Increment the:
 * [METRICS] Allow registering one callback for multiple instruments
   [#3667](https://github.com/open-telemetry/opentelemetry-cpp/pull/3667)
 
+* [SDK] Fix typo in hashmap method GetEnteries
+  [#3680](https://github.com/open-telemetry/opentelemetry-cpp/pull/3680)
+
 ## [1.23 2025-09-25]
 
 * [CodeHealth] Fix clang-tidy warnings part 6

ci/do_ci.ps1

@@ -425,6 +425,7 @@ switch ($action) {
       "-DCMAKE_INSTALL_PREFIX=$INSTALL_TEST_DIR" `
       "-C $SRC_DIR/test_common/cmake/all-options-abiv1-preview.cmake" `
       -DOPENTELEMETRY_INSTALL=ON `
+      -DWITH_CONFIGURATION=OFF `
       -DWITH_OPENTRACING=OFF `
       -DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=OFF `
       -DWITH_OTLP_GRPC_CREDENTIAL_PREVIEW=OFF `

ci/do_ci.sh

@@ -457,17 +457,24 @@ elif [[ "$1" == "cmake.install.test" ]]; then
   EXPECTED_COMPONENTS=(
     "api"
     "sdk"
+    "configuration"
     "ext_common"
     "ext_http_curl"
     "exporters_in_memory"
     "exporters_ostream"
+    "exporters_ostream_builder"
     "exporters_otlp_common"
     "exporters_otlp_file"
+    "exporters_otlp_file_builder"
     "exporters_otlp_grpc"
+    "exporters_otlp_grpc_builder"
     "exporters_otlp_http"
+    "exporters_otlp_http_builder"
     "exporters_prometheus"
+    "exporters_prometheus_builder"
     "exporters_elasticsearch"
     "exporters_zipkin"
+    "exporters_zipkin_builder"
   )
   EXPECTED_COMPONENTS_STRING=$(IFS=\;; echo "${EXPECTED_COMPONENTS[*]}")
   mkdir -p "${BUILD_DIR}/install_test"

cmake/ryml.cmake

@@ -16,8 +16,10 @@ if(NOT ryml_FOUND)
     )
   set(ryml_PROVIDER "fetch_repository")
 
-  set(RYML_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
-  set(RYML_ENABLE_INSTALL OFF CACHE BOOL "" FORCE)
+  set(RYML_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
+  set(RYML_BUILD_API OFF CACHE BOOL "" FORCE)
+  set(RYML_DBG OFF CACHE BOOL "" FORCE)
+  set(RYML_INSTALL ${OPENTELEMETRY_INSTALL} CACHE BOOL "" FORCE)
 
   FetchContent_MakeAvailable(ryml)
 

examples/configuration/CMakeLists.txt

@@ -1,10 +1,6 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-if(DEFINED OPENTELEMETRY_BUILD_DLL)
-  add_definitions(-DOPENTELEMETRY_BUILD_IMPORT_DLL)
-endif()
-
 add_executable(
   example_yaml
   main.cc
@@ -32,7 +28,7 @@ target_link_libraries(
           opentelemetry-cpp::ostream_log_record_exporter_builder)
 
 if(WITH_OTLP_HTTP)
-  add_definitions(-DOTEL_HAVE_OTLP_HTTP)
+  target_compile_definitions(example_yaml PRIVATE OTEL_HAVE_OTLP_HTTP)
   target_link_libraries(
     example_yaml
     PRIVATE opentelemetry-cpp::otlp_http_exporter_builder
@@ -41,16 +37,16 @@ if(WITH_OTLP_HTTP)
 endif()
 
 if(WITH_OTLP_GRPC)
-  add_definitions(-DOTEL_HAVE_OTLP_GRPC)
+  target_compile_definitions(example_yaml PRIVATE OTEL_HAVE_OTLP_GRPC)
   target_link_libraries(
     example_yaml
     PRIVATE opentelemetry-cpp::otlp_grpc_exporter_builder
             opentelemetry-cpp::otlp_grpc_log_record_exporter_builder
-            opentelemetry-cpp::otlp_grpc_metrics_exporter_builder)
+            opentelemetry-cpp::otlp_grpc_metric_exporter_builder)
 endif()
 
 if(WITH_OTLP_FILE)
-  add_definitions(-DOTEL_HAVE_OTLP_FILE)
+  target_compile_definitions(example_yaml PRIVATE OTEL_HAVE_OTLP_FILE)
   target_link_libraries(
     example_yaml
     PRIVATE opentelemetry-cpp::otlp_file_exporter_builder
@@ -59,18 +55,20 @@ if(WITH_OTLP_FILE)
 endif()
 
 if(WITH_ZIPKIN)
-  add_definitions(-DOTEL_HAVE_ZIPKIN)
+  target_compile_definitions(example_yaml PRIVATE OTEL_HAVE_ZIPKIN)
   target_link_libraries(
     example_yaml PRIVATE opentelemetry-cpp::zipkin_trace_exporter_builder)
 endif()
 
 if(WITH_PROMETHEUS)
-  add_definitions(-DOTEL_HAVE_PROMETHEUS)
+  target_compile_definitions(example_yaml PRIVATE OTEL_HAVE_PROMETHEUS)
   target_link_libraries(example_yaml
                         PRIVATE opentelemetry-cpp::prometheus_exporter_builder)
 endif()
 
 if(DEFINED OPENTELEMETRY_BUILD_DLL)
+  target_compile_definitions(example_yaml
+                             PRIVATE OPENTELEMETRY_BUILD_IMPORT_DLL)
   target_link_libraries(example_yaml
                         PRIVATE opentelemetry-cpp::opentelemetry_cpp)
 else()
@@ -79,3 +77,7 @@ else()
     PRIVATE opentelemetry-cpp::configuration opentelemetry-cpp::common
             opentelemetry-cpp::trace opentelemetry-cpp::logs)
 endif()
+
+if(BUILD_TESTING)
+  add_test(NAME examples.example_yaml COMMAND "$<TARGET_FILE:example_yaml>")
+endif()

exporters/otlp/CMakeLists.txt

@@ -138,8 +138,10 @@ if(WITH_OTLP_GRPC)
                         PROPERTIES EXPORT_NAME otlp_grpc_exporter_builder)
   set_target_version(opentelemetry_exporter_otlp_grpc_builder)
 
-  target_link_libraries(opentelemetry_exporter_otlp_grpc_builder
-                        PUBLIC opentelemetry_exporter_otlp_grpc)
+  target_link_libraries(
+    opentelemetry_exporter_otlp_grpc_builder
+    PUBLIC opentelemetry_exporter_otlp_grpc
+           opentelemetry_exporter_otlp_builder_utils)
 
   list(APPEND OPENTELEMETRY_OTLP_GRPC_BUILDER_TARGETS
        opentelemetry_exporter_otlp_grpc_builder)
@@ -179,8 +181,10 @@ if(WITH_OTLP_GRPC)
     PROPERTIES EXPORT_NAME otlp_grpc_log_record_exporter_builder)
   set_target_version(opentelemetry_exporter_otlp_grpc_log_builder)
 
-  target_link_libraries(opentelemetry_exporter_otlp_grpc_log_builder
-                        PUBLIC opentelemetry_exporter_otlp_grpc_log)
+  target_link_libraries(
+    opentelemetry_exporter_otlp_grpc_log_builder
+    PUBLIC opentelemetry_exporter_otlp_grpc_log
+           opentelemetry_exporter_otlp_builder_utils)
 
   list(APPEND OPENTELEMETRY_OTLP_GRPC_BUILDER_TARGETS
        opentelemetry_exporter_otlp_grpc_log_builder)
@@ -208,23 +212,25 @@ if(WITH_OTLP_GRPC)
        opentelemetry_exporter_otlp_grpc_metrics)
 
   #
-  # opentelemetry_exporter_otlp_grpc_metrics_builder
+  # opentelemetry_exporter_otlp_grpc_metric_builder
   #
 
   add_library(
-    opentelemetry_exporter_otlp_grpc_metrics_builder
+    opentelemetry_exporter_otlp_grpc_metric_builder
     ${OPENTELEMETRY_OTLP_TARGETS_LIB_TYPE} src/otlp_grpc_push_metric_builder.cc)
 
   set_target_properties(
-    opentelemetry_exporter_otlp_grpc_metrics_builder
-    PROPERTIES EXPORT_NAME otlp_grpc_metrics_exporter_builder)
-  set_target_version(opentelemetry_exporter_otlp_grpc_metrics_builder)
+    opentelemetry_exporter_otlp_grpc_metric_builder
+    PROPERTIES EXPORT_NAME otlp_grpc_metric_exporter_builder)
+  set_target_version(opentelemetry_exporter_otlp_grpc_metric_builder)
 
-  target_link_libraries(opentelemetry_exporter_otlp_grpc_metrics_builder
-                        PUBLIC opentelemetry_exporter_otlp_grpc_metrics)
+  target_link_libraries(
+    opentelemetry_exporter_otlp_grpc_metric_builder
+    PUBLIC opentelemetry_exporter_otlp_grpc_metrics
+           opentelemetry_exporter_otlp_builder_utils)
 
   list(APPEND OPENTELEMETRY_OTLP_GRPC_BUILDER_TARGETS
-       opentelemetry_exporter_otlp_grpc_metrics_builder)
+       opentelemetry_exporter_otlp_grpc_metric_builder)
 
 endif()
 
@@ -445,8 +451,10 @@ if(WITH_OTLP_FILE)
                         PROPERTIES EXPORT_NAME otlp_file_exporter_builder)
   set_target_version(opentelemetry_exporter_otlp_file_builder)
 
-  target_link_libraries(opentelemetry_exporter_otlp_file_builder
-                        PUBLIC opentelemetry_exporter_otlp_file)
+  target_link_libraries(
+    opentelemetry_exporter_otlp_file_builder
+    PUBLIC opentelemetry_exporter_otlp_file
+           opentelemetry_exporter_otlp_builder_utils)
 
   list(APPEND OPENTELEMETRY_OTLP_FILE_BUILDER_TARGETS
        opentelemetry_exporter_otlp_file_builder)
@@ -486,8 +494,10 @@ if(WITH_OTLP_FILE)
     PROPERTIES EXPORT_NAME otlp_file_log_record_exporter_builder)
   set_target_version(opentelemetry_exporter_otlp_file_log_builder)
 
-  target_link_libraries(opentelemetry_exporter_otlp_file_log_builder
-                        PUBLIC opentelemetry_exporter_otlp_file_log)
+  target_link_libraries(
+    opentelemetry_exporter_otlp_file_log_builder
+    PUBLIC opentelemetry_exporter_otlp_file_log
+           opentelemetry_exporter_otlp_builder_utils)
 
   list(APPEND OPENTELEMETRY_OTLP_FILE_BUILDER_TARGETS
        opentelemetry_exporter_otlp_file_log_builder)
@@ -527,8 +537,10 @@ if(WITH_OTLP_FILE)
     PROPERTIES EXPORT_NAME otlp_file_metric_exporter_builder)
   set_target_version(opentelemetry_exporter_otlp_file_metric_builder)
 
-  target_link_libraries(opentelemetry_exporter_otlp_file_metric_builder
-                        PUBLIC opentelemetry_exporter_otlp_file_metric)
+  target_link_libraries(
+    opentelemetry_exporter_otlp_file_metric_builder
+    PUBLIC opentelemetry_exporter_otlp_file_metric
+           opentelemetry_exporter_otlp_builder_utils)
 
   list(APPEND OPENTELEMETRY_OTLP_FILE_BUILDER_TARGETS
        opentelemetry_exporter_otlp_file_metric_builder)

exporters/otlp/src/otlp_builder_utils.cc

@@ -79,16 +79,19 @@ OtlpHeaders OtlpBuilderUtils::ConvertHeadersConfigurationModel(
     }
   }
 
-  // Second, scan headers, which has high priority.
-  for (const auto &kv : model->kv_map)
+  if (model != nullptr)
   {
-    const auto &search = headers.find(kv.first);
-    if (search != headers.end())
+    // Second, scan headers, which has high priority.
+    for (const auto &kv : model->kv_map)
     {
-      headers.erase(search);
-    }
+      const auto &search = headers.find(kv.first);
+      if (search != headers.end())
+      {
+        headers.erase(search);
+      }
 
-    headers.emplace(std::make_pair(kv.first, kv.second));
+      headers.emplace(std::make_pair(kv.first, kv.second));
+    }
   }
 
   return headers;

install/cmake/third_party_latest

@@ -4,11 +4,11 @@
 # Latest version git tags of third-party dependencies
 # Format: <dependency_name>=<release_git_tag>
 
-abseil=20240722.1
+abseil=20250127.0
 zlib=v1.3.1
-curl=curl-8_14_1
-protobuf=v6.30.2
-grpc=v1.72.1
+curl=curl-8_16_0
+protobuf=v6.31.1
+grpc=v1.75.1
 benchmark=v1.9.4
 googletest=v1.17.0
 ms-gsl=v4.2.0

install/conan/conanfile_latest.txt

@@ -3,13 +3,14 @@
 
 [requires]
 zlib/1.3.1
-libcurl/8.12.1
-abseil/20240116.2
+libcurl/8.15.0
+abseil/20250127.0
 protobuf/5.27.0
-grpc/1.67.1
+grpc/1.72.0
 nlohmann_json/3.12.0
 prometheus-cpp/1.3.0
 opentracing-cpp/1.6.0
+rapidyaml/0.9.0
 
 [options]
 grpc/*:fPIC=True