diff --git a/Cargo.lock b/Cargo.lock index 70fff920..a0ab6656 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,7 +17,7 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project 0.4.27", + "pin-project 0.4.28", "tokio", "tokio-util", ] @@ -153,7 +153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" dependencies = [ "futures-util", - "pin-project 0.4.27", + "pin-project 0.4.28", ] [[package]] @@ -213,7 +213,7 @@ dependencies = [ "futures-sink", "futures-util", "log", - "pin-project 0.4.27", + "pin-project 0.4.28", "slab", ] @@ -268,12 +268,17 @@ dependencies = [ ] [[package]] -name = "addr2line" -version = "0.14.1" +name = "actix-web-opentelemetry" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +checksum = "4ac71801f541f5225e71f522d56901b0be7fd6ee2181724a7e551b74249d0129" dependencies = [ - "gimli", + "actix-http", + "actix-web", + "futures", + "opentelemetry", + "opentelemetry-semantic-conventions", + "serde 1.0.125", ] [[package]] @@ -353,20 +358,6 @@ dependencies = [ "serde_urlencoded", ] -[[package]] -name = "backtrace" -version = "0.3.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" -dependencies = [ - "addr2line", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "badge" version = "0.3.0" @@ -574,6 +565,16 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if 1.0.0", + "num_cpus", +] + [[package]] name = "derive_more" version = "0.99.11" @@ -867,12 +868,6 @@ dependencies = [ "syn", ] -[[package]] -name = "gimli" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" - [[package]] name = "git2" version = "0.13.17" @@ -938,6 +933,7 @@ version = "0.17.1" dependencies = [ "actix-rt", "actix-web", + "actix-web-opentelemetry", "badge", "bytes 1.0.1", "config", @@ -947,6 +943,8 @@ dependencies = [ "lazy_static", "number_prefix", "openssl-probe", + "opentelemetry", + "opentelemetry-jaeger", "reqwest", "ructe", "serde 1.0.125", @@ -959,6 +957,7 @@ dependencies = [ "tracing-bunyan-formatter", "tracing-futures", "tracing-log", + "tracing-opentelemetry", "tracing-subscriber", "vergen", ] @@ -1074,6 +1073,12 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "integer-encoding" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48dc51180a9b377fd75814d0cc02199c20f8e99433d6762f650d39cdbbd3b56f" + [[package]] name = "iovec" version = "0.1.4" @@ -1433,12 +1438,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" -[[package]] -name = "object" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" - [[package]] name = "once_cell" version = "1.7.0" @@ -1484,6 +1483,55 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "opentelemetry" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514d24875c140ed269eecc2d1b56d7b71b573716922a763c317fb1b1b4b58f15" +dependencies = [ + "async-trait", + "dashmap", + "fnv", + "futures", + "js-sys", + "lazy_static", + "percent-encoding", + "pin-project 1.0.5", + "rand 0.8.3", + "thiserror", +] + +[[package]] +name = "opentelemetry-jaeger" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5677b3a361784aff6e2b1b30dbdb5f85f4ec57ff2ced41d9a481ad70a9d0b57" +dependencies = [ + "async-trait", + "lazy_static", + "opentelemetry", + "thiserror", + "thrift", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ecb679b997c41108a498e3ce8b933fe2f643a9a722ad8ca33f95edab84df106" +dependencies = [ + "opentelemetry", +] + +[[package]] +name = "ordered-float" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +dependencies = [ + "num-traits 0.2.14", +] + [[package]] name = "owned_ttf_parser" version = "0.6.0" @@ -1526,11 +1574,11 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" +checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" dependencies = [ - "pin-project-internal 0.4.27", + "pin-project-internal 0.4.28", ] [[package]] @@ -1544,9 +1592,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" +checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" dependencies = [ "proc-macro2", "quote", @@ -1845,12 +1893,6 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" -[[package]] -name = "rustc-demangle" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" - [[package]] name = "rustc_version" version = "0.2.3" @@ -2184,6 +2226,19 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "thrift" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6d965454947cc7266d22716ebfd07b18d84ebaf35eec558586bbb2a8cb6b5b" +dependencies = [ + "byteorder", + "integer-encoding", + "log", + "ordered-float", + "threadpool", +] + [[package]] name = "time" version = "0.1.43" @@ -2391,6 +2446,19 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-opentelemetry" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccdf13c28f1654fe806838f28c5b9cb23ca4c0eae71450daa489f50e523ceb1" +dependencies = [ + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + [[package]] name = "tracing-serde" version = "0.1.2" @@ -2425,12 +2493,12 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53861fcb288a166aae4c508ae558ed18b53838db728d4d310aad08270a7d4c2b" +checksum = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9" dependencies = [ "async-trait", - "backtrace", + "cfg-if 1.0.0", "enum-as-inner", "futures", "idna", @@ -2445,11 +2513,10 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6759e8efc40465547b0dfce9500d733c65f969a4cbbfbe3ccf68daaa46ef179e" +checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb" dependencies = [ - "backtrace", "cfg-if 0.1.10", "futures", "ipconfig", diff --git a/Cargo.toml b/Cargo.toml index c47f8884..c81de38c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,7 @@ name = "hoc" [dependencies] actix-rt = "1.1.1" actix-web = "3.3.2" +actix-web-opentelemetry = "0.10.0" badge = "0.3.0" bytes = "1.0.1" config = { version = "0.11.0", features = ["toml"] } @@ -24,6 +25,10 @@ git2 = "0.13.17" lazy_static = "1.4.0" number_prefix = "0.4.0" openssl-probe = "0.1.2" +# TODO: upgrade +opentelemetry = { version = "0.12.0", default-features = false, features = ["trace"] } +# TODO: upgrade +opentelemetry-jaeger = "0.11.0" reqwest = "0.10.10" serde = "1.0.125" serde_derive = "1.0.123" @@ -33,6 +38,7 @@ tracing-actix-web = "0.2.1" tracing-bunyan-formatter = "0.1.7" tracing-futures = "0.2.5" tracing-log = "0.1.2" +tracing-opentelemetry = "0.11.0" tracing-subscriber = { version = "0.2.17", features = ["registry", "env-filter"] } [build-dependencies] diff --git a/src/lib.rs b/src/lib.rs index 7806845e..adea1181 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -32,6 +32,7 @@ use actix_web::{ middleware::{self, normalize::TrailingSlash}, web, App, HttpResponse, HttpServer, Responder, }; +use actix_web_opentelemetry::RequestTracing; use badge::{Badge, BadgeOptions}; use git2::{BranchType, Repository}; use number_prefix::NumberPrefix; @@ -480,6 +481,7 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res App::new() .app_data(state.clone()) .app_data(repo_count.clone()) + .wrap(RequestTracing::new()) .wrap(tracing_actix_web::TracingLogger) .wrap(middleware::NormalizePath::new(TrailingSlash::Trim)) .service(index) diff --git a/src/main.rs b/src/main.rs index 945b6ef5..a6d75e2f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,24 +1,26 @@ use hoc::{config::Settings, telemetry}; - use std::net::TcpListener; -fn init() { +fn init() -> opentelemetry_jaeger::Uninstall { dotenv::dotenv().ok(); openssl_probe::init_ssl_cert_env_vars(); - telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info")) + let (subscriber, uninstall) = telemetry::get_subscriber("hoc", "info"); + telemetry::init_subscriber(subscriber); + uninstall } #[actix_rt::main] async fn main() -> std::io::Result<()> { - init(); + let _uninstall = init(); // TODO: error handling let settings = Settings::load().expect("Cannot load config"); let address = format!("{}:{}", settings.host, settings.port); // TODO: error handling - let listener = TcpListener::bind(address)?; + let listener = TcpListener::bind(address).expect("cannot bind addres"); + hoc::run(listener, settings) .await .expect("Server error") diff --git a/src/telemetry.rs b/src/telemetry.rs index e19fd1ab..b47c0b54 100644 --- a/src/telemetry.rs +++ b/src/telemetry.rs @@ -1,18 +1,32 @@ +use opentelemetry::global; +use opentelemetry_jaeger::Uninstall; use tracing::{subscriber::set_global_default, Subscriber}; use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer}; use tracing_log::LogTracer; use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry}; -pub fn get_subscriber(name: &str, env_filter: &str) -> impl Subscriber + Send + Sync { +// TODO: don't pass `Uninstall` around... +pub fn get_subscriber(name: &str, env_filter: &str) -> (impl Subscriber + Send + Sync, Uninstall) { let env_filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new(env_filter)); let formatting_layer = BunyanFormattingLayer::new(name.to_string(), std::io::stdout); - Registry::default() - .with(env_filter) - .with(JsonStorageLayer) - .with(formatting_layer) + global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new()); + let (tracer, uninstall) = opentelemetry_jaeger::new_pipeline() + .with_service_name(name) + .install() + .expect("cannot install jaeger pipeline"); + let telemetry = tracing_opentelemetry::layer().with_tracer(tracer); + + ( + Registry::default() + .with(telemetry) + .with(env_filter) + .with(JsonStorageLayer) + .with(formatting_layer), + uninstall, + ) } pub fn init_subscriber(subscriber: impl Subscriber + Send + Sync) { diff --git a/tests/util/mod.rs b/tests/util/mod.rs index a28e3a15..2e76ded8 100644 --- a/tests/util/mod.rs +++ b/tests/util/mod.rs @@ -7,7 +7,7 @@ use tempfile::{tempdir, TempDir}; lazy_static::lazy_static! { static ref TRACING: () = { let filter = if std::env::var("TEST_LOG").is_ok() { "debug" } else { "" }; - let subscriber = telemetry::get_subscriber("test", filter); + let subscriber = telemetry::get_subscriber("test", filter).0; telemetry::init_subscriber(subscriber); }; }