git.delta.rocks / jrsonnet / refs/commits / b8e16d6ad91e

641 "futures",641 "futures",
642]642]
643
644[[package]]
645name = "core-foundation"
646version = "0.10.1"
647source = "registry+https://github.com/rust-lang/crates.io-index"
648checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
649dependencies = [
650 "core-foundation-sys",
651 "libc",
652]
643653
644[[package]]654[[package]]
645name = "core-foundation-sys"655name = "core-foundation-sys"
974 "nom 8.0.0",984 "nom 8.0.0",
975 "openssh",985 "openssh",
976 "opentelemetry",986 "opentelemetry",
987 "opentelemetry-appender-tracing",
988 "opentelemetry-exporter-env",
977 "opentelemetry_sdk",989 "opentelemetry_sdk",
978 "peg",990 "peg",
979 "regex",991 "regex",
1239checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"1251checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
1240dependencies = [1252dependencies = [
1241 "cfg-if",1253 "cfg-if",
1254 "js-sys",
1242 "libc",1255 "libc",
1243 "wasi",1256 "wasi",
1257 "wasm-bindgen",
1244]1258]
12451259
1246[[package]]1260[[package]]
1250checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"1264checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
1251dependencies = [1265dependencies = [
1252 "cfg-if",1266 "cfg-if",
1267 "js-sys",
1253 "libc",1268 "libc",
1254 "r-efi 5.3.0",1269 "r-efi 5.3.0",
1255 "wasip2",1270 "wasip2",
1271 "wasm-bindgen",
1256]1272]
12571273
1258[[package]]1274[[package]]
1449 "want",1465 "want",
1450]1466]
1467
1468[[package]]
1469name = "hyper-rustls"
1470version = "0.27.7"
1471source = "registry+https://github.com/rust-lang/crates.io-index"
1472checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
1473dependencies = [
1474 "http",
1475 "hyper",
1476 "hyper-util",
1477 "rustls",
1478 "rustls-native-certs",
1479 "rustls-pki-types",
1480 "tokio",
1481 "tokio-rustls",
1482 "tower-service",
1483]
14511484
1452[[package]]1485[[package]]
1453name = "hyper-timeout"1486name = "hyper-timeout"
1904source = "registry+https://github.com/rust-lang/crates.io-index"1937source = "registry+https://github.com/rust-lang/crates.io-index"
1905checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"1938checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
1939
1940[[package]]
1941name = "lru-slab"
1942version = "0.1.2"
1943source = "registry+https://github.com/rust-lang/crates.io-index"
1944checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
19061945
1907[[package]]1946[[package]]
1908name = "matchers"1947name = "matchers"
2122 "tokio",2161 "tokio",
2123]2162]
2163
2164[[package]]
2165name = "openssl-probe"
2166version = "0.2.1"
2167source = "registry+https://github.com/rust-lang/crates.io-index"
2168checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
21242169
2125[[package]]2170[[package]]
2126name = "opentelemetry"2171name = "opentelemetry"
2136 "tracing",2181 "tracing",
2137]2182]
2183
2184[[package]]
2185name = "opentelemetry-appender-tracing"
2186version = "0.31.1"
2187source = "registry+https://github.com/rust-lang/crates.io-index"
2188checksum = "ef6a1ac5ca3accf562b8c306fa8483c85f4390f768185ab775f242f7fe8fdcc2"
2189dependencies = [
2190 "opentelemetry",
2191 "tracing",
2192 "tracing-core",
2193 "tracing-subscriber",
2194]
21382195
2139[[package]]2196[[package]]
2140name = "opentelemetry-exporter-env"2197name = "opentelemetry-exporter-env"
2550 "prost 0.13.5",2607 "prost 0.13.5",
2551]2608]
2609
2610[[package]]
2611name = "quinn"
2612version = "0.11.9"
2613source = "registry+https://github.com/rust-lang/crates.io-index"
2614checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
2615dependencies = [
2616 "bytes",
2617 "cfg_aliases",
2618 "pin-project-lite",
2619 "quinn-proto",
2620 "quinn-udp",
2621 "rustc-hash 2.1.1",
2622 "rustls",
2623 "socket2 0.5.10",
2624 "thiserror 2.0.18",
2625 "tokio",
2626 "tracing",
2627 "web-time",
2628]
2629
2630[[package]]
2631name = "quinn-proto"
2632version = "0.11.14"
2633source = "registry+https://github.com/rust-lang/crates.io-index"
2634checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
2635dependencies = [
2636 "bytes",
2637 "getrandom 0.3.4",
2638 "lru-slab",
2639 "rand 0.9.2",
2640 "ring",
2641 "rustc-hash 2.1.1",
2642 "rustls",
2643 "rustls-pki-types",
2644 "slab",
2645 "thiserror 2.0.18",
2646 "tinyvec",
2647 "tracing",
2648 "web-time",
2649]
2650
2651[[package]]
2652name = "quinn-udp"
2653version = "0.5.14"
2654source = "registry+https://github.com/rust-lang/crates.io-index"
2655checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
2656dependencies = [
2657 "cfg_aliases",
2658 "libc",
2659 "once_cell",
2660 "socket2 0.5.10",
2661 "tracing",
2662 "windows-sys 0.52.0",
2663]
25522664
2553[[package]]2665[[package]]
2554name = "quote"2666name = "quote"
2729 "http-body",2841 "http-body",
2730 "http-body-util",2842 "http-body-util",
2731 "hyper",2843 "hyper",
2844 "hyper-rustls",
2732 "hyper-util",2845 "hyper-util",
2733 "js-sys",2846 "js-sys",
2734 "log",2847 "log",
2735 "percent-encoding",2848 "percent-encoding",
2736 "pin-project-lite",2849 "pin-project-lite",
2850 "quinn",
2851 "rustls",
2852 "rustls-native-certs",
2853 "rustls-pki-types",
2737 "serde",2854 "serde",
2738 "serde_json",2855 "serde_json",
2739 "serde_urlencoded",2856 "serde_urlencoded",
2740 "sync_wrapper",2857 "sync_wrapper",
2741 "tokio",2858 "tokio",
2859 "tokio-rustls",
2742 "tower 0.5.3",2860 "tower 0.5.3",
2743 "tower-http 0.6.8",2861 "tower-http 0.6.8",
2744 "tower-service",2862 "tower-service",
2897 "zeroize",3015 "zeroize",
2898]3016]
3017
3018[[package]]
3019name = "rustls-native-certs"
3020version = "0.8.3"
3021source = "registry+https://github.com/rust-lang/crates.io-index"
3022checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
3023dependencies = [
3024 "openssl-probe",
3025 "rustls-pki-types",
3026 "schannel",
3027 "security-framework",
3028]
28993029
2900[[package]]3030[[package]]
2901name = "rustls-pemfile"3031name = "rustls-pemfile"
2912source = "registry+https://github.com/rust-lang/crates.io-index"3042source = "registry+https://github.com/rust-lang/crates.io-index"
2913checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"3043checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
2914dependencies = [3044dependencies = [
3045 "web-time",
2915 "zeroize",3046 "zeroize",
2916]3047]
29173048
2956 "winapi-util",3087 "winapi-util",
2957]3088]
3089
3090[[package]]
3091name = "schannel"
3092version = "0.1.29"
3093source = "registry+https://github.com/rust-lang/crates.io-index"
3094checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
3095dependencies = [
3096 "windows-sys 0.61.2",
3097]
29583098
2959[[package]]3099[[package]]
2960name = "scopeguard"3100name = "scopeguard"
2988 "zeroize",3128 "zeroize",
2989]3129]
3130
3131[[package]]
3132name = "security-framework"
3133version = "3.7.0"
3134source = "registry+https://github.com/rust-lang/crates.io-index"
3135checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
3136dependencies = [
3137 "bitflags",
3138 "core-foundation",
3139 "core-foundation-sys",
3140 "libc",
3141 "security-framework-sys",
3142]
3143
3144[[package]]
3145name = "security-framework-sys"
3146version = "2.17.0"
3147source = "registry+https://github.com/rust-lang/crates.io-index"
3148checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
3149dependencies = [
3150 "core-foundation-sys",
3151 "libc",
3152]
29903153
2991[[package]]3154[[package]]
2992name = "self_cell"3155name = "self_cell"
3454 "zerovec",3617 "zerovec",
3455]3618]
3619
3620[[package]]
3621name = "tinyvec"
3622version = "1.11.0"
3623source = "registry+https://github.com/rust-lang/crates.io-index"
3624checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
3625dependencies = [
3626 "tinyvec_macros",
3627]
3628
3629[[package]]
3630name = "tinyvec_macros"
3631version = "0.1.1"
3632source = "registry+https://github.com/rust-lang/crates.io-index"
3633checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
34563634
3457[[package]]3635[[package]]
3458name = "tokio"3636name = "tokio"

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@
 fleet-shared = { path = "./crates/fleet-shared" }
 nix-eval = { path = "./crates/nix-eval" }
 nixlike = { path = "./crates/nixlike" }
