add hostname to logs

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"] }
 

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
 }
 

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};