[Telemetry] Default native builds to 1DS

build.bat

@@ -7,4 +7,4 @@ setlocal
 set PATH=C:\Program Files\Git\usr\bin;%PATH%
 
 rem Requires a Python install to be available in your PATH
-python "%~dp0\tools\ci_build\build.py" --build_dir "%~dp0\build\Windows" --no_telemetry %*
+python "%~dp0\tools\ci_build\build.py" --build_dir "%~dp0\build\Windows" %*

cmake/CMakeLists.txt

@@ -170,9 +170,23 @@ option(onnxruntime_USE_WINML "Build with WinML support" OFF)
 option(onnxruntime_USE_ACL "Build with ACL support" OFF)
 option(onnxruntime_ENABLE_INSTRUMENT "Enable Instrument with Event Tracing for Windows (ETW)" OFF)
 option(onnxruntime_USE_TELEMETRY "Build with Telemetry" OFF)
-# Optional 1DS ingestion token for non-Windows telemetry. Leave empty to compile in the encoded
+# On Windows, 1DS is the default telemetry backend. This option preserves the Microsoft-internal
+# TraceLogging backend for forks that provide TraceLoggingConfigPrivate.h.
+option(onnxruntime_USE_WINDOWS_TELEMETRY "Use Windows TraceLogging instead of 1DS telemetry" OFF)
+if(onnxruntime_USE_WINDOWS_TELEMETRY AND NOT WIN32)
+  message(FATAL_ERROR "onnxruntime_USE_WINDOWS_TELEMETRY is only supported on Windows")
+endif()
+if(onnxruntime_USE_WINDOWS_TELEMETRY)
+  set(onnxruntime_USE_TELEMETRY ON CACHE BOOL "Build with Telemetry" FORCE)
+endif()
+set(onnxruntime_USE_1DS_TELEMETRY
+    "${onnxruntime_USE_TELEMETRY}")
+if(WIN32 AND onnxruntime_USE_WINDOWS_TELEMETRY)
+  set(onnxruntime_USE_1DS_TELEMETRY OFF)
+endif()
+# Optional 1DS ingestion token. Leave empty to compile in the encoded
 # in-repo default from core/platform/posix/telemetry.cc; callers can override it at configure time.
-set(ONNXRUNTIME_TELEMETRY_TENANT_TOKEN "" CACHE STRING "Override the compiled-in telemetry ingestion token (non-Windows)")
+set(ONNXRUNTIME_TELEMETRY_TENANT_TOKEN "" CACHE STRING "Override the compiled-in 1DS telemetry ingestion token")
 cmake_dependent_option(onnxruntime_USE_MIMALLOC "Override new/delete and arena allocator with mimalloc" OFF "WIN32;NOT onnxruntime_USE_CUDA;NOT onnxruntime_USE_OPENVINO" OFF)
 option(onnxruntime_USE_CANN "Build with CANN support" OFF)
 option(onnxruntime_USE_XNNPACK "Build with XNNPACK support. Provides an alternative math library on ARM, WebAssembly and x86." OFF)
@@ -1977,27 +1991,17 @@ else()
         add_library(safeint_interface IMPORTED INTERFACE)\n\
         target_include_directories(safeint_interface INTERFACE ${safeint_SOURCE_DIR})\n\
         ")
-    if(onnxruntime_USE_TELEMETRY AND NOT WIN32 AND onnxruntime_TELEMETRY_USES_EXTERNAL_PACKAGE)
+    if(onnxruntime_USE_1DS_TELEMETRY AND onnxruntime_TELEMETRY_USES_EXTERNAL_PACKAGE)
       string(APPEND PROJECT_CONFIG_CONTENT
         "find_dependency(MSTelemetry CONFIG)\n\
         ")
     endif()