+opentelemetry-exporter-env = { path = "./crates/opentelemetry-exporter-env" }
 
 abort-on-drop = "0.2"
 age = { version = "0.11", features = ["plugin", "ssh"] }
@@ -40,8 +41,9 @@
 nix = { version = "0.31.2", features = ["fs", "user"] }
 nom = "8.0.0"
 opentelemetry = "0.31.0"
-opentelemetry-otlp = { version = "0.31.0", features = ["grpc-tonic", "gzip-tonic", "http-json"] }
+opentelemetry-otlp = { version = "0.31.0", features = ["grpc-tonic", "gzip-tonic", "http-json", "reqwest-rustls"] }
 opentelemetry_sdk = "0.31.0"
+opentelemetry-appender-tracing = "0.31.1"
 openssh = "0.11.5"
 peg = "0.8.5"
 pkg-config = "0.3.30"

--- a/cmds/fleet/Cargo.toml
+++ b/cmds/fleet/Cargo.toml
@@ -48,6 +48,8 @@
 thiserror.workspace = true
 tracing-indicatif = { workspace = true, optional = true }
 tracing-opentelemetry.workspace = true
+opentelemetry-exporter-env.workspace = true
+opentelemetry-appender-tracing.workspace = true
 
 [features]
 default = ["indicatif"]

