From fccc889e1486f11f0fc37fe3bf46632b35c3c164 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 8 Dec 2024 09:38:37 +0100
Subject: [PATCH] add hostname to logs

---
 backend/Cargo.toml                          | 2 +-
 backend/windmill-common/src/otel_ee.rs      | 9 ++++++---
 backend/windmill-common/src/tracing_init.rs | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 714ae5ab3f..ec6ee6048b 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -284,7 +284,7 @@ tracing-opentelemetry = "0.28.0"
 opentelemetry_sdk = { version = "*", features = ["rt-tokio"] }
 opentelemetry-otlp = { version = "0.27.0", features = ["grpc-tonic", "tls"] }
 opentelemetry-appender-tracing = "0.27.0"
-opentelemetry-semantic-conventions = "*"
+opentelemetry-semantic-conventions = { version = "*", features = ["semconv_experimental"] }
 
 tonic = { version = "^0", features = ["tls-native-roots"] }
 
diff --git a/backend/windmill-common/src/otel_ee.rs b/backend/windmill-common/src/otel_ee.rs
index f310885c0b..e33f2ff486 100644
--- a/backend/windmill-common/src/otel_ee.rs
+++ b/backend/windmill-common/src/otel_ee.rs
@@ -38,16 +38,19 @@ pub trait FutureExt: Sized {
 
 use tracing_subscriber::EnvFilter;
 
-pub(crate) fn init_logs_bridge(_mode: &Mode) -> Option<EnvFilter> {
+pub(crate) fn init_logs_bridge(_mode: &Mode, _hostname: &str) -> Option<EnvFilter> {
     None
 }
 
 #[cfg(all(feature = "otel", feature = "enterprise"))]
-pub(crate) fn init_otlp_tracer(_mode: &Mode) -> Option<opentelemetry_sdk::trace::Tracer> {
+pub(crate) fn init_otlp_tracer(
+    _mode: &Mode,
+    _hostname: &str,
+) -> Option<opentelemetry_sdk::trace::Tracer> {
     None
 }
 
-pub(crate) fn init_meter_provider(_mode: &Mode) -> OtelProvider {
+pub(crate) fn init_meter_provider(_mode: &Mode, _hostname: &str) -> OtelProvider {
     None
 }
 
diff --git a/backend/windmill-common/src/tracing_init.rs b/backend/windmill-common/src/tracing_init.rs
index af34540add..962f99204e 100644
--- a/backend/windmill-common/src/tracing_init.rs
+++ b/backend/windmill-common/src/tracing_init.rs
@@ -57,16 +57,16 @@ pub fn initialize_tracing(
         )
     }
 
-    let meter_provider = crate::otel_ee::init_meter_provider(mode);
+    let meter_provider = crate::otel_ee::init_meter_provider(mode, hostname);
 
     #[cfg(all(feature = "otel", feature = "enterprise"))]
-    let opentelemetry = crate::otel_ee::init_otlp_tracer(mode)
+    let opentelemetry = crate::otel_ee::init_otlp_tracer(mode, hostname)
         .map(|x| tracing_opentelemetry::layer().with_tracer(x));
 
     #[cfg(not(all(feature = "otel", feature = "enterprise")))]
     let opentelemetry: Option<EnvFilter> = None;
 
-    let logs_bridge = crate::otel_ee::init_logs_bridge(&mode);
+    let logs_bridge = crate::otel_ee::init_logs_bridge(&mode, hostname);
 
     use tracing_appender::rolling::{RollingFileAppender, Rotation};