diff --git a/Cargo.lock b/Cargo.lock index 608ce6d55de..96641accdd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -262,7 +262,7 @@ dependencies = [ "multer", "num-traits", "once_cell", - "opentelemetry", + "opentelemetry 0.23.0", "pin-project-lite", "regex", "serde", @@ -579,7 +579,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper 0.1.2", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", ] @@ -2466,7 +2466,7 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -2757,7 +2757,7 @@ dependencies = [ "serde_path_to_error", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tracing", ] @@ -2777,7 +2777,7 @@ dependencies = [ "hyper 1.4.0", "hyper-util", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", "tracing-subscriber", @@ -3426,6 +3426,20 @@ dependencies = [ "thiserror", ] +[[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-appender-tracing" version = "0.4.0" @@ -3433,7 +3447,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be314095f27dde46fca7038b023457d2b3459e1c39033dacc2ec1b31df11a61c" dependencies = [ "once_cell", - "opentelemetry", + "opentelemetry 0.23.0", "tracing", "tracing-core", "tracing-subscriber", @@ -3448,7 +3462,7 @@ dependencies = [ "async-trait", "bytes", "http 0.2.12", - "opentelemetry", + "opentelemetry 0.23.0", ] [[package]] @@ -3460,9 +3474,9 @@ dependencies = [ "async-trait", "futures-core", "http 0.2.12", - "opentelemetry", + "opentelemetry 0.23.0", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "prost 0.12.6", "thiserror", "tokio", @@ -3476,8 +3490,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1a24eafe47b693cb938f8505f240dc26c71db60df9aca376b4f857e9653ec7" dependencies = [ "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "prometheus", "protobuf 2.28.0", ] @@ -3488,8 +3502,8 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "prost 0.12.6", "tonic 0.11.0", ] @@ -3509,8 +3523,8 @@ dependencies = [ "async-trait", "chrono", "futures-util", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "ordered-float 4.2.0", "serde", "serde_json", @@ -3526,7 +3540,7 @@ dependencies = [ "eyre", "indexmap 1.9.3", "nvml-wrapper", - "opentelemetry", + "opentelemetry 0.23.0", "sysinfo 0.29.11", "tracing", ] @@ -3545,7 +3559,7 @@ dependencies = [ "glob", "lazy_static", "once_cell", - "opentelemetry", + "opentelemetry 0.23.0", "ordered-float 4.2.0", "percent-encoding", "rand", @@ -3555,6 +3569,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 = "option-ext" version = "0.2.0" @@ -3715,7 +3747,7 @@ dependencies = [ "bincode", "either", "fnv", - "itertools 0.10.5", + "itertools 0.11.0", "lazy_static", "nom", "quick-xml", @@ -3978,7 +4010,7 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", "heck", - "itertools 0.10.5", + "itertools 0.11.0", "log", "multimap", "once_cell", @@ -3998,7 +4030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.76", @@ -4011,7 +4043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.76", @@ -5490,7 +5522,7 @@ dependencies = [ "num", "num_cpus", "once_cell", - "opentelemetry", + "opentelemetry 0.23.0", "opentelemetry-appender-tracing", "opentelemetry-http", "opentelemetry-otlp", @@ -5498,7 +5530,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry-stdout", "opentelemetry-system-metrics", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "path-clean", "pathdiff", "phonenumber", @@ -5545,7 +5577,7 @@ dependencies = [ "tonic 0.11.0", "tonic-types", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.24.0", "tracing-subscriber", "ttl_cache", "update-informer", @@ -5695,11 +5727,11 @@ dependencies = [ "hyper 0.14.30", "hyper-util", "once_cell", - "opentelemetry", + "opentelemetry 0.23.0", "opentelemetry-http", "opentelemetry-otlp", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "prost 0.12.6", "prost-types 0.12.6", "protoc-bin-vendored", @@ -5710,9 +5742,9 @@ dependencies = [ "tonic-build 0.11.0", "tonic-reflection", "tonic-tracing-opentelemetry", - "tower", + "tower 0.4.13", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.24.0", "tracing-subscriber", ] @@ -6072,7 +6104,7 @@ dependencies = [ "tokio", "tokio-rustls 0.25.0", "tokio-stream", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -6138,21 +6170,22 @@ dependencies = [ [[package]] name = "tonic-tracing-opentelemetry" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeea5861e4e5d834196c9cc752a1c145d8481a525c25f5a52389ccf52b4464bd" +checksum = "114749b70c1ad288679e85484e0a47f2bd2a39e75924f29e3e438d6ee7464c9f" dependencies = [ "futures-core", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "opentelemetry", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.4.0", + "opentelemetry 0.24.0", "pin-project-lite", - "tonic 0.11.0", - "tower", + "tonic 0.12.1", + "tower 0.5.1", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.25.0", + "tracing-opentelemetry-instrumentation-sdk", ] [[package]] @@ -6186,17 +6219,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" @@ -6250,8 +6293,8 @@ checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.23.0", + "opentelemetry_sdk 0.23.0", "smallvec", "tracing", "tracing-core", @@ -6260,6 +6303,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-serde" version = "0.1.3" diff --git a/tailcall-upstream-grpc/Cargo.toml b/tailcall-upstream-grpc/Cargo.toml index 8bab51007b3..3638d1b9ea0 100644 --- a/tailcall-upstream-grpc/Cargo.toml +++ b/tailcall-upstream-grpc/Cargo.toml @@ -17,7 +17,7 @@ tower = "0.4.13" hyper-util = { version = "0.1.3", features = ["tokio"] } http-body-util = "0.1.1" once_cell = "1.19.0" -tonic-tracing-opentelemetry = "0.19.0" +tonic-tracing-opentelemetry = "0.20.0" opentelemetry = { version = "0.23.0", features = ["trace"] } opentelemetry_sdk = { version = "0.23.0", features = ["trace", "rt-tokio"] } opentelemetry-semantic-conventions = "0.15.0"