Standardize telemetry dependency policy

cmake/CMakeLists.txt

@@ -1983,6 +1983,19 @@ else()
         "find_dependency(MSTelemetry CONFIG)\n\
         ")
     endif()
+    if(onnxruntime_USE_TELEMETRY AND APPLE
+       AND NOT onnxruntime_TELEMETRY_USES_EXTERNAL_PACKAGE)
+      string(APPEND PROJECT_CONFIG_CONTENT
+        "if(NOT TARGET MSTelemetry::sqlite_dependency)\n\
+        add_library(MSTelemetry::sqlite_dependency INTERFACE IMPORTED)\n\
+        set_property(TARGET MSTelemetry::sqlite_dependency PROPERTY INTERFACE_LINK_LIBRARIES sqlite3)\n\
+        endif()\n\
+        if(NOT TARGET MSTelemetry::zlib_dependency)\n\
+        add_library(MSTelemetry::zlib_dependency INTERFACE IMPORTED)\n\
+        set_property(TARGET MSTelemetry::zlib_dependency PROPERTY INTERFACE_LINK_LIBRARIES z)\n\
+        endif()\n\
+        ")
+    endif()
     if(onnxruntime_USE_TELEMETRY AND NOT WIN32 AND NOT APPLE
        AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android"
        AND NOT onnxruntime_TELEMETRY_USES_EXTERNAL_PACKAGE

cmake/deps.txt

@@ -68,6 +68,6 @@ vulkan_headers;https://codeload.github.com/KhronosGroup/Vulkan-Headers/tar.gz/re
 # cpp_client_telemetry (1DS SDK) for cross-platform telemetry on non-Windows platforms.
 # Pinned to the stable release.
 cpp_client_telemetry;https://github.com/microsoft/cpp_client_telemetry/archive/refs/tags/v3.10.267.1.zip;9d29169b8e51157d44a24a0d6cf6847260ea2efc
-# Static HTTP transport used by 1DS on non-vcpkg Linux builds.
+# Transitive 1DS Linux transport dependencies, retained here for dependency inventory generation.
 curl;https://github.com/curl/curl/releases/download/curl-8_21_0/curl-8.21.0.tar.xz;c3b4712175609f1e1662e716efd4fd48901e863d
 mbedtls;https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.7/mbedtls-3.6.7.tar.bz2;e892e98cff90cf7e0736c525bf357626a2513c4c

cmake/external/onnxruntime_external_deps.cmake

@@ -1054,11 +1054,6 @@ if(onnxruntime_USE_TELEMETRY AND NOT WIN32)
     message(STATUS "Telemetry: using the vcpkg MSTelemetry::mat package")
     set(onnxruntime_TELEMETRY_USES_EXTERNAL_PACKAGE ON)
   else()
-    # Linux packages must not depend on a host libcurl. Build an internal HTTP(S)-only static curl
-    # before configuring 1DS so its CURL::libcurl reference resolves to the pinned target.
-    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-      include(external/telemetry_linux_http.cmake)
-    endif()
     set(_ort_requested_apple_architectures "${CMAKE_OSX_ARCHITECTURES}")
 
     # Android always uses this path, including vcpkg-based AAR builds. The vcpkg port selects
@@ -1085,12 +1080,19 @@ if(onnxruntime_USE_TELEMETRY AND NOT WIN32)
     if(APPLE)
       set(MATSDK_BUILD_APPLE_HTTP ON CACHE BOOL "Build the 1DS Apple HTTP client" FORCE)
     endif()
-    # ORT supplies CURL::libcurl on Linux through its pinned static mbedTLS
-    # transport. On Apple/Android the SDK selects the native transport.
-    set(MATSDK_CURL_PROVIDER SYSTEM CACHE STRING "Use ORT's selected 1DS curl target" FORCE)
     set(MATSDK_CURL_TLS_BACKEND MBEDTLS CACHE STRING "Use mbedTLS for 1DS curl" FORCE)
-    set(MATSDK_SQLITE_PROVIDER VENDORED CACHE STRING "Use bundled 1DS SQLite" FORCE)
-    set(MATSDK_ZLIB_PROVIDER VENDORED CACHE STRING "Use bundled 1DS zlib" FORCE)
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+      set(MATSDK_CURL_PROVIDER FETCH CACHE STRING "Build the SDK's pinned curl with mbedTLS" FORCE)
+    else()
+      set(MATSDK_CURL_PROVIDER SYSTEM CACHE STRING "Use the platform HTTP transport" FORCE)
+    endif()
+    if(APPLE)
+      set(MATSDK_SQLITE_PROVIDER SYSTEM CACHE STRING "Use Apple's system SQLite" FORCE)
+      set(MATSDK_ZLIB_PROVIDER SYSTEM CACHE STRING "Use Apple's system libz" FORCE)
+    else()
+      set(MATSDK_SQLITE_PROVIDER MINIMAL CACHE STRING "Build the SDK's minimal private SQLite" FORCE)
+      set(MATSDK_ZLIB_PROVIDER VENDORED CACHE STRING "Build the SDK's private zlib" FORCE)
+    endif()
     # BUILD_SHARED_LIBS is a global that ORT's own targets read after this block, and the SDK selects
     # mat's library type from it (lib/CMakeLists.txt). Save it, force static for the SDK, restore below.
     set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
@@ -1107,6 +1109,14 @@ if(onnxruntime_USE_TELEMETRY AND NOT WIN32)
       EXCLUDE_FROM_ALL
     )
     onnxruntime_fetchcontent_makeavailable(cpp_client_telemetry)
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT onnxruntime_BUILD_SHARED_LIB)
+      # curl's imported mbedTLS helper is not exported with ORT's static package.
+      get_target_property(_ort_curl_link_libraries libcurl_static INTERFACE_LINK_LIBRARIES)
+      list(FILTER _ort_curl_link_libraries EXCLUDE REGEX "CURL::mbedtls")
+      set_target_properties(libcurl_static PROPERTIES
+        INTERFACE_LINK_LIBRARIES "${_ort_curl_link_libraries}")
+      target_link_libraries(libcurl_static PRIVATE mbedtls)
+    endif()
     if(ANDROID)
       target_compile_definitions(mat PRIVATE ANDROID_SUPPRESS_LOGCAT)
     endif()

cmake/onnxruntime.cmake

@@ -122,14 +122,13 @@ if(onnxruntime_BUILD_SHARED_LIB)
     endif()
 
     if(onnxruntime_USE_TELEMETRY)
+      set(APPLE_SYSTEM_LIBRARIES "\\\"z\\\", \\\"sqlite3\\\"")
       if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
         set(APPLE_SYSTEM_FRAMEWORKS
           "\\\"CoreFoundation\\\", \\\"Foundation\\\", \\\"Network\\\", \\\"Security\\\", \\\"SystemConfiguration\\\", \\\"UIKit\\\"")
-        set(APPLE_SYSTEM_LIBRARIES "")
       else()
         set(APPLE_SYSTEM_FRAMEWORKS
           "\\\"CoreFoundation\\\", \\\"Foundation\\\", \\\"IOKit\\\", \\\"Network\\\", \\\"Security\\\", \\\"SystemConfiguration\\\"")
-        set(APPLE_SYSTEM_LIBRARIES "")
       endif()
     endif()