Skip to content

Commit

Permalink
Fix build test of Zipkin exporter on Windows (#1177)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomsonTan authored Jan 20, 2022
1 parent bc1b469 commit fed56cc
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@
/bazel-*
/plugin
/build

tags
1 change: 1 addition & 0 deletions api/include/opentelemetry/common/spin_lock_mutex.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# ifndef NOMINMAX
# define NOMINMAX
# endif
# define _WINSOCKAPI_ // stops including winsock.h
# include <windows.h>
#elif defined(__i386__) || defined(__x86_64__)
# if defined(__clang__)
Expand Down
3 changes: 2 additions & 1 deletion exporters/jaeger/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions exporters/zipkin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion exporters/zipkin/test/zipkin_exporter_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#ifndef HAVE_CPP_STDLIB

# define _WINSOCKAPI_ // stops including winsock.h
# include "opentelemetry/exporters/zipkin/zipkin_exporter.h"
# include <string>
# include "opentelemetry/ext/http/client/curl/http_client_curl.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "opentelemetry/ext/http/client/http_client.h"
#include "opentelemetry/version.h"

#include <curl/curl.h>
#include <future>
#include <map>
#include <regex>
Expand All @@ -16,9 +15,11 @@
#include <vector>
#ifdef _WIN32
# include <io.h>
# include <winsock2.h>
#else
# include <unistd.h>
#endif
#include <curl/curl.h>

OPENTELEMETRY_BEGIN_NAMESPACE
namespace ext
Expand Down

0 comments on commit fed56cc

Please sign in to comment.