Update current dependencies to latest

CMakeLists.txt

@@ -47,7 +47,8 @@ configure_file(golang/pkg/client/version.go.in ${PROJECT_SOURCE_DIR}/golang/pkg/
 
 if(NOT DEFINED ENV{VERSION_ONLY})
 
-list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_BINARY_DIR})
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

cmake/opentelemetry-proto.cmake

@@ -2,45 +2,48 @@
 # SPDX-License-Identifier: Apache-2.0
 
 #
-# The dependency on opentelemetry-proto can be provided different ways.
-# By order of decreasing priority, options are:
+# The dependency on opentelemetry-proto can be provided different ways. By order
+# of decreasing priority, options are:
 #
 # 1 - Use a provided package
 #
 # This is useful to build opentelemetry-cpp as part of a super project.
 #
-# The super project provides the path to the opentelemetry-proto
-# source code using variable ${OTELCPP_PROTO_PATH}
+# The super project provides the path to the opentelemetry-proto source code
+# using variable ${OTELCPP_PROTO_PATH}
 #
 # 2 - Search for a opentelemetry-proto git submodule
 #
-# When git submodule is used,
-# the opentelemetry-proto code is located in:
+# When git submodule is used, the opentelemetry-proto code is located in:
 # third_party/opentelemetry-proto
 #
 # 3 - Download opentelemetry-proto from github
 #
-# Code from the required version is used,
-# unless a specific release tag is provided
-# in variable ${opentelemetry-proto}
+# Code from the required version is used, unless a specific release tag is
+# provided in variable ${opentelemetry-proto}
 #
 
 if(OTELCPP_PROTO_PATH)
-  if(NOT EXISTS "${OTELCPP_PROTO_PATH}/opentelemetry/proto/common/v1/common.proto")
-    message(FATAL_ERROR "OTELCPP_PROTO_PATH does not point to a opentelemetry-proto repository")
+  if(NOT EXISTS
+     "${OTELCPP_PROTO_PATH}/opentelemetry/proto/common/v1/common.proto")
+    message(
+      FATAL_ERROR
+        "OTELCPP_PROTO_PATH does not point to a opentelemetry-proto repository")
   endif()
   message(STATUS "opentelemetry-proto dependency satisfied by: external path")
   set(PROTO_PATH ${OTELCPP_PROTO_PATH})
   set(needs_proto_download FALSE)
 else()
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto/.git)
     message(STATUS "opentelemetry-proto dependency satisfied by: git submodule")
