Build opentelemetry-proto collector interface with cmake only if WITH_OTLP_GRPC is enabled. (#1061)

Author: lalitb

CMakeLists.txt

@@ -330,7 +330,9 @@ endif()
 if(WITH_OTLP)
   set(protobuf_MODULE_COMPATIBLE ON)
   find_package(Protobuf)
-  find_package(gRPC)
+  if(WITH_OTLP_GRPC)
+    find_package(gRPC)
+  endif()
   if((NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND) OR (NOT gRPC_FOUND))
     if(WIN32 AND (NOT DEFINED CMAKE_TOOLCHAIN_FILE))
       install_windows_deps()
@@ -346,7 +348,7 @@ if(WITH_OTLP)
     if(NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND)
       find_package(Protobuf REQUIRED)
     endif()
-    if(NOT gRPC_FOUND)
+    if(WITH_OTLP_GRPC AND NOT gRPC_FOUND)
       find_package(gRPC)
     endif()
     if(WIN32)

cmake/opentelemetry-proto.cmake

@@ -79,48 +79,56 @@ set(TRACE_SERVICE_PB_CPP_FILE
 set(TRACE_SERVICE_PB_H_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.pb.h"
 )
+if(WITH_OTLP_GRPC)
 set(TRACE_SERVICE_GRPC_PB_CPP_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.cc"
 )
 set(TRACE_SERVICE_GRPC_PB_H_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/trace/v1/trace_service.grpc.pb.h"
 )
+endif()
 set(LOGS_SERVICE_PB_CPP_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.pb.cc"
 )
 set(LOGS_SERVICE_PB_H_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.pb.h"
 )
+if(WITH_OTLP_GRPC)
 set(LOGS_SERVICE_GRPC_PB_CPP_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.cc"
 )
 set(LOGS_SERVICE_GRPC_PB_H_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/logs/v1/logs_service.grpc.pb.h"
 )
+endif()
 set(METRICS_SERVICE_PB_CPP_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.pb.cc"
 )
 set(METRICS_SERVICE_PB_H_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.pb.h"
 )
+if(WITH_OTLP_GRPC)
 set(METRICS_SERVICE_GRPC_PB_CPP_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.cc"
 )
 set(METRICS_SERVICE_GRPC_PB_H_FILE
     "${GENERATED_PROTOBUF_PATH}/opentelemetry/proto/collector/metrics/v1/metrics_service.grpc.pb.h"
 )
+endif()
 
 foreach(IMPORT_DIR ${PROTOBUF_IMPORT_DIRS})
   list(APPEND PROTOBUF_INCLUDE_FLAGS "-I${IMPORT_DIR}")
 endforeach()
 
-
+if(WITH_OTLP_GRPC)
 if(CMAKE_CROSSCOMPILING)
     find_program(gRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin)
 else()
     set(gRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
 endif()
+endif()
 
+if(WITH_OTLP_GRPC)
 add_custom_command(
   OUTPUT ${COMMON_PB_H_FILE}
          ${COMMON_PB_CPP_FILE}
@@ -151,9 +159,34 @@ add_custom_command(
     --plugin=protoc-gen-grpc="${gRPC_CPP_PLUGIN_EXECUTABLE}" ${COMMON_PROTO}
     ${RESOURCE_PROTO} ${TRACE_PROTO} ${LOGS_PROTO} ${METRICS_PROTO}
     ${TRACE_SERVICE_PROTO} ${LOGS_SERVICE_PROTO} ${METRICS_SERVICE_PROTO})
+else()
+add_custom_command(
+  OUTPUT ${COMMON_PB_H_FILE}
+         ${COMMON_PB_CPP_FILE}
+         ${RESOURCE_PB_H_FILE}
+         ${RESOURCE_PB_CPP_FILE}
+         ${TRACE_PB_H_FILE}
+         ${TRACE_PB_CPP_FILE}
+         ${LOGS_PB_H_FILE}
+         ${LOGS_PB_CPP_FILE}
+         ${METRICS_PB_H_FILE}
+         ${METRICS_PB_CPP_FILE}
+         ${TRACE_SERVICE_PB_H_FILE}
+         ${TRACE_SERVICE_PB_CPP_FILE}
+         ${LOGS_SERVICE_PB_H_FILE}
+         ${LOGS_SERVICE_PB_CPP_FILE}
+         ${METRICS_SERVICE_PB_H_FILE}
+         ${METRICS_SERVICE_PB_CPP_FILE}
+  COMMAND
+    ${PROTOBUF_PROTOC_EXECUTABLE} ARGS "--proto_path=${PROTO_PATH}"
+    ${PROTOBUF_INCLUDE_FLAGS} "--cpp_out=${GENERATED_PROTOBUF_PATH}"
+    ${COMMON_PROTO} ${RESOURCE_PROTO} ${TRACE_PROTO} ${LOGS_PROTO} ${METRICS_PROTO}
+    ${TRACE_SERVICE_PROTO} ${LOGS_SERVICE_PROTO} ${METRICS_SERVICE_PROTO})
+endif()
 
 include_directories("${GENERATED_PROTOBUF_PATH}")
 
+if(WITH_OTLP_GRPC)
 add_library(
   opentelemetry_proto STATIC
   ${COMMON_PB_CPP_FILE}
@@ -167,6 +200,18 @@ add_library(
   ${LOGS_SERVICE_GRPC_PB_CPP_FILE}
   ${METRICS_SERVICE_PB_CPP_FILE}
   ${METRICS_SERVICE_GRPC_PB_CPP_FILE})
+else()
+add_library(
+  opentelemetry_proto STATIC
+  ${COMMON_PB_CPP_FILE}
+  ${RESOURCE_PB_CPP_FILE}
+  ${TRACE_PB_CPP_FILE}
+  ${LOGS_PB_CPP_FILE}
+  ${METRICS_PB_CPP_FILE}
+  ${TRACE_SERVICE_PB_CPP_FILE}
+  ${LOGS_SERVICE_PB_CPP_FILE}
+  ${METRICS_SERVICE_PB_CPP_FILE})
+endif()
 
 if(needs_proto_download)
     add_dependencies(opentelemetry_proto opentelemetry-proto)

examples/CMakeLists.txt

@@ -2,6 +2,8 @@ add_subdirectory(common)
 include_directories(common)
 if(WITH_OTLP_GRPC OR WITH_OTLP_HTTP)
   add_subdirectory(otlp)
+endif()
+if(WITH_OTLP_GRPC)
   add_subdirectory(grpc)
 endif()
 if(WITH_ETW)