--- a/cmds/fleet/src/main.rs
+++ b/cmds/fleet/src/main.rs
@@ -25,6 +25,12 @@
 use nix_eval::{
 	gc_register_my_thread, gc_unregister_my_thread, init_libraries, init_tokio_for_nix,
 };
+use opentelemetry::trace::TracerProvider;
+use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
+use opentelemetry_exporter_env::{
+	OtlpBaseSettings, OtlpLogsSettings, OtlpTracesSettings, ResolvedOtlpSettings,
+};
+use opentelemetry_sdk::{logs::SdkLoggerProvider, trace::SdkTracerProvider};
 use tracing::{Instrument, error, info, info_span};
 #[cfg(feature = "indicatif")]
 use tracing_indicatif::IndicatifLayer;
@@ -96,6 +102,14 @@
 	fleet_opts: FleetOpts,
 	#[clap(subcommand)]
 	command: Opts,
+	#[clap(long, next_help_heading = "Telemetry", env = "OTEL_FLEET")]
+	otel: bool,
+	#[clap(flatten)]
+	otlp_base: OtlpBaseSettings,
+	#[clap(flatten)]
+	otel_logs: OtlpLogsSettings,
+	#[clap(flatten)]
+	otel_traces: OtlpTracesSettings,
 }
 
 async fn run_command(config: &Config, opts: FleetOpts, command: Opts) -> Result<()> {
@@ -115,7 +129,7 @@
 	Ok(())
 }
 
-fn setup_logging() {
+fn setup_logging(opts: &RootOpts) -> Result<()> {
 	#[cfg(feature = "indicatif")]
 	let indicatif_layer = {
 		use std::time::Duration;
@@ -173,12 +187,35 @@
 		sub.with_filter(filter) // .without,
 	});
 
-	if env::var_os("FLEET_OTEL").is_some() {}
-
-	// #[cfg(feature = "indicatif")]
 	#[cfg(feature = "indicatif")]
 	let reg = reg.with(indicatif_layer);
-	reg.init();
+
+	if opts.otel {
+		let traces = ResolvedOtlpSettings::traces(&opts.otlp_base, &opts.otel_traces)?;
+		let span_exporter = traces.span_exporter()?;
+		let logs = ResolvedOtlpSettings::logs(&opts.otlp_base, &opts.otel_logs)?;
+		let log_exporter = logs.log_exporter()?;
+
+		let span_provider = SdkTracerProvider::builder()
+			.with_batch_exporter(span_exporter)
+			.build();
+		let log_provider = SdkLoggerProvider::builder()
+			.with_batch_exporter(log_exporter)
+			.build();
+
+		let logger = OpenTelemetryTracingBridge::new(&log_provider);
+		let tracer = span_provider.tracer("fleet");
+
+		let reg = reg
+			.with(tracing_opentelemetry::layer().with_tracer(tracer))
+			.with(logger);
+
+		reg.init();
+	} else {
+		reg.init();
+	};
+
+	Ok(())
 }
 
 fn main() -> ExitCode {
@@ -188,7 +225,10 @@
 		return ExitCode::SUCCESS;
 	}
 
-	setup_logging();
+	if let Err(e) = setup_logging(&opts) {
+		eprintln!("{e:#}");
+		return ExitCode::FAILURE;
+	}
 
 	init_libraries();
 

--- a/crates/fleet-base/src/opts.rs
+++ b/crates/fleet-base/src/opts.rs
@@ -96,7 +96,7 @@
 	#[clap(long, default_value = env!("NIX_SYSTEM"))]
 	pub local_system: String,
 
-	/// By default fleet continues on single derivation build failure
+	/// By default fleet continues on single derivation build failure;
 	/// this flag makes command fail immediately
 	///
 	/// Opposite of Nix's --keep-going

--- a/crates/opentelemetry-exporter-env/src/lib.rs
+++ b/crates/opentelemetry-exporter-env/src/lib.rs
@@ -196,7 +196,12 @@
 		pub struct $id {
 			$(
 				$(#[doc = $doc])*
-				#[cfg_attr(feature = "clap", arg(long = concat!("otel-exporter-otlp-", $long_prefix, $long), env = concat!("OTEL_EXPORTER_OTLP_", $env_prefix, $env) $(, $($tt)*)?))]
+				#[cfg_attr(feature = "clap", arg(
+						long = concat!("otel-exporter-otlp-", $long_prefix, $long),
+						id = concat!("otel-exporter-otlp-", $long_prefix, $long),
+						env = concat!("OTEL_EXPORTER_OTLP_", $env_prefix, $env)
+						$(, $($tt)*)?)
+				)]
 				pub $name: Option<$ty>,
 			)*
 		}