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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 4 commits into from
Jun 3, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92d6821
[DLL Build] link to opentelemetry_logs even without OTLP
ThomsonTan Jun 2, 2023
03f7d44
Remove duplicated link library
ThomsonTan Jun 2, 2023
9c26a8f
Fix format
ThomsonTan Jun 3, 2023
8170280
Merge branch 'main' into FixDllMissingSymbols
ThomsonTan Jun 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

// clang-format off

# include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
# include "opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h"
# include "opentelemetry/common/spin_lock_mutex.h"
# include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"
#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"
#include "opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h"
#include "opentelemetry/common/spin_lock_mutex.h"
#include "opentelemetry/exporters/otlp/protobuf_include_suffix.h"

// clang-format on

Expand Down
12 changes: 6 additions & 6 deletions ext/src/dll/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ if(WITH_OTLP_HTTP)
endif()

if(WITH_LOGS_PREVIEW)
target_link_libraries(opentelemetry_cpp PRIVATE opentelemetry_logs)

if(WITH_OTLP_GRPC)
target_link_libraries(
opentelemetry_cpp PRIVATE opentelemetry_logs
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_logs
opentelemetry_exporter_otlp_http_log)
target_link_libraries(opentelemetry_cpp
PRIVATE opentelemetry_exporter_otlp_http_log)
endif()
endif()

Expand Down