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

[BUILD] Read default proto version from third_party_release #2677

Merged

Conversation

owent
Copy link
Member

@owent owent commented May 23, 2024

Fixes #2676

Changes

  • Read default proto version from third_party_release
  • Format cmake/opentelemetry-proto.cmake

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

@owent owent requested a review from a team as a code owner May 23, 2024 03:05
Copy link

codecov bot commented May 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.70%. Comparing base (497eaf4) to head (4d6b314).
Report is 67 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2677      +/-   ##
==========================================
+ Coverage   87.12%   87.70%   +0.58%     
==========================================
  Files         200      190      -10     
  Lines        6109     5852     -257     
==========================================
- Hits         5322     5132     -190     
+ Misses        787      720      -67     

see 57 files with indirect coverage changes

@marcalff marcalff changed the title Read default proto version from third_party_release [BUILD] Read default proto version from third_party_release May 23, 2024
Copy link
Member

@marcalff marcalff left a comment

Choose a reason for hiding this comment

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

Thanks for the fix.

See suggested change.

Not sure why opentelemetry-proto.cmake was not formatted in my previous change, as CI was ok on format.

Copy link
Member

@marcalff marcalff left a comment

Choose a reason for hiding this comment

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

Also, please update third_party_release to use opentelemetry-proto 1.3.1

(Edit: this is something missing from PR #2669)

@owent
Copy link
Member Author

owent commented May 28, 2024

Thanks for the fix.

See suggested change.

Not sure why opentelemetry-proto.cmake was not formatted in my previous change, as CI was ok on format.

Maybe we should use cmake-format -i $($FIND -name 'CMakeLists.txt' -print -o -name '*.cmake' -print -o -name '*.cmake.in' -print) in tools/format.sh. (Add -o between rules.)

Copy link
Member

@marcalff marcalff left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the fix.

@marcalff marcalff merged commit 277190d into open-telemetry:main May 28, 2024
49 checks passed
@owent owent deleted the fix_default_proto_version_in_cmake branch June 21, 2024 06:19
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.

[BUILD] protoc error during build of opentelemetry-cpp with OTLP HTTP enabled
2 participants