fix: amend string parsing & add linking advapi32 in cmake

Author: ankitm3k

cmake/onnxruntime_providers_openvino.cmake

@@ -51,6 +51,11 @@
   target_include_directories(onnxruntime_providers_openvino SYSTEM PUBLIC ${ONNXRUNTIME_ROOT} ${CMAKE_CURRENT_BINARY_DIR} ${OpenVINO_INCLUDE_DIR} ${OPENVINO_INCLUDE_DIR_LIST} ${PYTHON_INCLUDE_DIRS} $ENV{OPENCL_INCS} $ENV{OPENCL_INCS}/../../cl_headers/)
   target_link_libraries(onnxruntime_providers_openvino ${ONNXRUNTIME_PROVIDERS_SHARED} Boost::mp11 ${OPENVINO_LIB_LIST} ${ABSEIL_LIBS} Eigen3::Eigen onnx_proto)
 
+  # ETW TraceLogging depends on Advapi32 on Windows
+  if(WIN32)
+    target_link_libraries(onnxruntime_providers_openvino advapi32)
+  endif()
+
   target_compile_definitions(onnxruntime_providers_openvino PRIVATE FILE_NAME=\"onnxruntime_providers_openvino.dll\")
 
   if(MSVC)

onnxruntime/core/providers/openvino/ov_telemetry.cc

@@ -39,13 +39,10 @@ namespace {
         case '\r': escaped += "\\r"; break;
         case '\t': escaped += "\\t"; break;
         default:
-          if (c < 0x20) {
-            escaped += "\\u";
-            escaped += "0000"[0];
-            escaped += "0000"[1];
-            char hex[3];
-            sprintf_s(hex, "%02x", static_cast<unsigned char>(c));
-            escaped += hex;
+          if (static_cast<unsigned char>(c) < 0x20) {
+            char unicode_escape[7];
+            sprintf_s(unicode_escape, sizeof(unicode_escape), "\\u%04x", static_cast<unsigned char>(c));
+            escaped += unicode_escape;
           } else {
             escaped += c;
           }
@@ -54,6 +51,24 @@ namespace {
     }
     return escaped;
   }
+
+  template<typename T>
+  void AddOptionalValue(std::ostringstream& json, const std::string& key, const T& value, const T& default_value, bool& first) {
+    if (value != default_value) {
+      if (!first) json << ",";
+      json << "\"" << key << "\":";
+      if constexpr (std::is_same_v<T, std::string>) {
+        json << "\"" << EscapeJsonString(value) << "\"";
+      } else if constexpr (std::is_same_v<T, std::filesystem::path>) {
+        json << "\"" << EscapeJsonString(value.string()) << "\"";
+      } else if constexpr (std::is_same_v<T, bool>) {
+        json << (value ? "true" : "false");
+      } else {
+        json << value;
+      }
+      first = false;
+    }
+  }
 }
 
 
@@ -119,25 +134,6 @@ UINT64 OVTelemetry::Keyword() const {
   return keyword_;
 }
 
-template<typename T>
-void AddOptionalValue(std::ostringstream& json, const std::string& key, const T& value, const T& default_value, bool& first) {
-  if (value != default_value) {
-    if (!first) json << ",";
-    json << "\"" << key << "\":";
-    if constexpr (std::is_same_v<T, std::string>) {
-      json << "\"" << EscapeJsonString(value) << "\"";
-    } else if constexpr (std::is_same_v<T, std::filesystem::path>) {
-      json << "\"" << EscapeJsonString(value.string()) << "\"";
-    } else if constexpr (std::is_same_v<T, bool>) {
-      json << (value ? "true" : "false");
-    } else {
-      json << value;
-    }
-    first = false;
-  }
-}
-
-
 std::string OVTelemetry::SerializeLoadConfig(const SessionContext& ctx) const {
   if (ctx.load_config.empty()) return "{}";
 

onnxruntime/core/providers/openvino/ov_telemetry.h

@@ -16,7 +16,6 @@
 #include <optional>
 #include <algorithm>
 #include "core/providers/openvino/contexts.h"
-#include "nlohmann/json.hpp"
 
 TRACELOGGING_DECLARE_PROVIDER(ov_telemetry_provider_handle);
 
@@ -26,7 +25,7 @@ namespace openvino_ep {
 namespace ov_keywords {
   constexpr uint64_t OV_PROVIDER   = 0x1;
   constexpr uint64_t OV_SESSION    = 0x2;
-  constexpr uint64_t OV_OPTIONS    = 0x3;
+  constexpr uint64_t OV_OPTIONS    = 0x4;
 }
 
 class OVTelemetry {