-
Notifications
You must be signed in to change notification settings - Fork 448
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix build test of Zipkin exporter on Windows #1177
Conversation
Codecov Report
@@ Coverage Diff @@
## main #1177 +/- ##
=======================================
Coverage 93.29% 93.29%
=======================================
Files 174 174
Lines 6404 6404
=======================================
Hits 5974 5974
Misses 430 430
|
@@ -37,6 +37,8 @@ install( | |||
PATTERN "recordable.h" EXCLUDE) | |||
|
|||
if(BUILD_TESTING) | |||
add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this required ? Just trying to understand what fix we are going for Zipkin.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is some unresolved global lock variable in gtest/gmock reported if built without this flag.
@@ -3,7 +3,6 @@ | |||
|
|||
#ifndef HAVE_CPP_STDLIB | |||
|
|||
# define _WINSOCKAPI_ // stops including winsock.h |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not related to the PR:
This is not part of CMake test for Windows CI.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I moved this define
to spin lock header which includes windows.h
as well. So this should be unnecessary. Let me know you prefer keep this define here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, spin lock header is actually the right place to have the define.
Changes
Zipkin exporter doesn't build on Windows but Jaeger exporter builds fine. This PR ports the necessary Jaeger build scripts to Zipkin exporter as well.
For significant contributions please make sure you have completed the following items:
CHANGELOG.md
updated for non-trivial changes