octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zebrad: remove git pin on metrics dependency 

Because the new version of the prometheus exporter launches its own
single-threaded runtime on a dedicated worker thread, there's no need
for the tokio and hyper versions it uses internally to align with the
versions used in other crates.  So we don't need to use our fork with
tokio 0.3, and can just use the published alpha.  Advancing to a later
alpha may fix the missing-metrics issues.
This commit is contained in:
Henry de Valence 2020-12-01 21:29:02 -08:00
parent bfbc737b6c
commit dc77163524
3 changed files with 281 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

345
Cargo.lock generated
View File

@ -92,7 +92,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
dependencies = [
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -101,15 +101,9 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
dependencies = [
"winapi",
"winapi 0.3.9",
]
[[package]]
name = "arc-swap"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0688b520bcc7498f6ca8fa006e8031d353e3fd4f51bd4a50fb03cc4230b28bd2"
[[package]]
name = "arrayref"
version = "0.3.6"
@ -148,7 +142,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"libc",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -192,12 +186,6 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdcf67bb7ba7797a081cd19009948ab533af7c355d5caf1d08c777582d351e9c"
[[package]]
name = "beef"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "474a626a67200bd107d44179bb3d4fc61891172d11696609264589be6a0e6a43"
[[package]]
name = "bincode"
version = "1.3.1"
@ -439,7 +427,7 @@ dependencies = [
"num-traits",
"serde",
"time",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -817,7 +805,7 @@ checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
dependencies = [
"libc",
"redox_users",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -955,6 +943,22 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]
name = "fuchsia-zircon"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
dependencies = [
"bitflags",
"fuchsia-zircon-sys",
]
[[package]]
name = "fuchsia-zircon-sys"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
[[package]]
name = "funty"
version = "1.0.1"
@ -1075,7 +1079,7 @@ dependencies = [
"libc",
"log",
"rustc_version",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -1163,6 +1167,26 @@ dependencies = [
"syn 1.0.48",
]
[[package]]
name = "h2"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
dependencies = [
"bytes 0.5.6",
"fnv",
"futures-core",
"futures-sink",
"futures-util",
"http",
"indexmap",
"slab",
"tokio 0.2.23",
"tokio-util 0.3.1",
"tracing",
"tracing-futures",
]
[[package]]
name = "h2"
version = "0.3.0"
@ -1176,7 +1200,7 @@ dependencies = [
"http",
"indexmap",
"slab",
"tokio",
"tokio 0.3.5",
"tokio-util 0.4.0",
"tracing",
"tracing-futures",
@ -1284,14 +1308,15 @@ dependencies = [
[[package]]
name = "hyper"
version = "0.14.0-dev"
source = "git+https://github.com/hyperium/hyper/?rev=ed2b22a7f66899d338691552fbcb6c0f2f4e06b9#ed2b22a7f66899d338691552fbcb6c0f2f4e06b9"
version = "0.13.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
dependencies = [
"bytes 0.5.6",
"futures-channel",
"futures-core",
"futures-util",
"h2",
"h2 0.2.7",
"http",
"http-body",
"httparse",
@ -1299,7 +1324,30 @@ dependencies = [
"itoa",
"pin-project 1.0.2",
"socket2",
"tokio",
"tokio 0.2.23",
"tower-service",
"tracing",
"want",
]
[[package]]
name = "hyper"
version = "0.14.0-dev"
source = "git+https://github.com/hyperium/hyper/?rev=ed2b22a7f66899d338691552fbcb6c0f2f4e06b9#ed2b22a7f66899d338691552fbcb6c0f2f4e06b9"
dependencies = [
"bytes 0.5.6",
"futures-channel",
"futures-core",
"futures-util",
"h2 0.3.0",
"http",
"http-body",
"httparse",
"httpdate",
"itoa",
"pin-project 1.0.2",
"socket2",
"tokio 0.3.5",
"tower-service",
"tracing",
"want",
@ -1372,6 +1420,15 @@ dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "iovec"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
dependencies = [
"libc",
]
[[package]]
name = "itoa"
version = "0.4.6"
@ -1402,6 +1459,16 @@ dependencies = [
"subtle",
]
[[package]]
name = "kernel32-sys"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
dependencies = [
"winapi 0.2.8",
"winapi-build",
]
[[package]]
name = "lazy_static"
version = "1.4.0"
@ -1440,7 +1507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
dependencies = [
"cc",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -1486,6 +1553,15 @@ dependencies = [
"serde_json",
]
[[package]]
name = "mach"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
dependencies = [
"libc",
]
[[package]]
name = "matchers"
version = "0.0.1"
@ -1533,13 +1609,12 @@ dependencies = [
[[package]]
name = "metrics"
version = "0.13.0-alpha.8"
source = "git+https://github.com/ZcashFoundation/metrics?rev=971133128e5aebe3ad177acffc6154449736cfa2#971133128e5aebe3ad177acffc6154449736cfa2"
version = "0.13.0-alpha.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d3b214b3ae0a21937be886af1fea4aff35dc02c9906a3ae0d8eea00f949bd32"
dependencies = [
"beef",
"metrics-macros",
"proc-macro-hack",
"sharded-slab",
]
[[package]]
@ -1550,22 +1625,25 @@ checksum = "7c064b3a1ff41f4bf6c91185c8a0caeccf8a8a27e9d0f92cc54cf3dbec812f48"
[[package]]
name = "metrics-exporter-prometheus"
version = "0.1.0-alpha.7"
source = "git+https://github.com/ZcashFoundation/metrics?rev=971133128e5aebe3ad177acffc6154449736cfa2#971133128e5aebe3ad177acffc6154449736cfa2"
version = "0.1.0-alpha.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a9aefa38f48944b5a91adcf35eec305f9527b889ec078b863ff250e4cc0af7a"
dependencies = [
"hdrhistogram 7.1.0",
"hyper",
"metrics 0.13.0-alpha.8",
"hyper 0.13.9",
"metrics 0.13.0-alpha.11",
"metrics-util",
"parking_lot",
"quanta",
"thiserror",
"tokio",
"tokio 0.2.23",
]
[[package]]
name = "metrics-macros"
version = "0.1.0-alpha.5"
source = "git+https://github.com/ZcashFoundation/metrics?rev=971133128e5aebe3ad177acffc6154449736cfa2#971133128e5aebe3ad177acffc6154449736cfa2"
version = "0.1.0-alpha.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3472609fadf7c97f8ea4c0dd5ab671b1c33824ef9fd2da117311fa093e46c2c6"
dependencies = [
"lazy_static",
"proc-macro-hack",
@ -1577,16 +1655,18 @@ dependencies = [
[[package]]
name = "metrics-util"
version = "0.4.0-alpha.6"
source = "git+https://github.com/ZcashFoundation/metrics?rev=971133128e5aebe3ad177acffc6154449736cfa2#971133128e5aebe3ad177acffc6154449736cfa2"
version = "0.4.0-alpha.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e176b573aa63b9dd030df3a01eb49a382de35e37c459fc131cf342f978f4a8fa"
dependencies = [
"arc-swap",
"atomic-shim",
"crossbeam-epoch 0.9.0",
"crossbeam-utils 0.8.0",
"dashmap",
"indexmap",
"metrics 0.13.0-alpha.8",
"metrics 0.13.0-alpha.11",
"parking_lot",
"quanta",
]
[[package]]
@ -1599,6 +1679,25 @@ dependencies = [
"autocfg",
]
[[package]]
name = "mio"
version = "0.6.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
dependencies = [
"cfg-if 0.1.10",
"fuchsia-zircon",
"fuchsia-zircon-sys",
"iovec",
"kernel32-sys",
"libc",
"log",
"miow 0.2.2",
"net2",
"slab",
"winapi 0.2.8",
]
[[package]]
name = "mio"
version = "0.7.6"
@ -1607,9 +1706,21 @@ checksum = "f33bc887064ef1fd66020c9adfc45bb9f33d75a42096c81e7c56c65b75dd1a8b"
dependencies = [
"libc",
"log",
"miow",
"miow 0.3.6",
"ntapi",
"winapi",
"winapi 0.3.9",
]
[[package]]
name = "miow"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
dependencies = [
"kernel32-sys",
"net2",
"winapi 0.2.8",
"ws2_32-sys",
]
[[package]]
@ -1619,7 +1730,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
dependencies = [
"socket2",
"winapi",
"winapi 0.3.9",
]
[[package]]
name = "net2"
version = "0.2.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7cf75f38f16cb05ea017784dc6dbfd354f76c223dba37701734c4f5a9337d02"
dependencies = [
"cfg-if 0.1.10",
"libc",
"winapi 0.3.9",
]
[[package]]
@ -1655,7 +1777,7 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
dependencies = [
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -1727,7 +1849,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9"
dependencies = [
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -1780,7 +1902,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec 1.5.0",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -1967,6 +2089,21 @@ dependencies = [
"syn 0.15.44",
]
[[package]]
name = "quanta"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b9a7776952c6405aab84c51621523a5e053aa6fd63c8f8e8eeaaed79ad6d2dc"
dependencies = [
"atomic-shim",
"ctor",
"libc",
"mach",
"once_cell",
"raw-cpuid",
"winapi 0.3.9",
]
[[package]]
name = "quick-error"
version = "1.2.3"
@ -2022,7 +2159,7 @@ dependencies = [
"libc",
"rand_core 0.3.1",
"rdrand",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -2090,6 +2227,17 @@ dependencies = [
"rand_core 0.5.1",
]
[[package]]
name = "raw-cpuid"
version = "8.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fdf7d9dbd43f3d81d94a49c1c3df73cc2b3827995147e6cf7f89d4ec5483e73"
dependencies = [
"bitflags",
"cc",
"rustc_version",
]
[[package]]
name = "rayon"
version = "1.5.0"
@ -2190,7 +2338,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
dependencies = [
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -2465,7 +2613,7 @@ dependencies = [
"cfg-if 0.1.10",
"libc",
"redox_syscall",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -2605,7 +2753,7 @@ dependencies = [
"rand 0.7.3",
"redox_syscall",
"remove_dir_all",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -2663,7 +2811,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -2681,6 +2829,24 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "0.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff"
dependencies = [
"bytes 0.5.6",
"fnv",
"futures-core",
"iovec",
"lazy_static",
"memchr",
"mio 0.6.23",
"pin-project-lite 0.1.11",
"slab",
"tokio-macros 0.2.6",
]
[[package]]
name = "tokio"
version = "0.3.5"
@ -2693,15 +2859,26 @@ dependencies = [
"lazy_static",
"libc",
"memchr",
"mio",
"mio 0.7.6",
"num_cpus",
"parking_lot",
"pin-project-lite 0.2.0",
"signal-hook-registry",
"slab",
"tokio-macros",
"tokio-macros 0.3.1",
"tracing",
"winapi",
"winapi 0.3.9",
]
[[package]]
name = "tokio-macros"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.7",
"syn 1.0.48",
]
[[package]]
@ -2715,6 +2892,20 @@ dependencies = [
"syn 1.0.48",
]
[[package]]
name = "tokio-util"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
dependencies = [
"bytes 0.5.6",
"futures-core",
"futures-sink",
"log",
"pin-project-lite 0.1.11",
"tokio 0.2.23",
]
[[package]]
name = "tokio-util"
version = "0.4.0"
@ -2726,7 +2917,7 @@ dependencies = [
"futures-sink",
"log",
"pin-project-lite 0.1.11",
"tokio",
"tokio 0.3.5",
]
[[package]]
@ -2740,7 +2931,7 @@ dependencies = [
"futures-sink",
"log",
"pin-project-lite 0.1.11",
"tokio",
"tokio 0.3.5",
]
[[package]]
@ -2761,7 +2952,7 @@ dependencies = [
"futures-util",
"hdrhistogram 6.3.4",
"pin-project 1.0.2",
"tokio",
"tokio 0.3.5",
"tower-layer",
"tower-service",
"tracing",
@ -2777,7 +2968,7 @@ dependencies = [
"futures-core",
"pin-project 0.4.27",
"rand 0.7.3",
"tokio",
"tokio 0.3.5",
"tower",
"tower-fallback",
"tracing",
@ -2791,7 +2982,7 @@ version = "0.1.0"
dependencies = [
"futures-core",
"pin-project 0.4.27",
"tokio",
"tokio 0.3.5",
"tower",
"tracing",
"zebra-test",
@ -3090,6 +3281,12 @@ dependencies = [
"libc",
]
[[package]]
name = "winapi"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
[[package]]
name = "winapi"
version = "0.3.9"
@ -3100,6 +3297,12 @@ dependencies = [
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-build"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
@ -3112,7 +3315,7 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi",
"winapi 0.3.9",
]
[[package]]
@ -3121,6 +3324,16 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "ws2_32-sys"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
dependencies = [
"winapi 0.2.8",
"winapi-build",
]
[[package]]
name = "wyz"
version = "0.2.0"
@ -3210,7 +3423,7 @@ dependencies = [
"serde",
"spandoc",
"thiserror",
"tokio",
"tokio 0.3.5",
"tower",
"tower-batch",
"tower-fallback",
@ -3243,7 +3456,7 @@ dependencies = [
"rand 0.7.3",
"serde",
"thiserror",
"tokio",
"tokio 0.3.5",
"tokio-util 0.5.0",
"tower",
"tracing",
@ -3292,7 +3505,7 @@ dependencies = [
"spandoc",
"tempdir",
"thiserror",
"tokio",
"tokio 0.3.5",
"tower",
"tracing",
"tracing-error",
@ -3315,7 +3528,7 @@ dependencies = [
"spandoc",
"tempdir",
"thiserror",
"tokio",
"tokio 0.3.5",
"tower",
"tracing",
"tracing-error",
@ -3347,9 +3560,9 @@ dependencies = [
"dirs",
"futures",
"gumdrop",
"hyper",
"hyper 0.14.0-dev",
"inferno",
"metrics 0.13.0-alpha.8",
"metrics 0.13.0-alpha.11",
"metrics-exporter-prometheus",
"once_cell",
"pin-project 0.4.27",
@ -3357,7 +3570,7 @@ dependencies = [
"serde",
"tempdir",
"thiserror",
"tokio",
"tokio 0.3.5",
"toml",
"tower",
"tracing",

2
Cargo.toml
View File

@ -23,6 +23,4 @@ panic = "abort"
[patch.crates-io]
tower = { git = "https://github.com/tower-rs/tower", rev = "d4d1c67c6a0e4213a52abcc2b9df6cc58276ee39" }
hyper = { git = "https://github.com/hyperium/hyper/", rev = "ed2b22a7f66899d338691552fbcb6c0f2f4e06b9" }
metrics = { git = "https://github.com/ZcashFoundation/metrics", rev = "971133128e5aebe3ad177acffc6154449736cfa2" }
metrics-exporter-prometheus = { git = "https://github.com/ZcashFoundation/metrics", rev = "971133128e5aebe3ad177acffc6154449736cfa2" }

3
zebrad/Cargo.toml
View File

@ -33,8 +33,9 @@ tracing-futures = "0.2"
tracing-flame = "0.1.0"
tracing-subscriber = { version = "0.2.15", features = ["tracing-log"] }
tracing-error = "0.1.2"
metrics = "0.13.0-alpha.8"
metrics-exporter-prometheus = "0.1.0-alpha.7"
metrics-exporter-prometheus = "0.1.0-alpha.10"
dirs = "3.0.1"
inferno = { version = "0.10.2", default-features = false }