add tls to tonic

This commit is contained in:
Ruben Fiszel
2024-12-08 00:34:46 +01:00
parent f7e10c5297
commit 324def26e3
6 changed files with 13 additions and 13 deletions
+2
View File
@@ -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",
+2
View File
@@ -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" }
+1 -1
View File
@@ -1 +1 @@
ad89b5a1566159490eceb59c3e5c9416d9aa855c
81a479d534e7c1ed55c095bf8fcb42104f0b33f5
+1 -1
View File
@@ -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");
+4 -10
View File
@@ -29,18 +29,12 @@ impl<B> OnResponse<B> 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")
}
}
}
+3 -1
View File
@@ -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 }