cleanup

Author: Darshak Bhatti

onnxruntime/core/platform/telemetry.cc

@@ -172,9 +172,8 @@ void Telemetry::LogSessionCreationEnd(uint32_t session_id,
   ORT_UNUSED_PARAMETER(status);
 }
 
-void Telemetry::LogRunStart(uint32_t session_id, uint64_t run_id) const {
+void Telemetry::LogRunStart(uint32_t session_id) const {
   ORT_UNUSED_PARAMETER(session_id);
-  ORT_UNUSED_PARAMETER(run_id);
 }
 
 void Telemetry::LogRegisterEpLibraryWithLibPath(const std::string& registration_name,

onnxruntime/core/platform/telemetry.h

@@ -108,7 +108,7 @@ class Telemetry {
   virtual void LogSessionCreationEnd(uint32_t session_id,
                                    const common::Status& status) const;
 
-  virtual void LogRunStart(uint32_t session_id, uint64_t run_id) const;
+  virtual void LogRunStart(uint32_t session_id) const;
 
   virtual void LogRegisterEpLibraryWithLibPath(const std::string& registration_name,
                                                 const std::string& lib_path) const;

onnxruntime/core/platform/windows/telemetry.cc

@@ -550,7 +550,6 @@ void WindowsTelemetry::LogRuntimePerf(uint32_t session_id, uint32_t total_runs_s
                     TraceLoggingBool(true, "UTCReplace_AppSessionGuid"),
                     TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance),
                     TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                    TraceLoggingLevel(WINEVENT_LEVEL_INFO),
                     // Telemetry info
                     TraceLoggingUInt8(0, "schemaVersion"),
                     TraceLoggingUInt32(session_id, "sessionId"),
@@ -728,7 +727,7 @@ void WindowsTelemetry::LogSessionCreationEnd(uint32_t session_id,
                     TraceLoggingString(ORT_CALLER_FRAMEWORK, "frameworkName"));
 }
 
-void WindowsTelemetry::LogRunStart(uint32_t session_id, uint64_t run_id) const {
+void WindowsTelemetry::LogRunStart(uint32_t session_id) const {
   if (global_register_count_ == 0 || enabled_ == false)
     return;
 
@@ -741,7 +740,6 @@ void WindowsTelemetry::LogRunStart(uint32_t session_id, uint64_t run_id) const {
                     // Telemetry info
                     TraceLoggingUInt8(0, "schemaVersion"),
                     TraceLoggingUInt32(session_id, "sessionId"),
-                    TraceLoggingUInt64(run_id, "runId"),
                     TraceLoggingString(ORT_CALLER_FRAMEWORK, "frameworkName"));
 }
 

onnxruntime/core/platform/windows/telemetry.h

@@ -101,7 +101,7 @@ class WindowsTelemetry : public Telemetry {
   void LogSessionCreationEnd(uint32_t session_id,
                            const common::Status& status) const override;
 
-  void LogRunStart(uint32_t session_id, uint64_t run_id) const override;
+  void LogRunStart(uint32_t session_id) const override;
 
   void LogRegisterEpLibraryWithLibPath(const std::string& registration_name,
                                        const std::string& lib_path) const override;

onnxruntime/core/session/inference_session.cc

@@ -3034,10 +3034,7 @@ Status InferenceSession::Run(const RunOptions& run_options,
   Status retval = Status::OK();
   const Env& env = Env::Default();
 
-  // Assign a unique run_id for telemetry correlation
-  const uint64_t run_id = run_id_counter_.fetch_add(1);
-
-  // Determine whether to emit Run telemetry (LogRunStart + LogRuntimePerf pair)
+  // Determine whether to emit Run telemetry
   bool emit_run_telemetry = false;
   {
     std::lock_guard<std::mutex> telemetry_lock(telemetry_mutex_);
@@ -3047,7 +3044,7 @@ Status InferenceSession::Run(const RunOptions& run_options,
   }
 
   if (emit_run_telemetry) {
-    env.GetTelemetryProvider().LogRunStart(session_id_, run_id);
+    env.GetTelemetryProvider().LogRunStart(session_id_);
   }
 
   int graph_annotation_id = 0;
@@ -3245,7 +3242,7 @@ Status InferenceSession::Run(const RunOptions& run_options,
     telemetry_.total_run_duration_since_last_ += TimeDiffMicroSeconds(tp);
     telemetry_.duration_per_batch_size_[batch_size] += TimeDiffMicroSeconds(tp);
 
-    // Emit RuntimePerf paired with the LogRunStart that fired at entry
+    // Emit RuntimePerf
     if (emit_run_telemetry) {
       env.GetTelemetryProvider().LogRuntimePerf(session_id_, telemetry_.total_runs_since_last_,
                                                 telemetry_.total_run_duration_since_last_,

onnxruntime/core/session/inference_session.h

@@ -982,8 +982,6 @@ class InferenceSession {
     long long runtime_perf_interval_ = kRuntimePerfInitialInterval;
   } telemetry_;
 
-  std::atomic<uint64_t> run_id_counter_{0};  // monotonically increasing run id for correlation
-
   mutable std::mutex telemetry_mutex_;  // to ensure thread-safe access to telemetry data
 
 #ifdef ONNXRUNTIME_ENABLE_INSTRUMENT