File tree Expand file tree Collapse file tree 5 files changed +45
-8
lines changed
Expand file tree Collapse file tree 5 files changed +45
-8
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,9 @@ RUN apt update && apt install -y \
1414 ninja-build \
1515 clang-format \
1616 clang-tidy \
17+ autoconf \
18+ automake \
19+ libtool \
1720 python3-pip
1821
1922RUN pip install conan --break-system-packages
Original file line number Diff line number Diff line change @@ -458,7 +458,8 @@ switch ($action) {
458458 }
459459 " cmake.dll.install.test" {
460460 cd " $BUILD_DIR "
461- rm - Recurse - Force " $INSTALL_TEST_DIR \*"
461+ Remove-Item - Recurse - Force " $BUILD_DIR \*"
462+ Remove-Item - Recurse - Force " $INSTALL_TEST_DIR \*"
462463
463464 $CMAKE_OPTIONS = @ (
464465 " -DCMAKE_CXX_STANDARD=17" ,
@@ -475,8 +476,20 @@ switch ($action) {
475476 - DWITH_ABSEIL= OFF `
476477 - DWITH_THREAD_INSTRUMENTATION_PREVIEW= ON `
477478 - DWITH_METRICS_EXEMPLAR_PREVIEW= ON `
479+ - DWITH_ASYNC_EXPORT_PREVIEW= ON `
478480 - DWITH_ETW= ON `
479- - DOPENTELEMETRY_INSTALL= ON
481+ - DOPENTELEMETRY_INSTALL= ON `
482+ - DWITH_OTLP_GRPC_SSL_MTLS_PREVIEW= OFF `
483+ - DWITH_OTLP_RETRY_PREVIEW= OFF `
484+ - DWITH_OTLP_GRPC= OFF `
485+ - DWITH_OTLP_HTTP= OFF `
486+ - DWITH_OTLP_FILE= OFF `
487+ - DWITH_OTLP_HTTP_COMPRESSION= OFF `
488+ - DWITH_HTTP_CLIENT_CURL= OFF `
489+ - DWITH_PROMETHEUS= OFF `
490+ - DWITH_ZIPKIN= OFF `
491+ - DWITH_ELASTICSEARCH= OFF `
492+ - DWITH_EXAMPLES= OFF `
480493
481494 $exit = $LASTEXITCODE
482495 if ($exit -ne 0 ) {
Original file line number Diff line number Diff line change @@ -245,6 +245,16 @@ elif [[ "$1" == "cmake.abseil.test" ]]; then
245245 make test
246246 exit 0
247247elif [[ " $1 " == " cmake.opentracing_shim.test" ]]; then
248+ cd " ${BUILD_DIR} "
249+ rm -rf *
250+ cmake " ${CMAKE_OPTIONS[@]} " \
251+ -DCMAKE_CXX_FLAGS=" -Werror -Wno-error=redundant-move $CXXFLAGS " \
252+ -DWITH_OPENTRACING=ON \
253+ " ${SRC_DIR} "
254+ make -j $( nproc)
255+ make test
256+ exit 0
257+ elif [[ " $1 " == " cmake.opentracing_shim.install.test" ]]; then
248258 cd " ${BUILD_DIR} "
249259 rm -rf *
250260 rm -rf ${INSTALL_TEST_DIR} /*
@@ -262,7 +272,6 @@ elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
262272 " api"
263273 " sdk"
264274 " ext_common"
265- " ext_http_curl"
266275 " exporters_in_memory"
267276 " exporters_ostream"
268277 " shims_opentracing"
@@ -273,7 +282,7 @@ elif [[ "$1" == "cmake.opentracing_shim.test" ]]; then
273282 " ${CMAKE_OPTIONS[@]} " \
274283 " -DCMAKE_PREFIX_PATH=${INSTALL_TEST_DIR} " \
275284 " -DINSTALL_TEST_CMAKE_OPTIONS=${CMAKE_OPTIONS_STRING} " \
276- " -DINSTALL_TEST_COMPONENTS=${EXPECTED_COMPONENTS } "
285+ " -DINSTALL_TEST_COMPONENTS=${EXPECTED_COMPONENTS_STRING } "
277286 ctest --test-dir " ${BUILD_DIR} /install_test" --output-on-failure
278287 exit 0
279288elif [[ " $1 " == " cmake.c++20.test" ]]; then
Original file line number Diff line number Diff line change 1+ # Copyright The OpenTelemetry Authors
2+ # SPDX-License-Identifier: Apache-2.0
3+
14[requires]
25zlib/1.3.1
3- libcurl/8.5.0
6+ libcurl/8.12.1
47abseil/20240116.2
58protobuf/5.27.0
6- grpc/1.69.0
9+ grpc/1.67.1
710nlohmann_json/3.11.3
811prometheus-cpp/1.3.0
12+ opentracing-cpp/1.6.0
913
1014[options]
1115grpc/*:fPIC=True
@@ -20,9 +24,11 @@ protobuf/*:fPIC=True
2024protobuf/*:shared=False
2125abseil/*:fPIC=True
2226abseil/*:shared=False
27+ opentracing-cpp/*:fPIC=True
28+ opentracing-cpp/*:shared=True
2329
2430[test_requires]
25- gtest/1.14 .0
31+ gtest/1.16 .0
2632benchmark/1.9.1
2733
2834[generators]
Original file line number Diff line number Diff line change 1+ # Copyright The OpenTelemetry Authors
2+ # SPDX-License-Identifier: Apache-2.0
3+
14[requires]
25zlib/1.2.13
36libcurl/8.5.0
47abseil/20230125.3
58protobuf/3.21.12
69grpc/1.54.3
7- nlohmann_json/3.11.3
10+ nlohmann_json/3.10.5
811prometheus-cpp/1.3.0
12+ opentracing-cpp/1.6.0
913
1014[options]
1115grpc/*:fPIC=True
@@ -20,6 +24,8 @@ protobuf/*:fPIC=True
2024protobuf/*:shared=False
2125abseil/*:fPIC=True
2226abseil/*:shared=False
27+ opentracing-cpp/*:fPIC=True
28+ opentracing-cpp/*:shared=True
2329
2430[test_requires]
2531gtest/1.14.0
You can’t perform that action at this time.
0 commit comments