From 4027edbd30c09c560060fd467ac2fb2b11c0305a Mon Sep 17 00:00:00 2001
From: Max Golovanov <maxgolov@microsoft.com>
Date: Sat, 8 May 2021 00:00:00 -0700
Subject: [PATCH 1/2] Allow to build with alternate vcpkg.exe by respecting
 VCPKG_ROOT variable (#730)

---
 tools/build.cmd            | 4 ++--
 tools/setup-buildtools.cmd | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/build.cmd b/tools/build.cmd
index 55cc8d6c8f..74ba5db875 100644
--- 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
index 77ea10acba..2c0912ca2e 100644
--- 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

From 01b7a841c25925e67e76d7de0c1882ee0cc02903 Mon Sep 17 00:00:00 2001
From: Johannes Tax <johannestax@microsoft.com>
Date: Sat, 8 May 2021 00:45:32 -0700
Subject: [PATCH 2/2] Minor api documentation cleanup (#728)

---
 api/docs/Doxyfile                              |  4 +++-
 .../opentelemetry/common/key_value_iterable.h  | 18 ------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/api/docs/Doxyfile b/api/docs/Doxyfile
index 5c020d649d..d11c95becd 100644
--- 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
index 10caf6f8ca..12c14d1bdc 100644
--- 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