From dae90d81e1392aaffbcdfa00b82f1e69090c867a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:45:42 -0300 Subject: [PATCH] build(deps): bump opentelemetry dependencies (#6003) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas Eizinger --- rust/Cargo.lock | 220 +++++++------------------ rust/Cargo.toml | 1 + rust/connlib/clients/shared/Cargo.toml | 2 +- rust/relay/Cargo.toml | 10 +- rust/relay/src/main.rs | 6 +- rust/relay/src/server.rs | 4 +- 6 files changed, 68 insertions(+), 175 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 207d74e76..51a08537e 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -410,34 +410,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core 0.3.4", - "bitflags 1.3.2", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", - "itoa 1.0.11", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper 0.1.2", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "axum" version = "0.7.5" @@ -445,13 +417,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", - "axum-core 0.4.3", + "axum-core", "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body", "http-body-util", - "hyper 1.2.0", + "hyper", "hyper-util", "itoa 1.0.11", "matchit", @@ -472,23 +444,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - [[package]] name = "axum-core" version = "0.4.3" @@ -499,7 +454,7 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body", "http-body-util", "mime", "pin-project-lite", @@ -2624,16 +2579,16 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.26" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 0.2.12", + "http 1.1.0", "indexmap 2.2.6", "slab", "tokio", @@ -2820,17 +2775,6 @@ dependencies = [ "itoa 1.0.11", ] -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -dependencies = [ - "bytes", - "http 0.2.12", - "pin-project-lite", -] - [[package]] name = "http-body" version = "1.0.0" @@ -2850,7 +2794,7 @@ dependencies = [ "bytes", "futures-core", "http 1.1.0", - "http-body 1.0.0", + "http-body", "pin-project-lite", ] @@ -2858,7 +2802,7 @@ dependencies = [ name = "http-health-check" version = "0.1.0" dependencies = [ - "axum 0.7.5", + "axum", "clap", "tokio", ] @@ -2874,7 +2818,7 @@ name = "http-test-server" version = "0.1.0" dependencies = [ "anyhow", - "axum 0.7.5", + "axum", "futures", "serde", "tokio", @@ -2900,39 +2844,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "h2", - "http 0.2.12", - "http-body 0.4.6", - "httparse", - "httpdate", - "itoa 1.0.11", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body", "httparse", "httpdate", "itoa 1.0.11", @@ -2950,7 +2871,7 @@ checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.2.0", + "hyper", "hyper-util", "rustls", "rustls-pki-types", @@ -2961,28 +2882,29 @@ dependencies = [ [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ - "hyper 0.14.28", + "hyper", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.2.0", + "http-body", + "hyper", "pin-project-lite", "socket2", "tokio", @@ -4178,9 +4100,9 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.22.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" +checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" dependencies = [ "futures-core", "futures-sink", @@ -4188,21 +4110,19 @@ dependencies = [ "once_cell", "pin-project-lite", "thiserror", - "urlencoding", ] [[package]] name = "opentelemetry-otlp" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" +checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" dependencies = [ "async-trait", "futures-core", - "http 0.2.12", + "http 1.1.0", "opentelemetry", "opentelemetry-proto", - "opentelemetry-semantic-conventions", "opentelemetry_sdk", "prost", "thiserror", @@ -4212,9 +4132,9 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" +checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" dependencies = [ "opentelemetry", "opentelemetry_sdk", @@ -4222,29 +4142,22 @@ dependencies = [ "tonic", ] -[[package]] -name = "opentelemetry-semantic-conventions" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" - [[package]] name = "opentelemetry_sdk" -version = "0.22.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" +checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" dependencies = [ "async-trait", - "crossbeam-channel", "futures-channel", "futures-executor", "futures-util", "glob", "once_cell", "opentelemetry", - "ordered-float", "percent-encoding", "rand 0.8.5", + "serde_json", "thiserror", "tokio", "tokio-stream", @@ -4256,15 +4169,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "ordered-float" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-stream" version = "0.2.0" @@ -4804,9 +4708,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", "prost-derive", @@ -4814,12 +4718,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.57", @@ -5091,9 +4995,9 @@ dependencies = [ "futures-core", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body", "http-body-util", - "hyper 1.2.0", + "hyper", "hyper-rustls", "hyper-util", "ipnet", @@ -6445,16 +6349,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.3.0" @@ -6598,23 +6492,26 @@ dependencies = [ [[package]] name = "tonic" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" dependencies = [ "async-stream", "async-trait", - "axum 0.6.20", - "base64 0.21.7", + "axum", + "base64 0.22.1", "bytes", "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.28", + "http 1.1.0", + "http-body", + "http-body-util", + "hyper", "hyper-timeout", + "hyper-util", "percent-encoding", "pin-project", "prost", + "socket2", "tokio", "tokio-stream", "tower", @@ -6713,9 +6610,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" +checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" dependencies = [ "js-sys", "once_cell", @@ -6751,9 +6648,8 @@ dependencies = [ [[package]] name = "tracing-stackdriver" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80048836e000e1f058562f01d69cc46f476955bf389c0dc2d2d7edb98ca63ac1" +version = "0.11.0" +source = "git+https://github.com/thomaseizinger/tracing-stackdriver?branch=deps/bump-otel-0.23#3e4a41ff6e2e5abc0c89e5124070cf187205f7cb" dependencies = [ "Inflector", "opentelemetry", @@ -6948,12 +6844,6 @@ dependencies = [ "serde", ] -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - [[package]] name = "utf-8" version = "0.7.6" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index ba2c170fa..c82a85b57 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -78,6 +78,7 @@ str0m = { git = "https://github.com/firezone/str0m", branch = "main" } ip_network_table = { git = "https://github.com/edmonds/ip_network_table", branch = "some-useful-traits" } # For `Debug` and `Clone` proptest = { git = "https://github.com/thomaseizinger/proptest", branch = "fix/always-check-acceptable-current-state" } proptest-state-machine = { git = "https://github.com/thomaseizinger/proptest", branch = "fix/always-check-acceptable-current-state" } +tracing-stackdriver = { git = "https://github.com/thomaseizinger/tracing-stackdriver", branch = "deps/bump-otel-0.23" } # Waiting for release. [profile.release] strip = true diff --git a/rust/connlib/clients/shared/Cargo.toml b/rust/connlib/clients/shared/Cargo.toml index 57ebdda92..33dc88772 100644 --- a/rust/connlib/clients/shared/Cargo.toml +++ b/rust/connlib/clients/shared/Cargo.toml @@ -23,7 +23,7 @@ tokio = { workspace = true, features = ["sync"] } tokio-tungstenite = { version = "0.21", default-features = false, features = ["connect", "handshake", "rustls-tls-webpki-roots"] } tracing = { workspace = true } tracing-appender = { version = "0.2.2" } -tracing-stackdriver = { version = "0.10.0" } +tracing-stackdriver = { version = "0.11.0" } tracing-subscriber = { workspace = true, features = ["env-filter"] } tun = { workspace = true } url = { version = "2.5.2", features = ["serde"] } diff --git a/rust/relay/Cargo.toml b/rust/relay/Cargo.toml index ebb991601..d168862ef 100644 --- a/rust/relay/Cargo.toml +++ b/rust/relay/Cargo.toml @@ -17,9 +17,9 @@ hex-display = "0.3.0" http-health-check = { workspace = true } mio = "0.8.11" once_cell = "1.17.1" -opentelemetry = { version = "0.22.0", features = ["metrics"] } -opentelemetry-otlp = { version = "0.15.0", features = ["metrics"] } -opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio"] } +opentelemetry = { version = "0.24.0", features = ["metrics"] } +opentelemetry-otlp = { version = "0.17.0", features = ["metrics"] } +opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"] } phoenix-channel = { path = "../phoenix-channel" } proptest = { version = "1", optional = true } rand = "0.8.5" @@ -32,8 +32,8 @@ stun_codec = "0.3.4" tokio = { workspace = true, features = ["macros", "rt-multi-thread", "net", "time", "signal"] } tracing = { workspace = true, features = ["log"] } tracing-core = "0.1.31" -tracing-opentelemetry = "0.23.0" -tracing-stackdriver = { version = "0.10.0", features = ["opentelemetry"] } +tracing-opentelemetry = "0.25.0" +tracing-stackdriver = { version = "0.11.0", features = ["opentelemetry"] } tracing-subscriber = { workspace = true, features = ["env-filter", "json", "fmt"] } trackable = "1.3.0" url = "2.5.2" diff --git a/rust/relay/src/main.rs b/rust/relay/src/main.rs index 3b1c072ae..751e758da 100644 --- a/rust/relay/src/main.rs +++ b/rust/relay/src/main.rs @@ -175,6 +175,8 @@ async fn main() -> Result<()> { /// /// If the user has specified [`TraceCollector::Otlp`], we will set up an OTLP-exporter that connects to an OTLP collector specified at `Args.otlp_grpc_endpoint`. fn setup_tracing(args: &Args) -> Result<()> { + use opentelemetry::trace::TracerProvider as _; + // Use `tracing_core` directly for the temp logger because that one does not initialize a `log` logger. // A `log` Logger cannot be unset once set, so we can't use that for our temp logger during the setup. let temp_logger_guard = tracing_core::dispatcher::set_default( @@ -192,7 +194,7 @@ fn setup_tracing(args: &Args) -> Result<()> { .tonic() .with_endpoint(grpc_endpoint.clone()); - let tracer = opentelemetry_otlp::new_pipeline() + let provider = opentelemetry_otlp::new_pipeline() .tracing() .with_exporter(exporter) .with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource( @@ -219,7 +221,7 @@ fn setup_tracing(args: &Args) -> Result<()> { .with(log_layer(args)) .with( tracing_opentelemetry::layer() - .with_tracer(tracer) + .with_tracer(provider.tracer("relay")) .with_filter(env_filter()), ) .into() diff --git a/rust/relay/src/server.rs b/rust/relay/src/server.rs index 48d77a77e..8d83f12a6 100644 --- a/rust/relay/src/server.rs +++ b/rust/relay/src/server.rs @@ -13,7 +13,7 @@ use anyhow::Result; use bytecodec::EncodeExt; use core::fmt; use hex_display::HexDisplayExt as _; -use opentelemetry::metrics::{Counter, Unit, UpDownCounter}; +use opentelemetry::metrics::{Counter, UpDownCounter}; use opentelemetry::KeyValue; use rand::Rng; use secrecy::SecretString; @@ -175,7 +175,7 @@ where let data_relayed_counter = meter .u64_counter("data_relayed_bytes") .with_description("The number of bytes relayed") - .with_unit(Unit::new("b")) + .with_unit("b") .init(); Self {