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] Bring your own dependency: opentelemetry-proto #1730

Merged
merged 8 commits into from
Nov 8, 2022

Conversation

marcalff
Copy link
Member

@marcalff marcalff commented Nov 2, 2022

Fixes #1719

Changes

Add option OTELCPP_PROTO_PATH in CMake.

  • CHANGELOG.md updated for non-trivial changes
  • Unit tests have been added
  • Changes in public API reviewed

@marcalff marcalff requested a review from a team November 2, 2022 23:09
@codecov
Copy link

codecov bot commented Nov 2, 2022

Codecov Report

Merging #1730 (a5e9246) into main (34b6597) will increase coverage by 0.06%.
The diff coverage is n/a.

❗ Current head a5e9246 differs from pull request most recent head 5d8cee3. Consider uploading reports for the commit 5d8cee3 to get more accurate results

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1730      +/-   ##
==========================================
+ Coverage   85.73%   85.79%   +0.06%     
==========================================
  Files         171      171              
  Lines        5212     5212              
==========================================
+ Hits         4468     4471       +3     
+ Misses        744      741       -3     
Impacted Files Coverage Δ
ext/src/http/client/curl/http_client_curl.cc 81.44% <0.00%> (+1.14%) ⬆️

Copy link
Member

@owent owent left a comment

Choose a reason for hiding this comment

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

LGTM.
Is it better to set OTELCPP_PROTO_PATH when using internal proto by ExternalProject_Add?

Copy link
Member

@lalitb lalitb 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.

lalitb and others added 2 commits November 3, 2022 23:13
Improved usability: poor configuration detected at cmake time, not compile
time.
@marcalff
Copy link
Member Author

marcalff commented Nov 4, 2022

LGTM. Is it better to set OTELCPP_PROTO_PATH when using internal proto by ExternalProject_Add?

Thanks @owent

I don't understand the suggestion itself.

Do you mean to set OTELCPP_PROTO_PATH as well after:

    ExternalProject_Add(
      opentelemetry-proto
      GIT_REPOSITORY https://github.com/open-telemetry/opentelemetry-proto.git
      GIT_TAG "${opentelemetry-proto}"
      UPDATE_COMMAND ""
      BUILD_COMMAND ""
      INSTALL_COMMAND ""
      CONFIGURE_COMMAND ""
      TEST_AFTER_INSTALL 0
      DOWNLOAD_NO_PROGRESS 1
      LOG_CONFIGURE 1
      LOG_BUILD 1
      LOG_INSTALL 1)
    ExternalProject_Get_Property(opentelemetry-proto INSTALL_DIR)
    set(PROTO_PATH "${INSTALL_DIR}/src/opentelemetry-proto")

If so, this would mean the makefile alter choices made by the user, making it unclear if this variable is an input to the makefile, or an output from the makefile (when using submodules and/or a github download), of both, causing confusion in my opinion.

Please clarify.

@lalitb
Copy link
Member

lalitb commented Nov 7, 2022

LGTM. Is it better to set OTELCPP_PROTO_PATH when using internal proto by ExternalProject_Add?

Thanks @owent

I don't understand the suggestion itself.

Do you mean to set OTELCPP_PROTO_PATH as well after:

    ExternalProject_Add(
      opentelemetry-proto
      GIT_REPOSITORY https://github.com/open-telemetry/opentelemetry-proto.git
      GIT_TAG "${opentelemetry-proto}"
      UPDATE_COMMAND ""
      BUILD_COMMAND ""
      INSTALL_COMMAND ""
      CONFIGURE_COMMAND ""
      TEST_AFTER_INSTALL 0
      DOWNLOAD_NO_PROGRESS 1
      LOG_CONFIGURE 1
      LOG_BUILD 1
      LOG_INSTALL 1)
    ExternalProject_Get_Property(opentelemetry-proto INSTALL_DIR)
    set(PROTO_PATH "${INSTALL_DIR}/src/opentelemetry-proto")

If so, this would mean the makefile alter choices made by the user, making it unclear if this variable is an input to the makefile, or an output from the makefile (when using submodules and/or a github download), of both, causing confusion in my opinion.

Please clarify.

@owent Do you have any further comments, or can this be merged. thanks.

@lalitb lalitb merged commit b46ca96 into open-telemetry:main Nov 8, 2022
yxue pushed a commit to yxue/opentelemetry-cpp that referenced this pull request Dec 5, 2022
yxue pushed a commit to yxue/opentelemetry-cpp that referenced this pull request Dec 5, 2022
@marcalff marcalff deleted the fix_build_proto_1719 branch July 4, 2023 07:18
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] Bring your own dependency: opentelemetry-proto
4 participants