Skip to content

[CMAKE] Address the vcpkg opentelemetry-cpp port CMake patches #3518

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

Merged

Conversation

dbarker
Copy link
Contributor

@dbarker dbarker commented Jul 5, 2025

Fixes #3401

Fix CMake issues requiring patches to the vcpkg opentelemetry-cpp port.

Changes

  • Support finding or fetching OpenTracing - if fetched (submodule or github) ensure the targets are patched and valid.
  • Support linking to OpenTracing shared library or static library targets
  • Don't set CMAKE_FIND_PACKAGE_PREFER_CONFIG
  • Don't include VCPKG_CHAINLOAD_TOOLCHAIN_FILE

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

Copy link

netlify bot commented Jul 5, 2025

Deploy Preview for opentelemetry-cpp-api-docs canceled.

Name Link
🔨 Latest commit 2bd4c95
🔍 Latest deploy log https://app.netlify.com/projects/opentelemetry-cpp-api-docs/deploys/686d49e4594d21000845dac1

Copy link

codecov bot commented Jul 5, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.96%. Comparing base (3eec22c) to head (2bd4c95).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3518      +/-   ##
==========================================
+ Coverage   89.95%   89.96%   +0.02%     
==========================================
  Files         219      219              
  Lines        7051     7051              
==========================================
+ Hits         6342     6343       +1     
+ Misses        709      708       -1     

see 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@dbarker dbarker marked this pull request as ready for review July 5, 2025 22:36
@dbarker dbarker requested a review from a team as a code owner July 5, 2025 22:36
# Note: CMAKE_FIND_PACKAGE_PREFER_CONFIG requires cmake 3.15. Prefer cmake
# CONFIG search mode to find dependencies. This is important to properly find
# protobuf versions 3.22.0 and above due to the abseil-cpp dependency.
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove this now that GTest, Protobuf, and gRPC are found with the CONFIG search mode explicitly.

@@ -497,6 +488,14 @@ if((NOT WITH_API_ONLY) AND USE_NLOHMANN_JSON)
include("${opentelemetry-cpp_SOURCE_DIR}/cmake/nlohmann-json.cmake")
endif()

#
# Do we need OpenTracing ?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The official vcpkg port still supports it as opentelemetry-cpp[opentracing], but I think we could deprecate it, or plan on that.

@marcalff marcalff merged commit a1e6011 into open-telemetry:main Jul 9, 2025
77 of 80 checks passed
@dbarker dbarker deleted the cmake_vcpkg_otelcpp_port_fixes branch July 10, 2025 16:44
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.

Address cmake issues requiring patches by the vcpkg port
3 participants