diff --git a/Cargo.lock b/Cargo.lock index 24e6261..41e0121 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" @@ -706,6 +712,20 @@ dependencies = [ "urlencoding", ] +[[package]] +name = "opentelemetry" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570074cc999d1a58184080966e5bd3bf3a9a4af650c3b05047c2621e7405cd17" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + [[package]] name = "opentelemetry-http" version = "0.11.0" @@ -715,7 +735,7 @@ dependencies = [ "async-trait", "bytes", "http 0.2.11", - "opentelemetry", + "opentelemetry 0.22.0", ] [[package]] @@ -727,14 +747,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 +763,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 +788,7 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.22.0", "ordered-float", "percent-encoding", "rand", @@ -777,6 +797,24 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c627d9f4c9cdc1f21a29ee4bfbd6028fcb8bcf2a857b43f3abdf72c9c862f3" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.26.0", + "percent-encoding", + "rand", + "thiserror", +] + [[package]] name = "ordered-float" version = "4.2.0" @@ -1043,21 +1081,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 +1151,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", ] @@ -1366,9 +1404,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -1398,7 +1436,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64", + "base64 0.21.7", "bytes", "h2", "http 0.2.11", @@ -1414,7 +1452,26 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-stream", - "tower", + "tower 0.4.13", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "base64 0.22.1", + "bytes", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "percent-encoding", + "pin-project", + "tokio-stream", "tower-layer", "tower-service", "tracing", @@ -1443,26 +1500,27 @@ dependencies = [ "prost-types", "tokio", "tokio-stream", - "tonic", + "tonic 0.11.0", ] [[package]] name = "tonic-tracing-opentelemetry" -version = "0.18.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d84d512c5d647751ec9444ea3d364be81b1f0b2de6edb88fe02e2cb9e133fa2" +checksum = "1aa8f4f019bd4c1c522afa7b96aff9b451865c700a60a385eb8bd42007a117a6" dependencies = [ "futures-core", "futures-util", - "http 0.2.11", - "http-body 0.4.6", - "hyper 0.14.28", - "opentelemetry", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.1.0", + "opentelemetry 0.26.0", "pin-project-lite", - "tonic", - "tower", + "tonic 0.12.3", + "tower 0.5.1", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.27.0", + "tracing-opentelemetry-instrumentation-sdk", ] [[package]] @@ -1485,17 +1543,27 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -1549,8 +1617,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 +1627,36 @@ dependencies = [ "web-time", ] +[[package]] +name = "tracing-opentelemetry" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc58af5d3f6c5811462cabb3289aec0093f7338e367e5a33d28c0433b3c7360b" +dependencies = [ + "js-sys", + "once_cell", + "opentelemetry 0.26.0", + "opentelemetry_sdk 0.26.0", + "smallvec", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", + "web-time", +] + +[[package]] +name = "tracing-opentelemetry-instrumentation-sdk" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e23ebe790a95c3105f5a7ec8e7c33884ecc8462f751f7f719d2356a3cfa122b" +dependencies = [ + "http 1.0.0", + "opentelemetry 0.26.0", + "tracing", + "tracing-opentelemetry 0.27.0", +] + [[package]] name = "tracing-subscriber" version = "0.3.18" diff --git a/Cargo.toml b/Cargo.toml index 9a05d1a..c93fa76 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.23.0" opentelemetry = { version = "0.22.0", features = ["trace"] } opentelemetry_sdk = { version = "0.22.1", features = ["trace", "rt-tokio"] } opentelemetry-semantic-conventions = "0.14.0"