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

[DLL Build] link to opentelemetry_logs even without OTLP #2177

Merged
merged 4 commits into from
Jun 3, 2023

Conversation

ThomsonTan
Copy link
Contributor

#2167 could be related.

Changes

Please provide a brief description of the changes here.

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 June 2, 2023 18:04
@codecov
Copy link

codecov bot commented Jun 2, 2023

Codecov Report

Merging #2177 (8170280) into main (082bb93) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2177   +/-   ##
=======================================
  Coverage   87.52%   87.52%           
=======================================
  Files         169      169           
  Lines        4887     4887           
=======================================
  Hits         4277     4277           
  Misses        610      610           

Copy link
Member

@esigo esigo 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 :)

to fix format:

--- a/ext/src/dll/CMakeLists.txt
+++ b/ext/src/dll/CMakeLists.txt
@@ -26,[13](https://github.com/open-telemetry/opentelemetry-cpp/actions/runs/5159712924/jobs/9294985612?pr=2177#step:4:14) +[26](https://github.com/open-telemetry/opentelemetry-cpp/actions/runs/5159712924/jobs/9294985612?pr=2177#step:4:27),13 @@ if(WITH_LOGS_PREVIEW)
   target_link_libraries(opentelemetry_cpp PRIVATE opentelemetry_logs)
 
   if(WITH_OTLP_GRPC)
-    target_link_libraries(
-      opentelemetry_cpp PRIVATE opentelemetry_exporter_otlp_grpc_log)
+    target_link_libraries(opentelemetry_cpp
+                          PRIVATE opentelemetry_exporter_otlp_grpc_log)
   endif()
 
   if(WITH_OTLP_HTTP)

-    target_link_libraries(
-      opentelemetry_cpp PRIVATE opentelemetry_exporter_otlp_http_log)
+    target_link_libraries(opentelemetry_cpp
+                          PRIVATE opentelemetry_exporter_otlp_http_log)
   endif()
 endif()

@esigo esigo added the ok-to-merge The PR is ok to merge (has two approves or raised by a maintainer/approver and has one approve) label Jun 2, 2023
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 after the format has been fixed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ok-to-merge The PR is ok to merge (has two approves or raised by a maintainer/approver and has one approve)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants