From 3e3e4061d7a2869508d327cfae78c7ad1b7e28f3 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 18 Jan 2022 14:51:16 -0800 Subject: [PATCH 1/3] Fix build test of Zipkin exporter --- .gitignore | 2 ++ api/include/opentelemetry/common/spin_lock_mutex.h | 1 + exporters/jaeger/CMakeLists.txt | 3 ++- exporters/jaeger/test/jaeger_exporter_test.cc | 2 +- exporters/zipkin/CMakeLists.txt | 2 ++ exporters/zipkin/test/zipkin_exporter_test.cc | 3 +-- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a307af966e..8a55a4ca4a 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ /bazel-* /plugin /build + +tags diff --git a/api/include/opentelemetry/common/spin_lock_mutex.h b/api/include/opentelemetry/common/spin_lock_mutex.h index b30fd3f44b..939093303c 100644 --- a/api/include/opentelemetry/common/spin_lock_mutex.h +++ b/api/include/opentelemetry/common/spin_lock_mutex.h @@ -13,6 +13,7 @@ # ifndef NOMINMAX # define NOMINMAX # endif +# define _WINSOCKAPI_ // stops including winsock.h # include #elif defined(__i386__) || defined(__x86_64__) # if defined(__clang__) diff --git a/exporters/jaeger/CMakeLists.txt b/exporters/jaeger/CMakeLists.txt index b6108013d6..0659c399b0 100644 --- a/exporters/jaeger/CMakeLists.txt +++ b/exporters/jaeger/CMakeLists.txt @@ -58,6 +58,8 @@ install( PATTERN "recordable.h" EXCLUDE) if(BUILD_TESTING) + add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1) + add_executable(jaeger_recordable_test test/jaeger_recordable_test.cc) target_link_libraries( jaeger_recordable_test ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} @@ -69,7 +71,6 @@ if(BUILD_TESTING) TEST_LIST jaeger_recordable_test) add_executable(jaeger_exporter_test test/jaeger_exporter_test.cc) - add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1) if(MSVC) if(GMOCK_LIB) unset(GMOCK_LIB CACHE) diff --git a/exporters/jaeger/test/jaeger_exporter_test.cc b/exporters/jaeger/test/jaeger_exporter_test.cc index 7f86f877bc..3dd129b671 100644 --- a/exporters/jaeger/test/jaeger_exporter_test.cc +++ b/exporters/jaeger/test/jaeger_exporter_test.cc @@ -14,7 +14,7 @@ #endif #include -#include "gmock/gmock.h" +#include namespace trace = opentelemetry::trace; namespace nostd = opentelemetry::nostd; diff --git a/exporters/zipkin/CMakeLists.txt b/exporters/zipkin/CMakeLists.txt index 46a13ac787..b9591324fd 100644 --- a/exporters/zipkin/CMakeLists.txt +++ b/exporters/zipkin/CMakeLists.txt @@ -37,6 +37,8 @@ install( PATTERN "recordable.h" EXCLUDE) if(BUILD_TESTING) + add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1) + add_executable(zipkin_recordable_test test/zipkin_recordable_test.cc) target_link_libraries( diff --git a/exporters/zipkin/test/zipkin_exporter_test.cc b/exporters/zipkin/test/zipkin_exporter_test.cc index 42654c2fb0..b373493ef0 100644 --- a/exporters/zipkin/test/zipkin_exporter_test.cc +++ b/exporters/zipkin/test/zipkin_exporter_test.cc @@ -3,7 +3,6 @@ #ifndef HAVE_CPP_STDLIB -# define _WINSOCKAPI_ // stops including winsock.h # include "opentelemetry/exporters/zipkin/zipkin_exporter.h" # include # include "opentelemetry/ext/http/client/curl/http_client_curl.h" @@ -13,7 +12,7 @@ # include "opentelemetry/trace/provider.h" # include -# include "gmock/gmock.h" +# include # include "nlohmann/json.hpp" From da139cddc11c490a869427f02269743293bb4e84 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 18 Jan 2022 15:28:17 -0800 Subject: [PATCH 2/3] Fix format --- api/include/opentelemetry/common/spin_lock_mutex.h | 2 +- exporters/jaeger/test/jaeger_exporter_test.cc | 2 +- exporters/zipkin/test/zipkin_exporter_test.cc | 2 +- .../opentelemetry/ext/http/client/curl/http_operation_curl.h | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/api/include/opentelemetry/common/spin_lock_mutex.h b/api/include/opentelemetry/common/spin_lock_mutex.h index 939093303c..b35f54081a 100644 --- a/api/include/opentelemetry/common/spin_lock_mutex.h +++ b/api/include/opentelemetry/common/spin_lock_mutex.h @@ -13,7 +13,7 @@ # ifndef NOMINMAX # define NOMINMAX # endif -# define _WINSOCKAPI_ // stops including winsock.h +# define _WINSOCKAPI_ // stops including winsock.h # include #elif defined(__i386__) || defined(__x86_64__) # if defined(__clang__) diff --git a/exporters/jaeger/test/jaeger_exporter_test.cc b/exporters/jaeger/test/jaeger_exporter_test.cc index 3dd129b671..7f86f877bc 100644 --- a/exporters/jaeger/test/jaeger_exporter_test.cc +++ b/exporters/jaeger/test/jaeger_exporter_test.cc @@ -14,7 +14,7 @@ #endif #include -#include +#include "gmock/gmock.h" namespace trace = opentelemetry::trace; namespace nostd = opentelemetry::nostd; diff --git a/exporters/zipkin/test/zipkin_exporter_test.cc b/exporters/zipkin/test/zipkin_exporter_test.cc index b373493ef0..67d5c1c8ce 100644 --- a/exporters/zipkin/test/zipkin_exporter_test.cc +++ b/exporters/zipkin/test/zipkin_exporter_test.cc @@ -12,7 +12,7 @@ # include "opentelemetry/trace/provider.h" # include -# include +# include "gmock/gmock.h" # include "nlohmann/json.hpp" diff --git a/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h b/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h index fa727899e4..5aaaa0a0e5 100644 --- a/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h +++ b/ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h @@ -7,7 +7,6 @@ #include "opentelemetry/ext/http/client/http_client.h" #include "opentelemetry/version.h" -#include #include #include #include @@ -16,9 +15,11 @@ #include #ifdef _WIN32 # include +# include #else # include #endif +#include OPENTELEMETRY_BEGIN_NAMESPACE namespace ext From a1a7e080e1f302e7e52135c2f8e1c223dc564c73 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 18 Jan 2022 21:24:53 -0800 Subject: [PATCH 3/3] Specify an old good version for docfx as the latest version has issue to install --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 998fcb15ff..6ac51974e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -408,7 +408,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: install docfx - run: choco install docfx -y + run: choco install docfx -y --version=2.58.5 - name: run ./ci/docfx.cmd shell: cmd run: ./ci/docfx.cmd