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

[Fluentd exporter] Bump up otel-cpp version to incorporate ARM fix #156

Merged
merged 4 commits into from
May 6, 2022
Merged

[Fluentd exporter] Bump up otel-cpp version to incorporate ARM fix #156

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f215e9
fix-tag
lalitb May 6, 2022
56aaf13
fix
lalitb May 6, 2022
bfb9805
fix
lalitb May 6, 2022
ebd9769
fix
lalitb May 6, 2022
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
13 changes: 6 additions & 7 deletions exporters/fluentd/cmake/opentelemetry-cpp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if("${opentelemetry-cpp-tag}" STREQUAL "")
set(opentelemetry-cpp-tag "v1.3.0")
set(opentelemetry-cpp-tag "75c2a8f7a6bf81d9799e76804473609cc236b7be") #to incorporate PR#1325
endif()
function(target_create _target _lib)
add_library(${_target} STATIC IMPORTED)
Expand All @@ -15,7 +15,7 @@ function(build_opentelemetry)
set(opentelemetry_CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DWITH_LOGS_PREVIEW=ON
-DWITH_LOGS_PREVIEW=ON
-DBUILD_TESTING=OFF
-DWITH_EXAMPLES=OFF)

Expand All @@ -24,7 +24,7 @@ function(build_opentelemetry)
${opentelemetry_BINARY_DIR}/sdk/src/logs/libopentelemetry_logs.a
${opentelemetry_BINARY_DIR}/sdk/src/resource/libopentelemetry_resources.a
${opentelemetry_BINARY_DIR}/sdk/src/common/libopentelemetry_common.a
${opentelemetry_BINARY_DIR}/ext/src/http/client/curl/libhttp_client_curl.a
${opentelemetry_BINARY_DIR}/ext/src/http/client/curl/libopentelemetry_http_client_curl.a
${CURL_LIBRARIES}
)

Expand All @@ -36,7 +36,7 @@ function(build_opentelemetry)
include_directories(SYSTEM ${opentelemetry_include_dir})

set(opentelemetry_deps opentelemetry_trace opentelemetry_logs opentelemetry_resources opentelemetry_common
http_client_curl
opentelemetry_http_client_curl
${CURL_LIBRARIES})

set(make_cmd ${CMAKE_COMMAND} --build <BINARY_DIR> --target
Expand All @@ -47,7 +47,6 @@ function(build_opentelemetry)
opentelemetry-cpp
GIT_REPOSITORY https://github.com/open-telemetry/opentelemetry-cpp.git
GIT_TAG "${opentelemetry-cpp-tag}"
GIT_SHALLOW 1
GIT_SUBMODULES "third_party/opentelemetry-proto"
SOURCE_DIR ${opentelemetry_SOURCE_DIR}
PREFIX "opentelemetry-cpp"
Expand All @@ -65,8 +64,8 @@ function(build_opentelemetry)
"sdk/src/resource/libopentelemetry_resources.a")
target_create("opentelemetry_common"
"sdk/src/common/libopentelemetry_common.a")
target_create("http_client_curl"
"ext/src/http/client/curl/libhttp_client_curl.a")
target_create("opentelemetry_http_client_curl"
"ext/src/http/client/curl/libopentelemetry_http_client_curl.a")
add_library(opentelemetry::libopentelemetry INTERFACE IMPORTED)
add_dependencies(opentelemetry::libopentelemetry opentelemetry-cpp)
set_target_properties(
Expand Down