Merge branch 'main' into http-propagate

open-telemetry · May 8, 2021 · ddf413b · ddf413b
2 parents 6ea9092 + 01b7a84
commit ddf413b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git a/api/docs/Doxyfile b/api/docs/Doxyfile
@@ -839,8 +839,10 @@ RECURSIVE = YES
 
 EXCLUDE = ../include/opentelemetry/common/spin_lock_mutex.h \
  ../include/opentelemetry/common/key_value_iterable_view.h \
+ ../include/opentelemetry/common/kv_properties.h \
+ ../include/opentelemetry/common/string_util.h \
  ../include/opentelemetry/trace/span_context_kv_iterable_view.h \
- ../include/opentelemetry/nostd/detail
+ ../include/opentelemetry/nostd
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded

diff --git a/api/include/opentelemetry/common/key_value_iterable.h b/api/include/opentelemetry/common/key_value_iterable.h
@@ -29,23 +29,5 @@ class KeyValueIterable
  */
  virtual size_t size() const noexcept = 0;
 };
-
-//
-// NULL object pattern empty iterable.
-//
-class NullKeyValueIterable : public KeyValueIterable
-{
-public:
- NullKeyValueIterable(){};
-
- virtual bool ForEachKeyValue(
- nostd::function_ref<bool(nostd::string_view, common::AttributeValue)>) const noexcept
- {
- return true;
- };
-
- virtual size_t size() const noexcept { return 0; }
-};
-
 } // namespace common
 OPENTELEMETRY_END_NAMESPACE
diff --git a/tools/build.cmd b/tools/build.cmd
@@ -26,8 +26,8 @@ if ("%CMAKE_ARCH%"=="") (
 )
 
 REM Use preinstalled vcpkg if installed or use our local
-if "%VCPKG_INSTALLATION_ROOT%" neq "" (
- set "VCPKG_CMAKE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake"
+if "%VCPKG_ROOT%" neq "" (
+ set "VCPKG_CMAKE=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake"
 ) else (
  set "VCPKG_CMAKE=%CD%\vcpkg\scripts\buildsystems\vcpkg.cmake"
 )

diff --git a/tools/setup-buildtools.cmd b/tools/setup-buildtools.cmd
@@ -1,5 +1,6 @@
 @echo off
 set "PATH=%ProgramFiles%\CMake\bin;%~dp0;%~dp0vcpkg;%PATH%"
+if "%VCPKG_ROOT%" NEQ "" set "PATH=%VCPKG_ROOT%;%PATH%"
 pushd %~dp0
 
 net session >nul 2>&1