record thirdparty dependency versions on install. Use module search mode for older versions of protobuf. Fix curl and nlohmann-json flags

Author: dbarker

CMakeLists.txt

@@ -388,6 +388,23 @@ if(WITH_PROMETHEUS)
       set(CMAKE_CXX_CLANG_TIDY ${SAVED_CMAKE_CXX_CLANG_TIDY})
       set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE
           ${SAVED_CMAKE_CXX_INCLUDE_WHAT_YOU_USE})
+
+      # Get the version of the prometheus-cpp submodule
+      find_package(Git QUIET)
+      if(Git_FOUND)
+        execute_process(
+          COMMAND ${GIT_EXECUTABLE} describe --tags --always
+          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/third_party/prometheus-cpp
+          OUTPUT_VARIABLE prometheus-cpp_VERSION
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+        string(REGEX REPLACE "^v" "" prometheus-cpp_VERSION
+                             "${prometheus-cpp_VERSION}")
+      endif()
+
+      message(
+        STATUS
+          "Using local prometheus-cpp from submodule. Version = ${prometheus-cpp_VERSION}"
+      )
     else()
       message(
         FATAL_ERROR

cmake/find-package-support-functions.cmake

@@ -161,7 +161,6 @@ function (is_dependency_required dependency_in components_in is_required_out)
     message(FATAL_ERROR " is_dependency_required: The BUILT_WITH_${dependency_in} flag is required but not defined in the 'thirdparty-built-with-flags.cmake' file")
   elseif(NOT BUILT_WITH_${dependency_in})
     set(${is_required_out} FALSE PARENT_SCOPE)
-    message(DEBUG "is_dependency_required: ${dependency_in} is not required because that package was not built with it.")
   else()
     foreach(component IN LISTS ${components_in})
       set(is_required_by_component FALSE)
@@ -205,6 +204,11 @@ function(find_required_dependencies components_in)
         message(DEBUG "find_required_dependencies: calling find_dependency(${dependency})...")
         find_dependency(${dependency})
       endif()
+      if(${dependency}_FOUND AND DEFINED BUILT_WITH_${dependency}_VERSION AND DEFINED ${dependency}_VERSION)
+        if(NOT ${dependency}_VERSION VERSION_EQUAL ${BUILT_WITH_${dependency}_VERSION})
+          message(WARNING "find_required_dependencies: found ${dependency} version ${${dependency}_VERSION} which does not match the opentelemetry-cpp built with version ${BUILT_WITH_${dependency}_VERSION}.")
+        endif()
+      endif()
     endif()
   endforeach()
 endfunction()

cmake/templates/thirdparty-built-with-flags.cmake.in

@@ -25,13 +25,13 @@ if(@WITH_ABSEIL@)
 elseif(@WITH_OTLP_HTTP@ OR @WITH_OTLP_FILE@ OR @WITH_OTLP_GRPC@)
   if( @WITH_OTLP_GRPC@ )
     set(BUILT_WITH_absl TRUE)
-  elseif("@Protobuf_VERSION@" VERSION_GREATER_EQUAL "3.22.0")
+  elseif(@Protobuf_VERSION@ VERSION_GREATER_EQUAL 3.22.0)
     set(BUILT_WITH_absl TRUE)
   endif()
 endif()
 
 # CURL and ZLIB:
-if(@WITH_HTTP_CLIENT_CURL@ AND NOT "@BUILD_SHARED_LIBS@")
+if(@WITH_HTTP_CLIENT_CURL@)
   if("@CURL_FOUND@")
     set(BUILT_WITH_CURL TRUE)
   endif()
@@ -41,7 +41,7 @@ if(@WITH_HTTP_CLIENT_CURL@ AND NOT "@BUILD_SHARED_LIBS@")
 endif()
 
 # nlohmann_json:
-if("@USE_NLOHMANN_JSON@" AND "@nlohmann_json_FOUND@")
+if("@USE_NLOHMANN_JSON@")
   set(BUILT_WITH_nlohmann_json TRUE)
 endif()
 
@@ -66,4 +66,55 @@ if(@WITH_OPENTRACING@)
   set(BUILT_WITH_OpenTracing TRUE)
 endif()
 
+#-----------------------------------------------------------------------
+# Third party dependency versions
+#-----------------------------------------------------------------------
+if(BUILT_WITH_absl)
+  set(BUILT_WITH_absl_VERSION @absl_VERSION@)
+endif()
+
+if(BUILT_WITH_CURL)
+  set(BUILT_WITH_CURL_VERSION @CURL_VERSION_STRING@)
+endif()
+
+if(BUILT_WITH_ZLIB)
+  set(BUILT_WITH_ZLIB_VERSION @ZLIB_VERSION@)
+endif()
+
+if(BUILT_WITH_nlohmann_json)
+  set(BUILT_WITH_nlohmann_json_VERSION @nlohmann_json_VERSION@)
+endif()
+
+if(BUILT_WITH_Protobuf)
+  set(BUILT_WITH_Protobuf_VERSION @Protobuf_VERSION@)
+endif()
 
+if(BUILT_WITH_gRPC)
+  set(BUILT_WITH_gRPC_VERSION @gRPC_VERSION@)
+endif()
+
+if(BUILT_WITH_prometheus-cpp)
+  set(BUILT_WITH_prometheus-cpp_VERSION @prometheus-cpp_VERSION@)
+endif()
+
+if(BUILT_WITH_OpenTracing)
+  set(BUILT_WITH_OpenTracing_VERSION @OpenTracing_VERSION@)
+endif()
+
+#-----------------------------------------------------------------------
+# Flags to determine if CONFIG search mode should be used in find_dependency(...)
+#-----------------------------------------------------------------------
+set(FIND_DEPENDENCY_absl_USE_CONFIG TRUE)
+set(FIND_DEPENDENCY_Threads_USE_CONFIG FALSE)
+set(FIND_DEPENDENCY_ZLIB_USE_CONFIG FALSE)
+set(FIND_DEPENDENCY_CURL_USE_CONFIG FALSE)
+set(FIND_DEPENDENCY_nlohmann_json_USE_CONFIG TRUE)
+set(FIND_DEPENDENCY_gRPC_USE_CONFIG TRUE)
+set(FIND_DEPENDENCY_prometheus-cpp_USE_CONFIG TRUE)
+set(FIND_DEPENDENCY_OpenTracing_USE_CONFIG TRUE)
+
+if(DEFINED BUILT_WITH_Protobuf_VERSION AND BUILT_WITH_Protobuf_VERSION VERSION_GREATER_EQUAL 3.22.0)
+    set(FIND_DEPENDENCY_Protobuf_USE_CONFIG TRUE)
+else()
+    set(FIND_DEPENDENCY_Protobuf_USE_CONFIG FALSE)
+endif()

cmake/thirdparty-dependency-definitions.cmake

@@ -17,29 +17,6 @@ set(THIRD_PARTY_DEPENDENCIES_SUPPORTED
      OpenTracing
 )
 
-#-----------------------------------------------------------------------
-# Flags to determine if CONFIG search mode should be used in find_dependency(...)
-#-----------------------------------------------------------------------
-
-# absl
-set(FIND_DEPENDENCY_absl_USE_CONFIG TRUE)
-# Threads
-set(FIND_DEPENDENCY_Threads_USE_CONFIG FALSE)
-# ZLIB
-set(FIND_DEPENDENCY_ZLIB_USE_CONFIG FALSE)
-# CURL
-set(FIND_DEPENDENCY_CURL_USE_CONFIG FALSE)
-# nlohmann_json
-set(FIND_DEPENDENCY_nlohmann_json_USE_CONFIG TRUE)
-# Protobuf
-set(FIND_DEPENDENCY_Protobuf_USE_CONFIG TRUE)
-# gRPC
-set(FIND_DEPENDENCY_gRPC_USE_CONFIG TRUE)
-# prometheus-cpp
-set(FIND_DEPENDENCY_prometheus-cpp_USE_CONFIG TRUE)
-# OpenTracing
-set(FIND_DEPENDENCY_OpenTracing_USE_CONFIG TRUE)
-
 #-----------------------------------------------------------------------
 # THIRD_PARTY to COMPONENT dependencies
 #   These are the components that may require the third party dependency