From d662e18f97c2edc3d60df9496b0927901edb26a5 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Thu, 22 May 2025 12:07:21 +0200
Subject: [PATCH] add more labels to traces

---
 backend/windmill-queue/src/jobs.rs           |  1 +
 backend/windmill-worker/src/handle_child.rs  | 11 +++++++----
 backend/windmill-worker/src/job_logger_ee.rs |  1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index 1ff103cd9a..f2b1e56153 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -980,6 +980,7 @@ pub async fn add_completed_job<T: Serialize + Send + Sync + ValidableJson>(
             is_flow_step = queued_job.is_flow_step(),
             language = ?queued_job.script_lang,
             scheduled_for = ?queued_job.scheduled_for,
+            workspace_id = ?queued_job.workspace_id,
             success,
             "inserted completed job: {} (success: {success})",
             queued_job.id
diff --git a/backend/windmill-worker/src/handle_child.rs b/backend/windmill-worker/src/handle_child.rs
index d82a72df98..c47af18073 100644
--- a/backend/windmill-worker/src/handle_child.rs
+++ b/backend/windmill-worker/src/handle_child.rs
@@ -134,7 +134,7 @@ pub async fn handle_child(
     let (tx, rx) = broadcast::channel::<()>(3);
     let mut rx2: broadcast::Receiver<()> = tx.subscribe();
 
-    let output = child_joined_output_stream(&mut child, job_id.clone());
+    let output = child_joined_output_stream(&mut child, job_id.clone(), w_id.to_string());
 
     let job_id: Uuid = job_id.clone();
 
@@ -729,6 +729,7 @@ where
 fn child_joined_output_stream(
     child: &mut Child,
     job_id: Uuid,
+    w_id: String,
 ) -> impl stream::FusedStream<Item = io::Result<String>> {
     let stderr = child
         .stderr
@@ -743,8 +744,8 @@ fn child_joined_output_stream(
     let stdout = BufReader::new(stdout).lines();
     let stderr = BufReader::new(stderr).lines();
     stream::select(
-        lines_to_stream(stderr, true, job_id.clone()),
-        lines_to_stream(stdout, false, job_id),
+        lines_to_stream(stderr, true, job_id.clone(), w_id.clone(), path.clone()),
+        lines_to_stream(stdout, false, job_id, w_id, path),
     )
 }
 
@@ -752,11 +753,13 @@ pub fn lines_to_stream<R: tokio::io::AsyncBufRead + Unpin>(
     mut lines: tokio::io::Lines<R>,
     stderr: bool,
     job_id: Uuid,
+    w_id: String,
+    path: String,
 ) -> impl futures::Stream<Item = io::Result<String>> {
     stream::poll_fn(move |cx| {
         std::pin::Pin::new(&mut lines)
             .poll_next_line(cx)
-            .map(|result| process_streaming_log_lines(result, stderr, &job_id))
+            .map(|result| process_streaming_log_lines(result, stderr, &job_id, &w_id))
     })
 }
 
diff --git a/backend/windmill-worker/src/job_logger_ee.rs b/backend/windmill-worker/src/job_logger_ee.rs
index 4b1d34392c..22772878ee 100644
--- a/backend/windmill-worker/src/job_logger_ee.rs
+++ b/backend/windmill-worker/src/job_logger_ee.rs
@@ -36,6 +36,7 @@ pub(crate) fn process_streaming_log_lines(
     r: Result<Option<String>, io::Error>,
     _stderr: bool,
     _job_id: &Uuid,
+    _w_id: &str,
 ) -> Option<Result<String, io::Error>> {
     r.transpose()
 }