Merge branch 'main' into validate_utf8_string_in_otlp

Author: ThomsonTan

.github/workflows/ci.yml

@@ -104,7 +104,14 @@ jobs:
     - name: install dependencies
       run: |
         sudo -E ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file third_party_release
-    - name: run cmake gcc (maintainer mode, sync)
+    - name: run cmake gcc (maintainer mode, sync, Debug)
+      env:
+        BUILD_TYPE: Debug
+      run: |
+        ./ci/do_ci.sh cmake.maintainer.sync.test
+    - name: run cmake gcc (maintainer mode, sync, Release)
+      env:
+        BUILD_TYPE: Release
       run: |
         ./ci/do_ci.sh cmake.maintainer.sync.test
     - name: generate test cert
@@ -135,7 +142,14 @@ jobs:
     - name: install dependencies
       run: |
         sudo -E ./ci/install_thirdparty.sh --install-dir /usr/local --tags-file third_party_release
-    - name: run cmake gcc (maintainer mode, async)
+    - name: run cmake gcc (maintainer mode, async, Debug)
+      env:
+        BUILD_TYPE: Debug
+      run: |
+        ./ci/do_ci.sh cmake.maintainer.async.test
+    - name: run cmake gcc (maintainer mode, async, Release)
+      env:
+        BUILD_TYPE: Release
       run: |
         ./ci/do_ci.sh cmake.maintainer.async.test
     - name: generate test cert

exporters/otlp/src/otlp_file_client.cc

@@ -1256,7 +1256,8 @@ class OPENTELEMETRY_LOCAL_SYMBOL OtlpFileSystemBackend : public OtlpFileAppender
         strerror_s(error_message, sizeof(error_message) - 1, error_code);
 #else
         char error_message[256] = {0};
-        strerror_r(error_code, error_message, sizeof(error_message) - 1);
+        OPENTELEMETRY_MAYBE_UNUSED auto strerror_r_result =
+            strerror_r(error_code, error_message, sizeof(error_message) - 1);
 #endif
         OTEL_INTERNAL_LOG_ERROR("[OTLP FILE Client] Create directory \""
                                 << directory_name << "\" failed.errno: " << error_code

sdk/src/metrics/data/circular_buffer.cc

@@ -123,8 +123,8 @@ void AdaptingIntegerArray::EnlargeToFit(uint64_t value)
   {
     backing = std::vector<uint64_t>(backing_size, 0);
   }
-  std::swap(backing_, backing);
-  nostd::visit(AdaptingIntegerArrayCopy{}, backing, backing_);
+  nostd::visit(AdaptingIntegerArrayCopy{}, backing_, backing);
+  backing_ = std::move(backing);
 }
 
 void AdaptingCircularBufferCounter::Clear()

sdk/test/metrics/CMakeLists.txt

@@ -35,8 +35,7 @@ foreach(
   periodic_exporting_metric_reader_test
   instrument_metadata_validator_test
   metric_test_stress
-  instrument_descriptor_test
-  multi_observer_test)
+  instrument_descriptor_test)
   add_executable(${testname} "${testname}.cc")
   target_link_libraries(
     ${testname} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIB} ${CMAKE_THREAD_LIBS_INIT}
@@ -48,6 +47,18 @@ foreach(
     TEST_LIST ${testname})
 endforeach()
 
+if(OPENTELEMETRY_ABI_VERSION_NO GREATER_EQUAL 2)
+  add_executable(multi_observer_test multi_observer_test.cc)
+  target_link_libraries(
+    multi_observer_test ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIB}
+    ${CMAKE_THREAD_LIBS_INIT} metrics_common_test_utils opentelemetry_resources)
+  target_compile_definitions(multi_observer_test PRIVATE UNIT_TESTING)
+  gtest_add_tests(
+    TARGET multi_observer_test
+    TEST_PREFIX metrics.
+    TEST_LIST multi_observer_test)
+endif()
+
 if(WITH_BENCHMARK)
   add_executable(attributes_processor_benchmark
                  attributes_processor_benchmark.cc)