-    set(PROTO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto")
+    set(PROTO_PATH
+        "${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto")
     set(needs_proto_download FALSE)
   else()
-    message(STATUS "opentelemetry-proto dependency satisfied by: github download")
+    message(
+      STATUS "opentelemetry-proto dependency satisfied by: github download")
     if("${opentelemetry-proto}" STREQUAL "")
-      set(opentelemetry-proto "v0.19.0")
+      set(opentelemetry-proto "v1.0.0")
     endif()
     include(ExternalProject)
     ExternalProject_Add(
@@ -62,8 +65,6 @@ else()
   endif()
 endif()
 
-include(${PROJECT_SOURCE_DIR}/cmake/proto-options-patch.cmake)
-
 set(COMMON_PROTO "${PROTO_PATH}/opentelemetry/proto/common/v1/common.proto")
 set(RESOURCE_PROTO
     "${PROTO_PATH}/opentelemetry/proto/resource/v1/resource.proto")
@@ -166,91 +167,129 @@ if(WITH_OTLP_GRPC)
   message(STATUS "gRPC_CPP_PLUGIN_EXECUTABLE=${gRPC_CPP_PLUGIN_EXECUTABLE}")
 endif()
 
-if(WITH_OTLP_GRPC)
-  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}
-           ${TRACE_SERVICE_GRPC_PB_H_FILE}
-           ${TRACE_SERVICE_GRPC_PB_CPP_FILE}
-           ${LOGS_SERVICE_PB_H_FILE}
-           ${LOGS_SERVICE_PB_CPP_FILE}
-           ${LOGS_SERVICE_GRPC_PB_H_FILE}
-           ${LOGS_SERVICE_GRPC_PB_CPP_FILE}
-           ${METRICS_SERVICE_PB_H_FILE}
-           ${METRICS_SERVICE_PB_CPP_FILE}
-           ${METRICS_SERVICE_GRPC_PB_H_FILE}
-           ${METRICS_SERVICE_GRPC_PB_CPP_FILE}
-    COMMAND
-      ${PROTOBUF_PROTOC_EXECUTABLE} ARGS "--experimental_allow_proto3_optional"
-      "--proto_path=${PROTO_PATH}" ${PROTOBUF_INCLUDE_FLAGS}
-      "--cpp_out=${GENERATED_PROTOBUF_PATH}"
-      "--grpc_out=generate_mock_code=true:${GENERATED_PROTOBUF_PATH}"
-      --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 "--experimental_allow_proto3_optional"
-      "--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})
+set(PROTOBUF_COMMON_FLAGS "--proto_path=${PROTO_PATH}"
+                          "--cpp_out=${GENERATED_PROTOBUF_PATH}")
+# --experimental_allow_proto3_optional is available from 3.13 and be stable and
+# enabled by default from 3.16
+if(Protobuf_VERSION AND Protobuf_VERSION VERSION_LESS "3.16")
+  list(APPEND PROTOBUF_COMMON_FLAGS "--experimental_allow_proto3_optional")
+elseif(PROTOBUF_VERSION AND PROTOBUF_VERSION VERSION_LESS "3.16")
+  list(APPEND PROTOBUF_COMMON_FLAGS "--experimental_allow_proto3_optional")
 endif()
 
-include_directories("${GENERATED_PROTOBUF_PATH}")
-
-if(WITH_OTLP_GRPC)
-  add_library(
-    opentelemetry_proto STATIC
+set(PROTOBUF_GENERATED_FILES
+    ${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}
-    ${TRACE_SERVICE_GRPC_PB_CPP_FILE}
+    ${LOGS_SERVICE_PB_H_FILE}
     ${LOGS_SERVICE_PB_CPP_FILE}
+    ${METRICS_SERVICE_PB_H_FILE}
+    ${METRICS_SERVICE_PB_CPP_FILE})
+
+if(WITH_OTLP_GRPC)
+  list(APPEND PROTOBUF_COMMON_FLAGS
+       "--grpc_out=generate_mock_code=true:${GENERATED_PROTOBUF_PATH}"
+       --plugin=protoc-gen-grpc="${gRPC_CPP_PLUGIN_EXECUTABLE}")
+
+  list(
+    APPEND
+    PROTOBUF_GENERATED_FILES
+    ${TRACE_SERVICE_GRPC_PB_H_FILE}
+    ${TRACE_SERVICE_GRPC_PB_CPP_FILE}
+    ${LOGS_SERVICE_GRPC_PB_H_FILE}
     ${LOGS_SERVICE_GRPC_PB_CPP_FILE}
-    ${METRICS_SERVICE_PB_CPP_FILE}
+    ${METRICS_SERVICE_GRPC_PB_H_FILE}
     ${METRICS_SERVICE_GRPC_PB_CPP_FILE})
+endif()
+
+set(PROTOBUF_RUN_PROTOC_COMMAND "\"${PROTOBUF_PROTOC_EXECUTABLE}\"")
+foreach(
+  PROTOBUF_RUN_PROTOC_ARG
+  ${PROTOBUF_COMMON_FLAGS}
+  ${PROTOBUF_INCLUDE_FLAGS}
+  ${COMMON_PROTO}
+  ${RESOURCE_PROTO}
+  ${TRACE_PROTO}
+  ${LOGS_PROTO}
+  ${METRICS_PROTO}
+  ${TRACE_SERVICE_PROTO}
+  ${LOGS_SERVICE_PROTO}
+  ${METRICS_SERVICE_PROTO})
+  set(PROTOBUF_RUN_PROTOC_COMMAND
+      "${PROTOBUF_RUN_PROTOC_COMMAND} \"${PROTOBUF_RUN_PROTOC_ARG}\"")
+endforeach()
+
+add_custom_command(
+  OUTPUT ${PROTOBUF_GENERATED_FILES}
+  COMMAND
+    ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTOBUF_COMMON_FLAGS}
+    ${PROTOBUF_INCLUDE_FLAGS} ${COMMON_PROTO} ${RESOURCE_PROTO} ${TRACE_PROTO}
+    ${LOGS_PROTO} ${METRICS_PROTO} ${TRACE_SERVICE_PROTO} ${LOGS_SERVICE_PROTO}
+    ${METRICS_SERVICE_PROTO}
+  COMMENT "[Run]: ${PROTOBUF_RUN_PROTOC_COMMAND}")
+
+include_directories("${GENERATED_PROTOBUF_PATH}")
+
+unset(OTELCPP_PROTO_TARGET_OPTIONS)
+if(CMAKE_SYSTEM_NAME MATCHES "Windows|MinGW|WindowsStore")
+  list(APPEND OTELCPP_PROTO_TARGET_OPTIONS STATIC)
+elseif(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
+  list(APPEND OTELCPP_PROTO_TARGET_OPTIONS SHARED)
 else()
+  list(APPEND OTELCPP_PROTO_TARGET_OPTIONS STATIC)
+endif()
+
+set(OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto)
+add_library(
+  opentelemetry_proto
+  ${OTELCPP_PROTO_TARGET_OPTIONS}
+  ${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})
+
+if(WITH_ABSEIL)
+  target_link_libraries(opentelemetry_proto PUBLIC absl::bad_variant_access)
+endif()
+
+if(WITH_OTLP_GRPC)
   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})
