Fix CI checks

Author: chusitoo

.github/workflows/ci.yml

@@ -452,8 +452,7 @@ jobs:
       run: |
         sudo ./ci/setup_grpc.sh
         ./ci/do_ci.sh cmake.exporter.otprotocol.test
-        - name: generate test cert
-    - name: generate test cert      
+    - name: generate test cert
       env:
         CFSSL_VERSION: 1.6.3
       run: |

functional/otlp/CMakeLists.txt

@@ -6,13 +6,11 @@ include_directories(${CMAKE_SOURCE_DIR}/exporters/otlp/include)
 if(WITH_OTLP_GRPC)
   add_executable(func_otlp_grpc func_grpc_main.cc)
   target_link_libraries(func_otlp_grpc ${CMAKE_THREAD_LIBS_INIT}
-                        opentelemetry_trace
-                        opentelemetry_exporter_otlp_grpc)
+                        opentelemetry_trace opentelemetry_exporter_otlp_grpc)
 endif()
 
 if(WITH_OTLP_HTTP)
   add_executable(func_otlp_http func_http_main.cc)
   target_link_libraries(func_otlp_http ${CMAKE_THREAD_LIBS_INIT}
-                        opentelemetry_trace
-                        opentelemetry_exporter_otlp_http)
+                        opentelemetry_trace opentelemetry_exporter_otlp_http)
 endif()

functional/otlp/func_grpc_main.cc

@@ -326,11 +326,14 @@ int test_mtls_no_client_cert();
 int test_mtls_no_client_key();
 int test_mtls_wrong_client_key();
 
-static const test_case all_tests[] = {{"mtls-ok", test_mtls_ok},
-                                      {"mtls-no-ca-cert", test_mtls_no_ca_cert},
-                                      {"mtls-no-client-cert", test_mtls_no_client_cert},
-                                      {"mtls-no-client-key", test_mtls_no_client_key},
-                                      {"", nullptr}};
+static const test_case all_tests[] = {
+#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
+    {"mtls-ok", test_mtls_ok},
+    {"mtls-no-ca-cert", test_mtls_no_ca_cert},
+    {"mtls-no-client-cert", test_mtls_no_client_cert},
+    {"mtls-no-client-key", test_mtls_no_client_key},
+#endif  // ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
+    {"", nullptr}};
 
 void list_test_cases()
 {
@@ -454,6 +457,7 @@ int expect_export_failed()
   return TEST_FAILED;
 }
 
+#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
 int test_mtls_ok()
 {
   otlp::OtlpGrpcExporterOptions opts;
@@ -586,3 +590,4 @@ int test_mtls_no_client_key()
 
   return expect_connection_failed();
 }
+#endif  // ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW

functional/otlp/run_test.sh

@@ -130,7 +130,7 @@ echo "###############################################################"
 echo ""
 
 docker run -d \
-  -v `pwd`/otel-docker-config-https-mtls.yaml:/otel-cpp/otel-config-mtls.yaml${USE_MOUNT_OPTION} \
+  -v `pwd`/otel-docker-config-https-mtls.yaml:/otel-cpp/otel-config.yaml${USE_MOUNT_OPTION} \
   -v `pwd`/../cert/ca.pem:/otel-cpp/ca.pem${USE_MOUNT_OPTION} \
   -v `pwd`/../cert/client_cert.pem:/otel-cpp/client_cert.pem${USE_MOUNT_OPTION} \
   -v `pwd`/../cert/server_cert.pem:/otel-cpp/server_cert.pem${USE_MOUNT_OPTION} \

functional/otlp/run_test_mode.sh

@@ -30,6 +30,8 @@ export CERT_DIR=../cert
 
 export TEST_BIN_DIR=${BUILD_DIR}/functional/otlp/
 
+[ ! -f "${TEST_BIN_DIR}/${TEST_EXECUTABLE}" ] && echo "${TEST_EXECUTABLE} not built in this configuration" && exit 0
+
 ${TEST_BIN_DIR}/${TEST_EXECUTABLE} --list > test_list.txt
 
 export TEST_FULL_NAME=""