Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
runs-on: ubuntu-24.04
env:
CXX_STANDARD: '17'
BUILD_TYPE: 'Debug'
steps:
- name: Harden the runner (Audit all outbound calls)
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
Expand All @@ -75,6 +76,10 @@ jobs:
sudo -E ./ci/setup_ci_environment.sh
sudo -E ./ci/setup_cmake.sh
sudo -E ./ci/setup_googletest.sh
- name: Install abseil, protobuf, and grpc with apt
run: |
sudo -E apt-get update
sudo -E apt-get install -y libabsl-dev libprotobuf-dev libgrpc++-dev protobuf-compiler protobuf-compiler-grpc
- name: run fetch content cmake test
run: |
./ci/do_ci.sh cmake.fetch_content.test
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ Increment the:
* [EXPORTER] ostream log exporter, fixed memory ownership issues
[#3417](https://github.com/open-telemetry/opentelemetry-cpp/pull/3417)

* [TEST] Test all components in a CMake super build
[#3433](https://github.com/open-telemetry/opentelemetry-cpp/pull/3433)

Important changes:

* [EXPORTER] ostream log exporter, fixed memory ownership issues
Expand Down
22 changes: 11 additions & 11 deletions ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -535,17 +535,17 @@ elif [[ "$1" == "cmake.fetch_content.test" ]]; then
-DWITH_THREAD_INSTRUMENTATION_PREVIEW=ON \
-DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW=ON \
-DWITH_OTLP_RETRY_PREVIEW=ON \
-DWITH_OTLP_GRPC=OFF \
-DWITH_OTLP_HTTP=OFF \
-DWITH_OTLP_FILE=OFF \
-DWITH_OTLP_HTTP_COMPRESSION=OFF \
-DWITH_HTTP_CLIENT_CURL=OFF \
-DWITH_PROMETHEUS=OFF \
-DWITH_ZIPKIN=OFF \
-DWITH_ELASTICSEARCH=OFF \
-DWITH_EXAMPLES=OFF \
-DWITH_EXAMPLES_HTTP=OFF \
-DBUILD_W3CTRACECONTEXT_TEST=OFF \
-DWITH_OTLP_GRPC=ON \
-DWITH_OTLP_HTTP=ON \
-DWITH_OTLP_FILE=ON \
-DWITH_OTLP_HTTP_COMPRESSION=ON \
-DWITH_HTTP_CLIENT_CURL=ON \
-DWITH_PROMETHEUS=ON \
-DWITH_ZIPKIN=ON \
-DWITH_ELASTICSEARCH=ON \
-DWITH_EXAMPLES=ON \
-DWITH_EXAMPLES_HTTP=ON \
-DBUILD_W3CTRACECONTEXT_TEST=ON \
-DOPENTELEMETRY_INSTALL=OFF \
-DOPENTELEMETRY_CPP_SRC_DIR="${SRC_DIR}" \
"${SRC_DIR}/install/test/cmake/fetch_content_test"
Expand Down
31 changes: 30 additions & 1 deletion install/test/cmake/fetch_content_test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,18 @@ FetchContent_MakeAvailable(opentelemetry-cpp)
add_executable(
fetch_content_src_test
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_api.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_sdk.cc)
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_sdk.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_ext_common.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_ext_http_curl.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_ostream.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_in_memory.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_otlp_common.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_otlp_grpc.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_otlp_http.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_otlp_file.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_prometheus.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_zipkin.cc
${OPENTELEMETRY_CPP_SRC_DIR}/install/test/src/test_exporters_elasticsearch.cc)

target_link_libraries(
fetch_content_src_test
Expand All @@ -42,6 +53,24 @@ target_link_libraries(
opentelemetry-cpp::metrics
opentelemetry-cpp::trace
opentelemetry-cpp::logs
opentelemetry-cpp::http_client_curl
opentelemetry-cpp::in_memory_span_exporter
opentelemetry-cpp::in_memory_metric_exporter
opentelemetry-cpp::ostream_log_record_exporter
opentelemetry-cpp::ostream_metrics_exporter
opentelemetry-cpp::ostream_span_exporter
opentelemetry-cpp::otlp_file_exporter
opentelemetry-cpp::otlp_file_log_record_exporter
opentelemetry-cpp::otlp_file_metric_exporter
opentelemetry-cpp::otlp_grpc_exporter
opentelemetry-cpp::otlp_grpc_log_record_exporter
opentelemetry-cpp::otlp_grpc_metrics_exporter
opentelemetry-cpp::otlp_http_exporter
opentelemetry-cpp::otlp_http_log_record_exporter
opentelemetry-cpp::otlp_http_metric_exporter
opentelemetry-cpp::prometheus_exporter
opentelemetry-cpp::zipkin_trace_exporter
opentelemetry-cpp::elasticsearch_log_record_exporter
GTest::gtest
GTest::gtest_main)

Expand Down
Loading