Merge pull request #97 from open-telemetry/main

merged from upstream
malkia · Nov 25, 2024 · e91954c · e91954c
2 parents e4bb0b4 + 31956f8
commit e91954c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -260,10 +260,6 @@ if(OTELCPP_VERSIONED_LIBS AND NOT BUILD_SHARED_LIBS)
   message(FATAL_ERROR "OTELCPP_VERSIONED_LIBS=ON requires BUILD_SHARED_LIBS=ON")
 endif()
 
-set(OTELCPP_PROTO_PATH
-    ""
-    CACHE PATH "Path to opentelemetry-proto")
-
 if(WIN32)
   option(WITH_ETW "Whether to include the ETW Exporter in the SDK" ON)
 else()

diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in
@@ -105,7 +105,7 @@ endif()
 
 if(@WITH_ABSEIL@ OR @WITH_OTLP_GRPC@)
   find_package(absl CONFIG)
-elseif(OR @WITH_OTLP_HTTP@ OR @WITH_OTLP_FILE@)
+elseif(@WITH_OTLP_HTTP@ OR @WITH_OTLP_FILE@)
   if("@Protobuf_VERSION@" VERSION_GREATER_EQUAL "3.22.0")
     find_package(absl CONFIG)
   endif()

diff --git a/sdk/include/opentelemetry/sdk/common/empty_attributes.h b/sdk/include/opentelemetry/sdk/common/empty_attributes.h
@@ -21,12 +21,12 @@ namespace sdk
  * with default attributes.
  */
 static const opentelemetry::common::KeyValueIterableView<
-    std::array<std::pair<std::string, int>, 0>> &
+    std::array<std::pair<std::string, int32_t>, 0>> &
 GetEmptyAttributes() noexcept
 {
-  static const std::array<std::pair<std::string, int>, 0> array{};
+  static const std::array<std::pair<std::string, int32_t>, 0> array{};
   static const opentelemetry::common::KeyValueIterableView<
-      std::array<std::pair<std::string, int>, 0>>
+      std::array<std::pair<std::string, int32_t>, 0>>
       kEmptyAttributes(array);
 
   return kEmptyAttributes;

diff --git a/sdk/include/opentelemetry/sdk/trace/span_data.h b/sdk/include/opentelemetry/sdk/trace/span_data.h
@@ -257,7 +257,7 @@ class SpanData final : public Recordable
                 opentelemetry::common::SystemTimestamp timestamp =
                     opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()),
                 const opentelemetry::common::KeyValueIterable &attributes =
-                    opentelemetry::common::KeyValueIterableView<std::map<std::string, int>>(
+                    opentelemetry::common::KeyValueIterableView<std::map<std::string, int32_t>>(
                         {})) noexcept override
   {
     SpanDataEvent event(std::string(name), timestamp, attributes);