Skip to content
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

Merged
merged 3 commits into from
Jan 20, 2022

Conversation

ThomsonTan
Copy link
Contributor

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
  • Unit tests have been added
  • Changes in public API reviewed

@ThomsonTan ThomsonTan requested a review from a team January 18, 2022 22:56
@codecov
Copy link

codecov bot commented Jan 18, 2022

Codecov Report

Merging #1177 (a1a7e08) into main (bc1b469) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1177   +/-   ##
=======================================
  Coverage   93.29%   93.29%           
=======================================
  Files         174      174           
  Lines        6404     6404           
=======================================
  Hits         5974     5974           
  Misses        430      430           
Impacted Files Coverage Δ
api/include/opentelemetry/common/spin_lock_mutex.h 31.25% <ø> (ø)
...lemetry/ext/http/client/curl/http_operation_curl.h 78.09% <ø> (ø)

@@ -37,6 +37,8 @@ install(
PATTERN "recordable.h" EXCLUDE)

if(BUILD_TESTING)
add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
Copy link
Member

@lalitb lalitb Jan 19, 2022

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.

Copy link
Contributor Author

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
Copy link
Member

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.

Copy link
Contributor Author

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.

Copy link
Member

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.

@lalitb lalitb merged commit fed56cc into open-telemetry:main Jan 20, 2022
@ThomsonTan ThomsonTan deleted the FixZipkinExporterTest branch November 9, 2022 22:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants