From 904d563ec33e9621e3923bfee4cd8f5c315b6f6b Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 22 Jan 2023 23:44:40 +0000 Subject: [PATCH] Cargo.toml: Updated opentelemetry to 0.18. --- Cargo.lock | 215 ++++++++++++++++++++++++++++++++++-------- src/api/Cargo.toml | 4 +- src/block/Cargo.toml | 2 +- src/garage/Cargo.toml | 6 +- src/model/Cargo.toml | 2 +- src/rpc/Cargo.toml | 2 +- src/table/Cargo.toml | 2 +- src/util/Cargo.toml | 2 +- src/web/Cargo.toml | 2 +- 9 files changed, 185 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4fddd215..3613a12e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -384,6 +384,52 @@ dependencies = [ "zeroize", ] +[[package]] +name = "axum" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc" +dependencies = [ + "async-trait", + "axum-core", + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + [[package]] name = "backoff" version = "0.4.0" @@ -794,12 +840,15 @@ dependencies = [ [[package]] name = "dashmap" -version = "4.0.2" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if", - "num_cpus", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core 0.9.6", ] [[package]] @@ -1101,7 +1150,7 @@ dependencies = [ "hyper", "kuska-sodiumoxide", "netapp", - "opentelemetry", + "opentelemetry 0.18.0", "opentelemetry-otlp", "opentelemetry-prometheus", "parse_duration", @@ -1148,7 +1197,7 @@ dependencies = [ "md-5 0.10.5", "multer", "nom", - "opentelemetry", + "opentelemetry 0.18.0", "opentelemetry-prometheus", "percent-encoding", "pin-project", @@ -1180,7 +1229,7 @@ dependencies = [ "garage_table", "garage_util", "hex", - "opentelemetry", + "opentelemetry 0.18.0", "rand", "serde", "serde_bytes", @@ -1223,7 +1272,7 @@ dependencies = [ "garage_util", "hex", "netapp", - "opentelemetry", + "opentelemetry 0.18.0", "rand", "serde", "serde_bytes", @@ -1249,7 +1298,7 @@ dependencies = [ "kube", "kuska-sodiumoxide", "netapp", - "opentelemetry", + "opentelemetry 0.18.0", "pnet_datalink", "rand", "reqwest", @@ -1277,7 +1326,7 @@ dependencies = [ "garage_util", "hex", "hexdump", - "opentelemetry", + "opentelemetry 0.18.0", "rand", "serde", "serde_bytes", @@ -1306,7 +1355,7 @@ dependencies = [ "lazy_static", "mktemp", "netapp", - "opentelemetry", + "opentelemetry 0.18.0", "rand", "rmp-serde", "serde", @@ -1330,7 +1379,7 @@ dependencies = [ "garage_util", "http", "hyper", - "opentelemetry", + "opentelemetry 0.18.0", "percent-encoding", "tracing", ] @@ -2085,6 +2134,12 @@ dependencies = [ "regex-automata", ] +[[package]] +name = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" + [[package]] name = "md-5" version = "0.9.1" @@ -2202,7 +2257,7 @@ dependencies = [ "kuska-handshake", "kuska-sodiumoxide", "log", - "opentelemetry", + "opentelemetry 0.17.0", "opentelemetry-contrib", "pin-project", "rand", @@ -2364,8 +2419,6 @@ checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", @@ -2375,8 +2428,16 @@ dependencies = [ "pin-project", "rand", "thiserror", - "tokio", - "tokio-stream", +] + +[[package]] +name = "opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", ] [[package]] @@ -2386,36 +2447,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85637add8f60bb4cac673469c14f47a329c6cec7365c72d72cd32f2d104a721a" dependencies = [ "lazy_static", - "opentelemetry", + "opentelemetry 0.17.0", ] [[package]] name = "opentelemetry-otlp" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a" +checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" dependencies = [ "async-trait", "futures", "futures-util", "http", - "opentelemetry", + "opentelemetry 0.18.0", + "opentelemetry-proto", "prost", "thiserror", "tokio", "tonic", +] + +[[package]] +name = "opentelemetry-prometheus" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c3d833835a53cf91331d2cfb27e9121f5a95261f31f08a1f79ab31688b8da8" +dependencies = [ + "opentelemetry 0.18.0", + "prometheus", + "protobuf", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +dependencies = [ + "futures", + "futures-util", + "opentelemetry 0.18.0", + "prost", + "tonic", "tonic-build", ] [[package]] -name = "opentelemetry-prometheus" -version = "0.10.0" +name = "opentelemetry_api" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9328977e479cebe12ce0d3fcecdaea4721d234895a9440c5b5dfd113f0594ac6" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" dependencies = [ - "opentelemetry", - "prometheus", - "protobuf", + "fnv", + "futures-channel", + "futures-util", + "indexmap", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", ] [[package]] @@ -2640,6 +2753,16 @@ dependencies = [ "log", ] +[[package]] +name = "prettyplease" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2696,9 +2819,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.9.0" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" dependencies = [ "bytes", "prost-derive", @@ -2706,29 +2829,31 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.9.0" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e" dependencies = [ "bytes", - "heck 0.3.3", + "heck 0.4.0", "itertools 0.10.5", "lazy_static", "log", "multimap", "petgraph", + "prettyplease", "prost", "prost-types", "regex", + "syn", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.9.0" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" dependencies = [ "anyhow", "itertools 0.10.5", @@ -2739,9 +2864,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.9.0" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" dependencies = [ "bytes", "prost", @@ -3530,6 +3655,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" + [[package]] name = "synchronoise" version = "1.0.1" @@ -3700,7 +3831,6 @@ dependencies = [ "memchr", "mio", "num_cpus", - "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2", @@ -3828,12 +3958,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.6.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", + "axum", "base64 0.13.1", "bytes", "futures-core", @@ -3849,7 +3980,7 @@ dependencies = [ "prost-derive", "tokio", "tokio-stream", - "tokio-util 0.6.10", + "tokio-util 0.7.4", "tower", "tower-layer", "tower-service", @@ -3859,10 +3990,11 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.6.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" +checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" dependencies = [ + "prettyplease", "proc-macro2", "prost-build", "quote", @@ -3904,6 +4036,7 @@ dependencies = [ "http-body", "http-range-header", "pin-project-lite", + "tower", "tower-layer", "tower-service", "tracing", diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index 24c48604..77196a9c 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -54,8 +54,8 @@ serde_json = "1.0" quick-xml = { version = "0.21", features = [ "serialize" ] } url = "2.3" -opentelemetry = "0.17" -opentelemetry-prometheus = { version = "0.10", optional = true } +opentelemetry = "0.18" +opentelemetry-prometheus = { version = "0.11", optional = true } prometheus = { version = "0.13", optional = true } [features] diff --git a/src/block/Cargo.toml b/src/block/Cargo.toml index a7e8bc2c..f1b816c6 100644 --- a/src/block/Cargo.toml +++ b/src/block/Cargo.toml @@ -19,7 +19,7 @@ garage_rpc = { version = "0.8.1", path = "../rpc" } garage_util = { version = "0.8.1", path = "../util" } garage_table = { version = "0.8.1", path = "../table" } -opentelemetry = "0.17" +opentelemetry = "0.18" arc-swap = "1.5" async-trait = "0.1.7" diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index f938f356..c9361ea3 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -53,9 +53,9 @@ tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi netapp = "0.5" -opentelemetry = { version = "0.17", features = [ "rt-tokio" ] } -opentelemetry-prometheus = { version = "0.10", optional = true } -opentelemetry-otlp = { version = "0.10", optional = true } +opentelemetry = { version = "0.18", features = [ "rt-tokio" ] } +opentelemetry-prometheus = { version = "0.11", optional = true } +opentelemetry-otlp = { version = "0.11", optional = true } prometheus = { version = "0.13", optional = true } [dev-dependencies] diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml index d1c7cd29..f72d27f2 100644 --- a/src/model/Cargo.toml +++ b/src/model/Cargo.toml @@ -36,7 +36,7 @@ serde_bytes = "0.11" futures = "0.3" futures-util = "0.3" tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] } -opentelemetry = "0.17" +opentelemetry = "0.18" netapp = "0.5" diff --git a/src/rpc/Cargo.toml b/src/rpc/Cargo.toml index 87ae15ac..f4ee8315 100644 --- a/src/rpc/Cargo.toml +++ b/src/rpc/Cargo.toml @@ -44,7 +44,7 @@ futures = "0.3" futures-util = "0.3" tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] } tokio-stream = { version = "0.1", features = ["net"] } -opentelemetry = "0.17" +opentelemetry = "0.18" netapp = { version = "0.5.2", features = ["telemetry"] } diff --git a/src/table/Cargo.toml b/src/table/Cargo.toml index a8127f50..3d74f6f4 100644 --- a/src/table/Cargo.toml +++ b/src/table/Cargo.toml @@ -18,7 +18,7 @@ garage_db = { version = "0.8.1", path = "../db" } garage_rpc = { version = "0.8.1", path = "../rpc" } garage_util = { version = "0.8.1", path = "../util" } -opentelemetry = "0.17" +opentelemetry = "0.18" async-trait = "0.1.7" arc-swap = "1.0" diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index abeccbbd..4b766cdc 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -45,7 +45,7 @@ netapp = "0.5" http = "0.2" hyper = "0.14" -opentelemetry = { version = "0.17", features = [ "rt-tokio", "metrics", "trace" ] } +opentelemetry = { version = "0.18", features = [ "rt-tokio", "metrics", "trace" ] } [dev-dependencies] mktemp = "0.5" diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index 19eaed17..fd041d95 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -28,4 +28,4 @@ futures = "0.3" http = "0.2" hyper = { version = "0.14", features = ["server", "http1", "runtime", "tcp", "stream"] } -opentelemetry = "0.17" +opentelemetry = "0.18"