diff --git a/Cargo.lock b/Cargo.lock index 24e6261..83f881c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,7 +94,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", ] @@ -137,6 +137,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bitflags" version = "1.3.2" @@ -399,9 +405,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -426,7 +432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", - "http 1.0.0", + "http 1.1.0", ] [[package]] @@ -437,7 +443,7 @@ checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ "bytes", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", "pin-project-lite", ] @@ -480,14 +486,13 @@ dependencies = [ [[package]] name = "hyper" -version = "1.1.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", - "pin-project-lite", "tokio", ] @@ -511,9 +516,9 @@ checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ "bytes", "futures-util", - "http 1.0.0", + "http 1.1.0", "http-body 1.0.0", - "hyper 1.1.0", + "hyper 1.4.1", "pin-project-lite", "socket2", "tokio", @@ -706,6 +711,20 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "opentelemetry" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + [[package]] name = "opentelemetry-http" version = "0.11.0" @@ -715,7 +734,7 @@ dependencies = [ "async-trait", "bytes", "http 0.2.11", - "opentelemetry", + "opentelemetry 0.22.0", ] [[package]] @@ -727,14 +746,14 @@ dependencies = [ "async-trait", "futures-core", "http 0.2.11", - "opentelemetry", + "opentelemetry 0.22.0", "opentelemetry-proto", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.22.1", "prost", "thiserror", "tokio", - "tonic", + "tonic 0.11.0", ] [[package]] @@ -743,10 +762,10 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.22.0", + "opentelemetry_sdk 0.22.1", "prost", - "tonic", + "tonic 0.11.0", ] [[package]] @@ -768,7 +787,7 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.22.0", "ordered-float", "percent-encoding", "rand", @@ -777,6 +796,24 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.24.0", + "percent-encoding", + "rand", + "thiserror", +] + [[package]] name = "ordered-float" version = "4.2.0" @@ -1043,21 +1080,21 @@ dependencies = [ "hyper 0.14.28", "hyper-util", "once_cell", - "opentelemetry", + "opentelemetry 0.22.0", "opentelemetry-http", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.22.1", "prost", "prost-types", "tokio", - "tonic", + "tonic 0.11.0", "tonic-build", "tonic-reflection", "tonic-tracing-opentelemetry", - "tower", + "tower 0.4.13", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.23.0", "tracing-subscriber", ] @@ -1113,7 +1150,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" dependencies = [ - "base64", + "base64 0.21.7", "rustls-pki-types", ] @@ -1398,7 +1435,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64", + "base64 0.21.7", "bytes", "h2", "http 0.2.11", @@ -1414,7 +1451,26 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", - "tower", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad" +dependencies = [ + "base64 0.22.1", + "bytes", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "percent-encoding", + "pin-project", + "tokio-stream", "tower-layer", "tower-service", "tracing", @@ -1443,26 +1499,27 @@ dependencies = [ "prost-types", "tokio", "tokio-stream", - "tonic", + "tonic 0.11.0", ] [[package]] name = "tonic-tracing-opentelemetry" -version = "0.18.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d84d512c5d647751ec9444ea3d364be81b1f0b2de6edb88fe02e2cb9e133fa2" +checksum = "114749b70c1ad288679e85484e0a47f2bd2a39e75924f29e3e438d6ee7464c9f" dependencies = [ "futures-core", "futures-util", - "http 0.2.11", - "http-body 0.4.6", - "hyper 0.14.28", - "opentelemetry", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.4.1", + "opentelemetry 0.24.0", "pin-project-lite", - "tonic", - "tower", + "tonic 0.12.2", + "tower 0.5.0", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.25.0", + "tracing-opentelemetry-instrumentation-sdk", ] [[package]] @@ -1485,6 +1542,16 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36b837f86b25d7c0d7988f00a54e74739be6477f2aac6201b8f429a7569991b7" +dependencies = [ + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.2" @@ -1549,8 +1616,8 @@ checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.22.0", + "opentelemetry_sdk 0.22.1", "smallvec", "tracing", "tracing-core", @@ -1559,6 +1626,36 @@ dependencies = [ "web-time", ] +[[package]] +name = "tracing-opentelemetry" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-opentelemetry-instrumentation-sdk" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159fbb3bd93e20342e7e6ef45b96c5d122cd88043f37ad0e4b5bb052f0f4483" +dependencies = [ + "http 1.1.0", + "opentelemetry 0.24.0", + "tracing", + "tracing-opentelemetry 0.25.0", +] + [[package]] name = "tracing-subscriber" version = "0.3.18" diff --git a/Cargo.toml b/Cargo.toml index 9a05d1a..3194455 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ hyper-util = { version = "0.1.3", features = ["tokio"] } http-body-util = "0.1.0" anyhow = "1.0.82" once_cell = "1.19.0" -tonic-tracing-opentelemetry = "0.18.1" +tonic-tracing-opentelemetry = "0.20.0" opentelemetry = { version = "0.22.0", features = ["trace"] } opentelemetry_sdk = { version = "0.22.1", features = ["trace", "rt-tokio"] } opentelemetry-semantic-conventions = "0.14.0"