From 69172d60075a67446e0c3612b4c688e40078e14e Mon Sep 17 00:00:00 2001
From: Jon Lamb <jon@auxon.io>
Date: Sat, 21 Sep 2024 12:25:52 -0700
Subject: [PATCH] Indicate multiple core sessions in thread name

---
 src/manager.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/manager.rs b/src/manager.rs
index 36ac694..6b59aaf 100644
--- a/src/manager.rs
+++ b/src/manager.rs
@@ -246,6 +246,19 @@ impl Manager {
             return Err(ManagerError::RttSessionAlreadyStarted);
         }
 
+        let core_thread_name_suffix = {
+            let num_sessions_on_core = probe_state
+                .proxy_sessions
+                .values()
+                .filter(|ps| ps.target_cfg.core == req_cfg.target.core)
+                .count();
+            if num_sessions_on_core == 0 {
+                format!("{}", req_cfg.target.core)
+            } else {
+                format!("{}.{}", req_cfg.target.core, num_sessions_on_core)
+            }
+        };
+
         let proxy_session_id = Uuid::new_v4();
         let spawn_args = rtt_session::SpawnArgs {
             proxy_session_id,
@@ -254,7 +267,7 @@ impl Manager {
             // https://github.com/tokio-rs/tracing/issues/2465
             thread_name: format!(
                 "{}::{}:{}",
-                probe_id, probe_state.cfg.target, req_cfg.target.core
+                probe_id, probe_state.cfg.target, core_thread_name_suffix
             ),
             probe_cfg: req_cfg.probe,
             target_cfg: req_cfg.target.clone(),