-    if(onnxruntime_USE_TELEMETRY AND NOT WIN32 AND NOT APPLE
-       AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android"
+    if(onnxruntime_USE_1DS_TELEMETRY
        AND NOT onnxruntime_TELEMETRY_USES_EXTERNAL_PACKAGE
        AND NOT onnxruntime_BUILD_SHARED_LIB)
-      if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-        # The embedded curl archive uses the platform Threads target for its resolver.
-        string(APPEND PROJECT_CONFIG_CONTENT
-          "find_dependency(Threads)\n\
-          ")
-      else()
-        # Preserve the legacy dependency graph for any explicitly enabled non-Linux Unix target.
-        string(APPEND PROJECT_CONFIG_CONTENT
-          "find_dependency(CURL)\n\
-          find_dependency(Threads)\n\
-          ")
-      endif()
+      string(APPEND PROJECT_CONFIG_CONTENT
+        "find_dependency(MSTelemetry CONFIG)\n\
+        ")
     endif()
   endif()
 

cmake/external/onnxruntime_external_deps.cmake

@@ -8,8 +8,10 @@ include(external/helper_functions.cmake)
 file(STRINGS deps.txt ONNXRUNTIME_DEPS_LIST)
 foreach(ONNXRUNTIME_DEP IN LISTS ONNXRUNTIME_DEPS_LIST)
   # Lines start with "#" are comments, so skip them.
-  # cpp_client_telemetry is only needed for telemetry on non-Windows platforms, so skip if telemetry is not enabled or it's Windows platform.
-  if((NOT ONNXRUNTIME_DEP MATCHES "^#") AND ((NOT ONNXRUNTIME_DEP MATCHES "^cpp_client_telemetry") OR (onnxruntime_USE_TELEMETRY AND NOT WIN32)))
+  # cpp_client_telemetry is needed only when the 1DS backend is selected.
+  if((NOT ONNXRUNTIME_DEP MATCHES "^#") AND
+     ((NOT ONNXRUNTIME_DEP MATCHES "^cpp_client_telemetry") OR
+      onnxruntime_USE_1DS_TELEMETRY))
     # The first column is name
     list(POP_FRONT ONNXRUNTIME_DEP ONNXRUNTIME_DEP_NAME)
     # The second column is URL
@@ -997,8 +999,8 @@ if(onnxruntime_USE_SNPE)
   list(APPEND onnxruntime_EXTERNAL_LIBRARIES ${SNPE_NN_LIBS})
 endif()
 
-# 1DS SDK (cpp_client_telemetry) for cross-platform telemetry on non-Windows platforms
-if(onnxruntime_USE_TELEMETRY AND NOT WIN32)
+# 1DS SDK (cpp_client_telemetry) is the default cross-platform telemetry backend.
+if(onnxruntime_USE_1DS_TELEMETRY)
   if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
     message(FATAL_ERROR "onnxruntime_USE_TELEMETRY is not supported for WebAssembly/Emscripten builds: "
                         "the 1DS telemetry SDK is excluded on Emscripten. Disable telemetry for WASM builds.")
@@ -1073,6 +1075,11 @@ if(onnxruntime_USE_TELEMETRY AND NOT WIN32)
       EXCLUDE_FROM_ALL
     )
     onnxruntime_fetchcontent_makeavailable(cpp_client_telemetry)
+    if(WIN32 AND TARGET mat)
+      # CMake's Visual Studio generator otherwise forwards mat's BUILD_INTERFACE system include
+      # expression verbatim to MASM. ORT adds dependency includes to C/C++ targets separately.
+      set_property(TARGET mat PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "")
+    endif()
     target_compile_definitions(mat PRIVATE MATSDK_DISABLE_LOGGING)
     if(ANDROID)
       target_compile_definitions(mat PRIVATE ANDROID_SUPPRESS_LOGCAT)
@@ -1144,12 +1151,14 @@ if(onnxruntime_USE_TELEMETRY AND NOT WIN32)
       # ORT enables -ffast-math globally, which conflicts with
       # std::numeric_limits<double>::infinity() in the 1DS SDK's bundled nlohmann/json.hpp.
       # Also suppress warnings in the 1DS SDK code that ORT treats as errors.
-      target_compile_options(mat PRIVATE
-        -fno-finite-math-only
-        -Wno-unused-const-variable
-        $<$<CXX_COMPILER_ID:GNU>:-Wno-reorder>
-        $<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-reorder-ctor>
-      )
+      if(NOT MSVC)
+        target_compile_options(mat PRIVATE
+          -fno-finite-math-only
+          -Wno-unused-const-variable
+          $<$<CXX_COMPILER_ID:GNU>:-Wno-reorder>
+          $<$<CXX_COMPILER_ID:Clang,AppleClang>:-Wno-reorder-ctor>
+        )
+      endif()
       # Vendored 1DS dependencies emit unavoidable narrowing warnings under Apple's warning policy.
       # Keep the warning enabled for ORT sources while suppressing it only for third-party targets.
       if(APPLE)

cmake/onnxruntime_common.cmake

@@ -49,6 +49,17 @@ if(WIN32)
          "${ONNXRUNTIME_ROOT}/core/platform/windows/logging/*.h"
          "${ONNXRUNTIME_ROOT}/core/platform/windows/logging/*.cc"
     )