+    opentelemetry_proto_grpc
+    ${OTELCPP_PROTO_TARGET_OPTIONS} ${TRACE_SERVICE_GRPC_PB_CPP_FILE}
+    ${LOGS_SERVICE_GRPC_PB_CPP_FILE} ${METRICS_SERVICE_GRPC_PB_CPP_FILE})
+
+  list(APPEND OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto_grpc)
+  target_link_libraries(opentelemetry_proto_grpc
+    PUBLIC opentelemetry_proto)
+
+  get_target_property(grpc_lib_type gRPC::grpc++ TYPE)
+  if (grpc_lib_type STREQUAL "SHARED_LIBRARY")
+    target_link_libraries(opentelemetry_proto_grpc
+      PUBLIC gRPC::grpc++)
+  endif()
+  set_target_properties(opentelemetry_proto_grpc PROPERTIES EXPORT_NAME
+                                                            proto_grpc)
+  patch_protobuf_targets(opentelemetry_proto_grpc)
+  get_target_property(GRPC_INCLUDE_DIRECTORY gRPC::grpc++
+                      INTERFACE_INCLUDE_DIRECTORIES)
+  if(GRPC_INCLUDE_DIRECTORY)
+    target_include_directories(
+      opentelemetry_proto_grpc
+      PUBLIC "$<BUILD_INTERFACE:${GRPC_INCLUDE_DIRECTORY}>")
+  endif()
 endif()
 
 if(needs_proto_download)
@@ -259,27 +298,41 @@ endif()
 set_target_properties(opentelemetry_proto PROPERTIES EXPORT_NAME proto)
 patch_protobuf_targets(opentelemetry_proto)
 
-install(
-  TARGETS opentelemetry_proto
-  EXPORT "${PROJECT_NAME}-target"
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+if(OPENTELEMETRY_INSTALL)
+  install(
+    TARGETS ${OPENTELEMETRY_PROTO_TARGETS}
+    EXPORT "${PROJECT_NAME}-target"
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-install(
-  DIRECTORY ${GENERATED_PROTOBUF_PATH}/opentelemetry
-  DESTINATION include
-  FILES_MATCHING
-  PATTERN "*.h")
+  install(
+    DIRECTORY ${GENERATED_PROTOBUF_PATH}/opentelemetry
+    DESTINATION include
+    FILES_MATCHING
+    PATTERN "*.h")
+endif()
 
 if(TARGET protobuf::libprotobuf)
   target_link_libraries(opentelemetry_proto PUBLIC ${CONAN_LIBS_PROTOBUF})
 else() # cmake 3.8 or lower
   target_include_directories(opentelemetry_proto
                              PUBLIC ${Protobuf_INCLUDE_DIRS})
-  target_link_libraries(opentelemetry_proto INTERFACE ${Protobuf_LIBRARIES})
+  target_link_libraries(opentelemetry_proto PUBLIC ${Protobuf_LIBRARIES})
 endif()
 
-if(BUILD_SHARED_LIBS)
-  set_property(TARGET opentelemetry_proto PROPERTY POSITION_INDEPENDENT_CODE ON)
+if(WITH_OTLP_GRPC)
+  if(WITH_ABSEIL)
+    find_package(absl CONFIG)
+    if(TARGET absl::synchronization)
+      target_link_libraries(opentelemetry_proto_grpc
+                            PRIVATE absl::synchronization)
+    endif()
+  endif()
 endif()
+
+if(BUILD_SHARED_LIBS)
+  foreach(proto_target ${OPENTELEMETRY_PROTO_TARGETS})
+    set_property(TARGET ${proto_target} PROPERTY POSITION_INDEPENDENT_CODE ON)
+  endforeach()
+endif()

cmake/proto-options-patch.cmake → cmake/opentelemetry-tools.cmake

@@ -11,7 +11,7 @@ endmacro()
 if(NOT PATCH_PROTOBUF_SOURCES_OPTIONS_SET)
   if(MSVC)
     unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE)
-    set(PATCH_PROTOBUF_SOURCES_OPTIONS /wd4244 /wd4251 /wd4267 /wd4309)
+    set(PATCH_PROTOBUF_SOURCES_OPTIONS /wd4244 /wd4251 /wd4267 /wd4309 /wd4668 /wd4946 /wd6001 /wd6244 /wd6246)
 
     if(MSVC_VERSION GREATER_EQUAL 1922)
       # see
@@ -31,7 +31,7 @@ if(NOT PATCH_PROTOBUF_SOURCES_OPTIONS_SET)
     unset(PATCH_PROTOBUF_SOURCES_OPTIONS CACHE)
     include(CheckCXXCompilerFlag)
     check_append_cxx_compiler_flag(
-      PATCH_PROTOBUF_SOURCES_OPTIONS -Wno-type-limits
+      PATCH_PROTOBUF_SOURCES_OPTIONS -Wno-type-limits -Wno-missing-declarations 
       -Wno-deprecated-declarations -Wno-unused-parameter)
   endif()
   set(PATCH_PROTOBUF_SOURCES_OPTIONS_SET TRUE)