diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 30d392af13..130987e61e 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -9590,6 +9590,7 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.13.3", + "rustls-native-certs 0.8.1", "rustls-pemfile 2.2.0", "socket2", "tokio", @@ -10839,6 +10840,7 @@ dependencies = [ "thiserror 2.0.4", "tikv-jemalloc-ctl", "tokio", + "tonic", "tracing", "tracing-appender", "tracing-flame", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index d3cfd7ea63..714ae5ab3f 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -286,6 +286,8 @@ opentelemetry-otlp = { version = "0.27.0", features = ["grpc-tonic", "tls"] } opentelemetry-appender-tracing = "0.27.0" opentelemetry-semantic-conventions = "*" +tonic = { version = "^0", features = ["tls-native-roots"] } + tikv-jemallocator = { version = "0.5" } tikv-jemalloc-sys = { version = "^0.5" } tikv-jemalloc-ctl = { version = "^0.5" } diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index b5181c39f2..af9c8b5328 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -ad89b5a1566159490eceb59c3e5c9416d9aa855c \ No newline at end of file +81a479d534e7c1ed55c095bf8fcb42104f0b33f5 \ No newline at end of file diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs index 262927cce3..9acbbb1378 100644 --- a/backend/src/monitor.rs +++ b/backend/src/monitor.rs @@ -248,7 +248,7 @@ pub async fn load_otel(db: &DB) { if let Some(compression) = o.otel_exporter_otlp_compression { std::env::set_var("OTEL_EXPORTER_OTLP_COMPRESSION", compression); } - tracing::info!("OTEL settings loaded: tracing ({tracing_enabled}), logs ({logs_enabled}), metrics ({metrics_enabled}), endpoint ({:?}), headers defined: ({})", + println!("OTEL settings loaded: tracing ({tracing_enabled}), logs ({logs_enabled}), metrics ({metrics_enabled}), endpoint ({:?}), headers defined: ({})", o.otel_exporter_otlp_endpoint, o.otel_exporter_otlp_headers.is_some()); } else { tracing::error!("Error deserializing otel settings"); diff --git a/backend/windmill-api/src/tracing_init.rs b/backend/windmill-api/src/tracing_init.rs index c12cbe3192..5c4385f270 100644 --- a/backend/windmill-api/src/tracing_init.rs +++ b/backend/windmill-api/src/tracing_init.rs @@ -29,18 +29,12 @@ impl OnResponse for MyOnResponse { _span: &tracing::Span, ) { if *LOG_REQUESTS { + let latency = latency.as_millis(); + let status = response.status().as_u16(); if response.status().is_success() { - tracing::info!( - latency = latency.as_millis(), - status = response.status().as_u16(), - "response" - ) + tracing::info!(latency = latency, status = status, "response") } else { - tracing::error!( - latency = latency.as_millis(), - status = response.status().as_u16(), - "response" - ) + tracing::error!(latency = latency, status = status, "response") } } } diff --git a/backend/windmill-common/Cargo.toml b/backend/windmill-common/Cargo.toml index 5b9a74c361..99d5670f1b 100644 --- a/backend/windmill-common/Cargo.toml +++ b/backend/windmill-common/Cargo.toml @@ -13,7 +13,8 @@ flamegraph = ["dep:tracing-flame"] loki = ["dep:tracing-loki"] benchmark = [] parquet = ["dep:object_store", "dep:aws-config", "dep:aws-sdk-sts"] -otel = ["dep:opentelemetry-semantic-conventions", "dep:opentelemetry-otlp", "dep:opentelemetry_sdk", "dep:opentelemetry", "dep:tracing-opentelemetry", "dep:opentelemetry-appender-tracing"] +otel = ["dep:opentelemetry-semantic-conventions", "dep:opentelemetry-otlp", "dep:opentelemetry_sdk", + "dep:opentelemetry", "dep:tracing-opentelemetry", "dep:opentelemetry-appender-tracing", "dep:tonic"] [lib] name = "windmill_common" @@ -71,6 +72,7 @@ opentelemetry_sdk = { workspace = true, optional = true } opentelemetry = { workspace = true, optional = true } tracing-opentelemetry = { workspace = true, optional = true } opentelemetry-appender-tracing = { workspace = true, optional = true } +tonic = { workspace = true, optional = true } [target.'cfg(not(target_env = "msvc"))'.dependencies] tikv-jemalloc-ctl = { optional = true, workspace = true }