Merge branch 'main' into remove_warnings_from_protobuf

open-telemetry · Apr 7, 2021 · 4f301fe · 4f301fe
2 parents 4ceb351 + 1a5737a
commit 4f301fe
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/api/include/opentelemetry/trace/propagation/detail/context.h b/api/include/opentelemetry/trace/propagation/detail/context.h
@@ -9,7 +9,7 @@ namespace propagation
 namespace detail
 {
 
-trace::SpanContext GetCurrentSpan(const context::Context &context)
+inline trace::SpanContext GetCurrentSpan(const context::Context &context)
 {
   context::ContextValue span = context.GetValue(trace::kSpanKey);
   if (nostd::holds_alternative<nostd::shared_ptr<trace::Span>>(span))

diff --git a/api/include/opentelemetry/trace/propagation/detail/hex.h b/api/include/opentelemetry/trace/propagation/detail/hex.h
@@ -32,7 +32,7 @@ inline int8_t HexToInt(char c)
   return kHexDigits[uint8_t(c)];
 }
 
-bool IsValidHex(nostd::string_view s)
+inline bool IsValidHex(nostd::string_view s)
 {
   return std::all_of(s.begin(), s.end(), [](char c) { return HexToInt(c) != -1; });
 }
@@ -41,7 +41,7 @@ bool IsValidHex(nostd::string_view s)
  * Converts a hexadecimal to binary format if the hex string will fit the buffer.
  * Smaller hex strings are left padded with zeroes.
  */
-bool HexToBinary(nostd::string_view hex, uint8_t *buffer, size_t buffer_size)
+inline bool HexToBinary(nostd::string_view hex, uint8_t *buffer, size_t buffer_size)
 {
   std::memset(buffer, 0, buffer_size);
 

diff --git a/api/include/opentelemetry/trace/propagation/detail/string.h b/api/include/opentelemetry/trace/propagation/detail/string.h
@@ -14,7 +14,10 @@ namespace detail
  * Splits a string by separator, up to given buffer count words.
  * Returns the amount of words the input was split into.
  */
-size_t SplitString(nostd::string_view s, char separator, nostd::string_view *results, size_t count)
+inline size_t SplitString(nostd::string_view s,
+                          char separator,
+                          nostd::string_view *results,
+                          size_t count)
 {
   if (count == 0)
   {

diff --git a/opentelemetry-cpp-config.cmake.in b/opentelemetry-cpp-config.cmake.in
@@ -55,6 +55,8 @@ set(OPENTELEMETRY_VERSION
 
 # ##############################################################################
 
+find_package(Threads)
+
 set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
 set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")