Remove the patches for conan

Author: owent

.github/workflows/cmake_install.yml

@@ -252,7 +252,7 @@ jobs:
         run: ./ci/do_ci.sh cmake.opentracing_shim.install.test
 
   ubuntu_2404_conan_latest:
-    name: Ubuntu 24.04 conan latest versions cxx17 (static libs - shared libs)
+    name: Ubuntu 24.04 conan latest versions cxx17 (static libs)
     runs-on: ubuntu-24.04
     env:
       INSTALL_TEST_DIR: '/home/runner/install_test'
@@ -285,44 +285,6 @@ jobs:
         run: |
           export PKG_CONFIG_PATH=$INSTALL_TEST_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
           ./ci/verify_packages.sh
-      - name: Run Tests (shared libs)
-        env:
-          BUILD_SHARED_LIBS: 'ON'
-        run: ./ci/do_ci.sh cmake.install.test
-
-  ubuntu_2404_conan_latest_shared_deps:
-    name: Ubuntu 24.04 conan latest w/shared protobuf and grpc (shared libs)
-    runs-on: ubuntu-24.04
-    env:
-      INSTALL_TEST_DIR: '/home/runner/install_test'
-      # Set to the latest version of cmake 3.x
-      CMAKE_VERSION: '3.31.6'
-      CXX_STANDARD: '17'
-      CMAKE_TOOLCHAIN_FILE: /home/runner/conan/build/Debug/generators/conan_toolchain.cmake
-      BUILD_TYPE: 'Debug'
-    steps:
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          submodules: 'recursive'
-      - name: Install Conan
-        run: |
-          python3 -m pip install pip==25.0.1
-          pip install "conan==2.15.1"
-          conan profile detect --force
-      - name: Install or build all dependencies with Conan
-        run: |
-          sudo -E ./ci/setup_cmake.sh
-          conan install install/conan/conanfile_latest.txt --build=missing -of /home/runner/conan -s build_type=${BUILD_TYPE} -s compiler.cppstd=${CXX_STANDARD} -o protobuf/*:shared=True -o grpc/*:shared=True
-      - name: Run Tests (shared libs)
-        env:
-          BUILD_SHARED_LIBS: 'ON'
-        run: |
-          source /home/runner/conan/build/Debug/generators/conanrun.sh
-          ./ci/do_ci.sh cmake.install.test
 
   macos_14_conan_stable:
     name: macOS 14 conan stable versions cxx17 (static libs)

cmake/opentelemetry-proto.cmake

@@ -228,24 +228,6 @@ endif()
 # opentelemetry_exporter_otlp_grpc_client as a static library.
 if(TARGET protobuf::libprotobuf)
   get_target_property(protobuf_lib_type protobuf::libprotobuf TYPE)
-  # protobuf_lib_type may be "INTERFACE_LIBRARY" in some build systems, such as
-  # conan.
-  if(protobuf_lib_type STREQUAL "INTERFACE_LIBRARY")
-    project_build_tools_unwrap_interface_link_libraries(
-      protobuf_lib_files TARGET_NAME protobuf::libprotobuf TARGET_MATCH
-      ".*(protobuf).*")
-    foreach(protobuf_lib_file ${protobuf_lib_files})
-      if(protobuf_lib_file MATCHES
-         "(^|[\\\\\\/])[^\\\\\\/]*protobuf[^\\\\\\/]*\\.(a|lib)$")
-        set(protobuf_lib_type "STATIC_LIBRARY")
-        break()
-      elseif(protobuf_lib_file MATCHES
-             "(^|[\\\\\\/])[^\\\\\\/]*protobuf[^\\\\\\/]*\\.(so|dll|dylib)$")
-        set(protobuf_lib_type "SHARED_LIBRARY")
-        break()
-      endif()
-    endforeach()
-  endif()
 else()
   set(protobuf_lib_type "SHARED_LIBRARY")
   target_link_libraries(opentelemetry_proto PUBLIC ${Protobuf_LIBRARIES})
@@ -357,8 +339,8 @@ target_include_directories(
                              "$<INSTALL_INTERFACE:include>")
 
 # Disable include-what-you-use and clang-tidy on generated code.
-set_target_properties(opentelemetry_proto PROPERTIES CXX_INCLUDE_WHAT_YOU_USE
-                                                     "" CXX_CLANG_TIDY "")
+set_target_properties(opentelemetry_proto PROPERTIES CXX_INCLUDE_WHAT_YOU_USE ""
+                                                     CXX_CLANG_TIDY "")
 if(NOT Protobuf_INCLUDE_DIRS AND TARGET protobuf::libprotobuf)
   get_target_property(Protobuf_INCLUDE_DIRS protobuf::libprotobuf
                       INTERFACE_INCLUDE_DIRECTORIES)
@@ -378,8 +360,9 @@ if(WITH_OTLP_GRPC)
   set_target_version(opentelemetry_proto_grpc)
 
   # Disable include-what-you-use and clang-tidy on generated code.
-  set_target_properties(opentelemetry_proto_grpc
-                        PROPERTIES CXX_INCLUDE_WHAT_YOU_USE "" CXX_CLANG_TIDY "")
+  set_target_properties(
+    opentelemetry_proto_grpc PROPERTIES CXX_INCLUDE_WHAT_YOU_USE ""
+                                        CXX_CLANG_TIDY "")
 
   list(APPEND OPENTELEMETRY_PROTO_TARGETS opentelemetry_proto_grpc)
   target_link_libraries(opentelemetry_proto_grpc PUBLIC opentelemetry_proto)
@@ -390,23 +373,6 @@ if(WITH_OTLP_GRPC)
   # result in crashes. To prevent such conflicts, we also need to build
   # opentelemetry_exporter_otlp_grpc_client as a static library.
   get_target_property(grpc_lib_type gRPC::grpc++ TYPE)
-  # grpc_lib_type may be "INTERFACE_LIBRARY" in some build systems, such as
-  # conan.
-  if(grpc_lib_type STREQUAL "INTERFACE_LIBRARY")
-    project_build_tools_unwrap_interface_link_libraries(
-      grpc_lib_files TARGET_NAME gRPC::grpc++ TARGET_MATCH ".*(grpc|gRPC).*")
-    foreach(grpc_lib_file ${grpc_lib_files})
-      if(grpc_lib_file MATCHES
-         "(^|[\\\\\\/])[^\\\\\\/]*grpc[^\\\\\\/]*\\.(a|lib)$")
-        set(grpc_lib_type "STATIC_LIBRARY")
-        break()
-      elseif(grpc_lib_file MATCHES
-             "(^|[\\\\\\/])[^\\\\\\/]*grpc[^\\\\\\/]*\\.(so|dll|dylib)$")
-        set(grpc_lib_type "SHARED_LIBRARY")
-        break()
-      endif()
-    endforeach()
-  endif()
 
   if(grpc_lib_type STREQUAL "SHARED_LIBRARY")
     target_link_libraries(opentelemetry_proto_grpc PUBLIC gRPC::grpc++)

cmake/tools.cmake

@@ -222,109 +222,3 @@ function(project_build_tools_patch_default_imported_config)
     endif()
   endforeach()
 endfunction()
-
-function(__project_build_tools_recursive_scan_unwrap OUTPUT_VAR INPUT_VAR)
-  # With sub-expressions
-  if(INPUT_VAR MATCHES "^\\\$<.*>:([^>]+)>$")
-    set(${OUTPUT_VAR}
-        "${CMAKE_MATCH_1}"
-        PARENT_SCOPE)
-  elseif(INPUT_VAR MATCHES "^\\\$<.*>:([^>]+)$")
-    set(${OUTPUT_VAR}
-        "${CMAKE_MATCH_1}"
-        PARENT_SCOPE)
-  elseif(INPUT_VAR MATCHES "^\\\$<[^:]+:([^>]+)>$")
-    set(${OUTPUT_VAR}
-        "${CMAKE_MATCH_1}"
-        PARENT_SCOPE)
-  elseif(INPUT_VAR MATCHES "^\\\$<[^:]+:([^>]+)$")
-    set(${OUTPUT_VAR}
-        "${CMAKE_MATCH_1}"
-        PARENT_SCOPE)
-  else()
-    set(${OUTPUT_VAR}
-        "${INPUT_VAR}"
-        PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(__project_build_tools_unwrap_interface_link_libraries OUTPUT_VAR)
-  set(optionArgs)
-  set(oneValueArgs)
-  set(multiValueArgs TARGET_NAME TARGET_MATCH)
-  cmake_parse_arguments(__SCAN_OPTION "${optionArgs}" "${oneValueArgs}"
-                        "${multiValueArgs}" "${ARGN}")
-  set(__OUTPUT_VAR)
-
-  set(__TARGET_CHECK_NAMES)
-  foreach(TARGET_NAME_ORIGIN ${__SCAN_OPTION_TARGET_NAME})
-    if(TARGET_NAME_ORIGIN MATCHES "^\\\$<.*>?$")
-      __project_build_tools_recursive_scan_unwrap(TARGET_NAME
-                                                  "${TARGET_NAME_ORIGIN}")
-    else()
-      set(TARGET_NAME "${TARGET_NAME_ORIGIN}")
-    endif()
-
-    if(TARGET "${TARGET_NAME}")
-      # Get the imported location of the target
-      project_build_tools_get_imported_location(__TARGET_IMPORTED_LOCATION
-                                                "${TARGET_NAME}")
-      if(__TARGET_IMPORTED_LOCATION)
-        list(APPEND __TARGET_CHECK_NAMES ${__TARGET_IMPORTED_LOCATION})
-      endif()
-
-      # Get the interface link libraries of the target
-      set(__TARGET_LINK_LIBRARIES)
-      get_target_property(__TARGET_LINK_LIBRARIES "${TARGET_NAME}"
-                          INTERFACE_LINK_LIBRARIES)
-      list(APPEND __TARGET_CHECK_NAMES ${__TARGET_LINK_LIBRARIES})
-    else()
-      # If the name is not a target, it should be a link name. We can directly
-      # append it to the checking list.
-      list(APPEND __TARGET_CHECK_NAMES "${TARGET_NAME}")
-    endif()
-  endforeach()
-
-  list(REMOVE_DUPLICATES __TARGET_CHECK_NAMES)
-  # If the target match option is set, filter the link names
-  if(__SCAN_OPTION_TARGET_MATCH)
-    foreach(__LINK_NAME IN LISTS __TARGET_CHECK_NAMES)
-      set(__TARGET_MATCHED FALSE)
-      foreach(__MATCH_RULE ${__SCAN_OPTION_TARGET_MATCH})
-        if(__LINK_NAME MATCHES "${__MATCH_RULE}")
-          set(__TARGET_MATCHED TRUE)
-          break()
-        endif()
-      endforeach()
-      if(__TARGET_MATCHED)
-        list(APPEND __OUTPUT_VAR ${__LINK_NAME})
-      endif()
-    endforeach()
-  else()
-    set(__OUTPUT_VAR ${__TARGET_CHECK_NAMES})
-  endif()
-
-  set(${OUTPUT_VAR}
-      ${__OUTPUT_VAR}
-      PARENT_SCOPE)
-endfunction()
-
-function(project_build_tools_unwrap_interface_link_libraries OUTPUT_VAR)
-  set(optionArgs)
-  set(oneValueArgs)
-  set(multiValueArgs TARGET_NAME TARGET_MATCH)
-  cmake_parse_arguments(__SCAN_OPTION "${optionArgs}" "${oneValueArgs}"
-                        "${multiValueArgs}" "${ARGN}")
-
-  set(__OUTPUT_VAR_LEVEL_1)
-  set(__OUTPUT_VAR_LEVEL_2)
-  __project_build_tools_unwrap_interface_link_libraries(__OUTPUT_VAR_LEVEL_1
-                                                        "${ARGN}")
-  __project_build_tools_unwrap_interface_link_libraries(
-    __OUTPUT_VAR_LEVEL_2 TARGET_NAME ${__OUTPUT_VAR_LEVEL_1} TARGET_MATCH
-    ${__SCAN_OPTION_TARGET_MATCH})
-
-  set(${OUTPUT_VAR}
-      ${__OUTPUT_VAR_LEVEL_2}
-      PARENT_SCOPE)
-endfunction()