+    if(onnxruntime_USE_1DS_TELEMETRY)
+        list(APPEND onnxruntime_common_src_patterns
+             "${ONNXRUNTIME_ROOT}/core/platform/windows/device_id.cc"
+             "${ONNXRUNTIME_ROOT}/core/platform/posix/device_id.h"
+             "${ONNXRUNTIME_ROOT}/core/platform/posix/telemetry.h"
+             "${ONNXRUNTIME_ROOT}/core/platform/posix/telemetry.cc"
+             "${ONNXRUNTIME_ROOT}/core/platform/posix/telemetry_context.h"
+             "${ONNXRUNTIME_ROOT}/core/platform/posix/telemetry_no_throw.h"
+             "${ONNXRUNTIME_ROOT}/core/platform/posix/telemetry_sampling.h"
+        )
+    endif()
 
 else()
     list(APPEND onnxruntime_common_src_patterns
@@ -57,8 +68,8 @@ else()
          "${ONNXRUNTIME_ROOT}/core/platform/posix/stacktrace.cc"
     )
 
-    # Telemetry for non-Windows platforms (enabled by USE_TELEMETRY)
-    if (onnxruntime_USE_TELEMETRY)
+    # 1DS telemetry sources for non-Windows platforms.
+    if(onnxruntime_USE_1DS_TELEMETRY)
         list(APPEND onnxruntime_common_src_patterns
              "${ONNXRUNTIME_ROOT}/core/platform/posix/device_id.h"
              "${ONNXRUNTIME_ROOT}/core/platform/posix/device_id.cc"
@@ -162,6 +173,9 @@ if(WIN32)
       list(APPEND onnxruntime_DELAYLOAD_FLAGS "/DELAYLOAD:shell32.dll")
     endif()
   endif()
+  if(onnxruntime_USE_1DS_TELEMETRY)
+    target_link_libraries(onnxruntime_common PRIVATE iphlpapi)
+  endif()
 endif()
 
 if(NOT WIN32 AND NOT APPLE AND NOT ANDROID AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
@@ -172,7 +186,8 @@ if(NOT WIN32 AND NOT APPLE AND NOT ANDROID AND CMAKE_SYSTEM_PROCESSOR MATCHES "x
 endif()
 
 if (onnxruntime_USE_TELEMETRY)
-  if(WIN32)
+  if(WIN32 AND onnxruntime_USE_WINDOWS_TELEMETRY)
+    target_compile_definitions(onnxruntime_common PUBLIC USE_WINDOWS_TELEMETRY)
     set(ONNXRUNTIME_TELEMETRY_CONFIG_HEADER
         "${ONNXRUNTIME_INCLUDE_DIR}/core/platform/windows/TraceLoggingConfigPrivate.h")
     if(EXISTS "${ONNXRUNTIME_TELEMETRY_CONFIG_HEADER}")
@@ -181,7 +196,7 @@ if (onnxruntime_USE_TELEMETRY)
         PROPERTIES COMPILE_FLAGS "/FI${ONNXRUNTIME_TELEMETRY_CONFIG_HEADER}")
     endif()
   else()
-    target_compile_definitions(onnxruntime_common PRIVATE USE_POSIX_TELEMETRY)
+    target_compile_definitions(onnxruntime_common PUBLIC USE_1DS_TELEMETRY)
     # Optional tenant-token override written into a generated header in the build tree (kept off the
     # compiler command line, so the token never appears in compile_commands.json or build logs). It may be
     # supplied either as -DONNXRUNTIME_TELEMETRY_TENANT_TOKEN=... or via an
@@ -268,20 +283,24 @@ if(CPUINFO_SUPPORTED)
   list(APPEND onnxruntime_EXTERNAL_LIBRARIES cpuinfo::cpuinfo)
 endif()
 
-# Link telemetry library (1DS SDK) for non-Windows platforms
-if(onnxruntime_USE_TELEMETRY AND NOT WIN32)
+# Link the default 1DS telemetry backend.
+if(onnxruntime_USE_1DS_TELEMETRY)
   if(onnxruntime_TELEMETRY_USES_EXTERNAL_PACKAGE AND TARGET MSTelemetry::mat)
     # The vcpkg package target propagates its include
     # directories and transitive dependencies (curl/sqlite3/zlib/nlohmann-json), so no
     # manual include paths or system libraries are required here.
     target_link_libraries(onnxruntime_common PRIVATE MSTelemetry::mat)
-    list(APPEND onnxruntime_EXTERNAL_LIBRARIES MSTelemetry::mat)
+    if(NOT WIN32)
+      list(APPEND onnxruntime_EXTERNAL_LIBRARIES MSTelemetry::mat)
+    endif()
   elseif(TARGET mat)
     # Link mat directly. In a shared build its resolved dependency set is absorbed into
     # libonnxruntime; in a static build mat -- and the bundled static archives it links -- are shipped
     # and exported below so a downstream find_package(onnxruntime) resolves them.
     target_link_libraries(onnxruntime_common PRIVATE mat)
-    list(APPEND onnxruntime_EXTERNAL_LIBRARIES mat)
+    if(NOT WIN32)
+      list(APPEND onnxruntime_EXTERNAL_LIBRARIES mat)
+    endif()
     if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND TARGET libcurl_static)
       # Prevent shared-library consumers from re-exporting the embedded transport symbols. This does
       # not namespace static symbols; static ORT consumers must not co-link another curl/mbedTLS copy.

cmake/onnxruntime_unittests.cmake

@@ -464,6 +464,10 @@ if(WIN32)
   list(APPEND onnxruntime_test_framework_src_patterns
     "${TEST_SRC_DIR}/platform/windows/*.cc"
     "${TEST_SRC_DIR}/platform/windows/logging/*.cc" )
+  if(onnxruntime_USE_1DS_TELEMETRY)
+    list(APPEND onnxruntime_test_framework_src_patterns
+      "${TEST_SRC_DIR}/platform/windows_telemetry/*.cc" )
+  endif()
 endif()
 
 if(LINUX)

cmake/vcpkg.json

@@ -103,31 +103,12 @@
       "dependencies": []
     },
     "telemetry": {
-      "description": "Build with static 1DS telemetry support on non-Windows platforms",
+      "description": "Build with static 1DS telemetry support",
       "dependencies": [
         {
           "name": "cpp-client-telemetry",
-          "platform": "!windows & !android & !emscripten & !uwp"
-        },
-        {
-          "name": "curl",
-          "default-features": false,
-          "features": [
-            "mbedtls"
-          ],
-          "platform": "linux"
-        },
-        {
-          "name": "mbedtls",
-          "features": [
-            "pthreads"
-          ],
-          "platform": "linux"
-        },
-        {
-          "name": "sqlite3",
-          "default-features": false,
-          "platform": "!windows & !android & !emscripten & !uwp"
+          "platform": "!android & !emscripten",
+          "version>=": "3.10.240.1"
         }
       ]
     }

