From da534e73380f3cc53ca0de073e1ea862ae32109b Mon Sep 17 00:00:00 2001
From: Alan Hanson <alan@oxidecomputer.com>
Date: Thu, 19 Oct 2023 15:32:11 -0700
Subject: [PATCH] Add session_id to crucible logs (#1009)

Add a slog field called session_id and put the unique session_id
in that field.  This should allow better reading of logs when a
single propolis starts multiple upstairs, all sharing the same log
file.

The incorrect session_id was also printed and this was fixed.
---
 upstairs/src/lib.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/upstairs/src/lib.rs b/upstairs/src/lib.rs
index 32977ada5..5562ba88f 100644
--- a/upstairs/src/lib.rs
+++ b/upstairs/src/lib.rs
@@ -5358,7 +5358,6 @@ impl Upstairs {
         });
 
         let uuid = opt.id;
-        info!(log, "Crucible stats registered with UUID: {}", uuid);
         let stats = UpStatOuter {
             up_stat_wrap: Arc::new(std::sync::Mutex::new(UpCountStat::new(
                 uuid,
@@ -5371,11 +5370,15 @@ impl Upstairs {
         };
 
         let session_id = Uuid::new_v4();
+        let log = log.new(o!("session_id" => session_id.to_string()));
         info!(log, "Crucible {} has session id: {}", uuid, session_id);
+        info!(log, "Upstairs opts: {}", opt);
+
+        info!(log, "Crucible stats registered with UUID: {}", uuid);
         Arc::new(Upstairs {
             active: Mutex::new(UpstairsState::default()),
             uuid,
-            session_id: Uuid::new_v4(),
+            session_id,
             generation: AtomicU64::new(gen),
             guest,
             downstairs: Mutex::new(Downstairs::new(log.clone(), ds_target)),
@@ -10282,7 +10285,6 @@ pub async fn up_main(
         "Upstairs <-> Downstairs Message Version: {}", CRUCIBLE_MESSAGE_VERSION
     );
 
-    info!(log, "Upstairs opts: {}", opt);
     if let Some(rd) = region_def {
         info!(log, "Using region definition {:?}", rd);
     }