difftreelog
feat otel exporter ported to base fleet
in: trunk
6 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -642,6 +642,16 @@
]
[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
name = "core-foundation-sys"
version = "0.8.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -974,6 +984,8 @@
"nom 8.0.0",
"openssh",
"opentelemetry",
+ "opentelemetry-appender-tracing",
+ "opentelemetry-exporter-env",
"opentelemetry_sdk",
"peg",
"regex",
@@ -1239,8 +1251,10 @@
checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"wasi",
+ "wasm-bindgen",
]
[[package]]
@@ -1250,9 +1264,11 @@
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"r-efi 5.3.0",
"wasip2",
+ "wasm-bindgen",
]
[[package]]
@@ -1450,6 +1466,23 @@
]
[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
name = "hyper-timeout"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1905,6 +1938,12 @@
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
+[[package]]
name = "matchers"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2123,6 +2162,12 @@
]
[[package]]
+name = "openssl-probe"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+
+[[package]]
name = "opentelemetry"
version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2137,6 +2182,18 @@
]
[[package]]
+name = "opentelemetry-appender-tracing"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef6a1ac5ca3accf562b8c306fa8483c85f4390f768185ab775f242f7fe8fdcc2"
+dependencies = [
+ "opentelemetry",
+ "tracing",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
name = "opentelemetry-exporter-env"
version = "0.1.0"
dependencies = [
@@ -2551,6 +2608,61 @@
]
[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.1.1",
+ "rustls",
+ "socket2 0.5.10",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
+dependencies = [
+ "bytes",
+ "getrandom 0.3.4",
+ "lru-slab",
+ "rand 0.9.2",
+ "ring",
+ "rustc-hash 2.1.1",
+ "rustls",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.18",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2 0.5.10",
+ "tracing",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
name = "quote"
version = "1.0.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2729,16 +2841,22 @@
"http-body",
"http-body-util",
"hyper",
+ "hyper-rustls",
"hyper-util",
"js-sys",
"log",
"percent-encoding",
"pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"tokio",
+ "tokio-rustls",
"tower 0.5.3",
"tower-http 0.6.8",
"tower-service",
@@ -2898,6 +3016,18 @@
]
[[package]]
+name = "rustls-native-certs"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
name = "rustls-pemfile"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2912,6 +3042,7 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
dependencies = [
+ "web-time",
"zeroize",
]
@@ -2957,6 +3088,15 @@
]
[[package]]
+name = "schannel"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2989,6 +3129,29 @@
]
[[package]]
+name = "security-framework"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
name = "self_cell"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3455,6 +3618,21 @@
]
[[package]]
+name = "tinyvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
name = "tokio"
version = "1.50.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
Cargo.tomldiffbeforeafterboth--- 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"
cmds/fleet/Cargo.tomldiffbeforeafterboth--- 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"]
cmds/fleet/src/main.rsdiffbeforeafterboth1#![recursion_limit = "512"]23pub(crate) mod cmds;4// pub(crate) mod command;5pub(crate) mod extra_args;67use std::{env, ffi::OsString, process::ExitCode, sync::Arc};89use anyhow::{Result, bail};10use clap::{CommandFactory, Parser};11use cmds::{12 build_systems::{BuildSystems, Deploy},13 complete::Complete,14 info::Info,15 rollback::RollbackSingle,16 secrets::Secret,17 tf::Tf,18};19use fleet_base::{host::Config, opts::FleetOpts};20use futures::{TryStreamExt, stream::FuturesUnordered};21#[cfg(feature = "indicatif")]22use human_repr::HumanCount;23#[cfg(feature = "indicatif")]24use indicatif::{ProgressState, ProgressStyle};25use nix_eval::{26 gc_register_my_thread, gc_unregister_my_thread, init_libraries, init_tokio_for_nix,27};28use tracing::{Instrument, error, info, info_span};29#[cfg(feature = "indicatif")]30use tracing_indicatif::IndicatifLayer;31use tracing_subscriber::{EnvFilter, prelude::*};3233#[derive(Parser)]34struct Prefetch {}35impl Prefetch {36 async fn run(&self, config: &Config) -> Result<()> {37 let mut prefetch_dir = config.directory.to_path_buf();38 prefetch_dir.push("prefetch");39 if !prefetch_dir.is_dir() {40 info!("nothing to prefetch: no prefetch directory");41 return Ok(());42 }43 let tasks = FuturesUnordered::new();44 for entry in std::fs::read_dir(&prefetch_dir)? {45 tasks.push(async {46 let entry = entry?;47 if !entry.metadata()?.is_file() {48 bail!("only files should exist in prefetch directory");49 }50 let span = info_span!(51 "prefetching",52 name = entry.file_name().to_string_lossy().as_ref()53 );54 let mut path = OsString::new();55 path.push("file://");56 path.push(entry.path());5758 let mut status = config.local_host().cmd("nix").await?;59 status.args(&config.nix_args);60 status.arg("store").arg("prefetch-file").arg(path);61 status.run_nix_string().instrument(span).await?;62 Ok(())63 });64 }65 tasks.try_collect::<Vec<()>>().await?;66 Ok(())67 }68}6970#[derive(Parser)]71enum Opts {72 /// Build system closures73 BuildSystems(BuildSystems),74 /// Upload and switch system closures75 Deploy(Deploy),76 /// Rollback remote machine by redeploying old generation as the new one77 RollbackSingle(RollbackSingle),78 /// Secret management79 #[clap(subcommand)]80 Secret(Secret),81 /// Upload prefetch directory to the nix store82 Prefetch(Prefetch),83 /// Config parsing84 Info(Info),85 /// Command completions86 #[clap(hide(true))]87 Complete(Complete),88 /// Compile and evaluate terranix configuration89 Tf(Tf),90}9192#[derive(Parser)]93#[clap(version, author)]94struct RootOpts {95 #[clap(flatten)]96 fleet_opts: FleetOpts,97 #[clap(subcommand)]98 command: Opts,99}100101async fn run_command(config: &Config, opts: FleetOpts, command: Opts) -> Result<()> {102 match command {103 Opts::BuildSystems(c) => c.run(config, &opts).await?,104 Opts::Deploy(d) => d.run(config, &opts).await?,105 Opts::RollbackSingle(r) => r.run(config, &opts).await?,106 Opts::Secret(s) => s.run(config, &opts).await?,107 Opts::Info(i) => i.run(config).await?,108 Opts::Prefetch(p) => p.run(config).await?,109 Opts::Tf(t) => t.run(config).await?,110 // TODO: actually parse commands before starting the async runtime111 Opts::Complete(c) => {112 tokio::task::spawn_blocking(move || c.run(RootOpts::command())).await?113 }114 };115 Ok(())116}117118fn setup_logging() {119 #[cfg(feature = "indicatif")]120 let indicatif_layer = {121 use std::time::Duration;122123 IndicatifLayer::new().with_max_progress_bars(10, Some(ProgressStyle::default_spinner()))124 .with_progress_style(125 ProgressStyle::with_template(126 "{color_start}{span_child_prefix} {span_name}{{{span_fields}}}{color_end} {wide_msg} {color_start}{download_progress} {elapsed}{color_end}",127 )128 .unwrap()129 .with_key("download_progress", |state: &ProgressState, writer: &mut dyn std::fmt::Write| {130 let Some(len) = state.len() else {131 return;132 };133 let pos = state.pos();134 if pos > len {135 let _ = write!(writer, "{}", pos.human_count_bare());136 } else {137 let _ = write!(writer, "{} / {}", pos.human_count_bare(), len.human_count_bare());138 }139 })140 .with_key(141 "color_start",142 |state: &ProgressState, writer: &mut dyn std::fmt::Write| {143 let elapsed = state.elapsed();144145 if elapsed > Duration::from_secs(60) {146 // Red147 let _ = write!(writer, "\x1b[{}m", 1 + 30);148 } else if elapsed > Duration::from_secs(30) {149 // Yellow150 let _ = write!(writer, "\x1b[{}m", 3 + 30);151 }152 },153 )154 .with_key(155 "color_end",156 |state: &ProgressState, writer: &mut dyn std::fmt::Write| {157 if state.elapsed() > Duration::from_secs(30) {158 let _ = write!(writer, "\x1b[0m");159 }160 },161 ),162 )163 };164165 let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));166167 let reg = tracing_subscriber::registry().with({168 let sub = tracing_subscriber::fmt::layer()169 .without_time()170 .with_target(false);171 #[cfg(feature = "indicatif")]172 let sub = sub.with_writer(indicatif_layer.get_stderr_writer());173 sub.with_filter(filter) // .without,174 });175176 if env::var_os("FLEET_OTEL").is_some() {}177178 // #[cfg(feature = "indicatif")]179 #[cfg(feature = "indicatif")]180 let reg = reg.with(indicatif_layer);181 reg.init();182}183184fn main() -> ExitCode {185 let opts = RootOpts::parse();186 if let Opts::Complete(c) = &opts.command {187 c.run(RootOpts::command());188 return ExitCode::SUCCESS;189 }190191 setup_logging();192193 init_libraries();194195 let runtime = tokio::runtime::Builder::new_multi_thread()196 .enable_all()197 .on_thread_start(|| {198 gc_register_my_thread();199 })200 .on_thread_stop(|| {201 gc_unregister_my_thread();202 })203 .build()204 .expect("failed to build runtime");205 let runtime = Arc::new(runtime);206207 init_tokio_for_nix(runtime.clone());208209 runtime.block_on(async {210 tokio::task::spawn(async move {211 if let Err(e) = main_real(opts).await {212 error!("{e:#}");213 ExitCode::FAILURE214 } else {215 ExitCode::SUCCESS216 }217 })218 .await219 .expect("primary task panicked")220 })221 // async_main(opts)222}223224async fn main_real(opts: RootOpts) -> Result<()> {225 let nix_args = std::env::var_os("NIX_ARGS")226 .map(|a| extra_args::parse_os(&a))227 .transpose()?228 .unwrap_or_default();229 let config = opts.fleet_opts.build(230 nix_args,231 matches!(opts.command, Opts::Deploy(_) | Opts::BuildSystems(_)),232 )?;233234 match run_command(&config, opts.fleet_opts, opts.command).await {235 Ok(()) => {236 config.save()?;237 Ok(())238 }239 Err(e) => {240 let _ = config.save();241 Err(e)242 }243 }244}245246#[cfg(test)]247mod tests {248 use super::*;249250 #[test]251 fn verify_command() {252 use clap::CommandFactory;253 RootOpts::command().debug_assert();254 }255}crates/fleet-base/src/opts.rsdiffbeforeafterboth--- 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
crates/opentelemetry-exporter-env/src/lib.rsdiffbeforeafterboth--- 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>,
)*
}