onnxruntime/core/platform/posix/device_id.cc

@@ -34,8 +34,6 @@ namespace onnxruntime {
 
 namespace {
 
-// ORT and OGA share this file and use the same flock-first protocol so corruption repair is
-// serialized even when both libraries are loaded in one process.
 constexpr char kDeviceIdLockFileName[] = "deviceid.lock";
 
 enum class DeviceIdReadResult {
@@ -414,7 +412,7 @@ void DeviceId::InitializeInternal() {
         return;
       }
 
-      // Another ORT or OGA process may have repaired the shared file while this process waited.
+      // Another process may have repaired the shared file while this process waited.
       const DeviceIdFileRead repaired = ReadDeviceIdFileNoFollow(directory.Get(), kFileName, kMaxFileSize);
       if (repaired.result == DeviceIdReadResult::Read && IsValidGUID(repaired.content)) {
         device_id_ = repaired.content;

onnxruntime/core/platform/posix/device_id.h

@@ -19,6 +19,7 @@ enum class DeviceIdStatus {
 /**
  * Manages a persistent device identifier for telemetry purposes.
  * The device ID is stored in a platform-appropriate location:
+ * - Windows: HKCU\SOFTWARE\Microsoft\DeveloperTools\.onnxruntime, deviceid value
  * - macOS: ~/Library/Application Support/Microsoft/DeveloperTools/.onnxruntime/deviceid
  * - Linux: $XDG_CACHE_HOME (or ~/.cache) /Microsoft/DeveloperTools/.onnxruntime/deviceid
  *
@@ -38,7 +39,8 @@ class DeviceId {
   std::string GetStatusString();
 
   // Get the directory path for device ID / telemetry cache storage
-  // (macOS: ~/Library/Application Support/...; Linux: $XDG_CACHE_HOME or ~/.cache/...).
+  // (Windows: %LOCALAPPDATA%, %APPDATA%, or the user profile; macOS:
+  // ~/Library/Application Support/...; other POSIX: $XDG_CACHE_HOME or ~/.cache/...).
   static std::string GetStorageDirectory();
 
   // Same as GetStorageDirectory(), but also creates the directory tree (0700) if it does not exist.

onnxruntime/core/platform/posix/env.cc

@@ -16,7 +16,7 @@ limitations under the License.
 
 #include "core/platform/env.h"
 
-#ifdef USE_POSIX_TELEMETRY
+#ifdef USE_1DS_TELEMETRY
 #include "core/platform/posix/telemetry.h"
 #endif
 
@@ -725,7 +725,7 @@ class PosixEnv : public Env {
   }
 
  private:
-#ifdef USE_POSIX_TELEMETRY
+#ifdef USE_1DS_TELEMETRY
   PosixTelemetry telemetry_provider_;
 #else
   Telemetry telemetry_provider_;