@@ -301,49 +301,7 @@ endif()
301301include (GNUInstallDirs)
302302
303303if (WITH_PROMETHEUS)
304- find_package (prometheus-cpp CONFIG QUIET )
305- if (NOT prometheus-cpp_FOUND)
306- message (STATUS "Trying to use local prometheus-cpp from submodule" )
307- if (EXISTS ${PROJECT_SOURCE_DIR} /third_party/prometheus-cpp/.git)
308- set (SAVED_ENABLE_TESTING ${ENABLE_TESTING} )
309- set (SAVED_CMAKE_CXX_CLANG_TIDY ${CMAKE_CXX_CLANG_TIDY} )
310- set (SAVED_CMAKE_CXX_INCLUDE_WHAT_YOU_USE
311- ${CMAKE_CXX_INCLUDE_WHAT_YOU_USE} )
312- set (ENABLE_TESTING OFF )
313- set (CMAKE_CXX_CLANG_TIDY "" )
314- set (CMAKE_CXX_INCLUDE_WHAT_YOU_USE "" )
315- add_subdirectory (third_party/prometheus-cpp)
316- set (ENABLE_TESTING ${SAVED_ENABLE_TESTING} )
317- set (CMAKE_CXX_CLANG_TIDY ${SAVED_CMAKE_CXX_CLANG_TIDY} )
318- set (CMAKE_CXX_INCLUDE_WHAT_YOU_USE
319- ${SAVED_CMAKE_CXX_INCLUDE_WHAT_YOU_USE} )
320-
321- # Get the version of the prometheus-cpp submodule
322- find_package (Git QUIET )
323- if (Git_FOUND)
324- execute_process (
325- COMMAND ${GIT_EXECUTABLE} describe --tags --always
326- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} /third_party/prometheus-cpp
327- OUTPUT_VARIABLE prometheus-cpp_VERSION
328- OUTPUT_STRIP_TRAILING_WHITESPACE)
329- string (REGEX REPLACE "^v" "" prometheus-cpp_VERSION
330- "${prometheus-cpp_VERSION}" )
331- endif ()
332-
333- message (
334- STATUS
335- "Using local prometheus-cpp from submodule. Version = ${prometheus-cpp_VERSION}"
336- )
337- else ()
338- message (
339- FATAL_ERROR
340- "\n prometheus-cpp package was not found. Please either provide it manually or clone with submodules. "
341- "To initialize, fetch and checkout any nested submodules, you can use the following command:\n "
342- "git submodule update --init --recursive" )
343- endif ()
344- else ()
345- message (STATUS "Using external prometheus-cpp" )
346- endif ()
304+ include ("${opentelemetry-cpp_SOURCE_DIR}/cmake/prometheus-cpp.cmake" )
347305endif ()
348306
349307if (WITH_OTLP_GRPC
@@ -699,8 +657,10 @@ if(USE_NLOHMANN_JSON)
699657 STATUS "nlohmann-json: ${nlohmann_json_VERSION} (${nlohmann_json_PROVIDER} )"
700658 )
701659endif ()
702- if (prometheus-cpp_FOUND)
703- message (STATUS "prometheus-cpp: ${prometheus-cpp_VERSION}" )
660+ if (WITH_PROMETHEUS)
661+ message (
662+ STATUS
663+ "prometheus-cpp: ${prometheus-cpp_VERSION} (${prometheus-cpp_PROVIDER})" )
704664endif ()
705665if (WITH_OPENTRACING)
706666 message (
0 commit comments