From 2011857484482f583b35c86da42d1bd35d5c1bb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 May 2022 17:29:06 +0000 Subject: [PATCH] build(deps): bump metrics-exporter-prometheus from 0.6.0 to 0.10.0 Bumps [metrics-exporter-prometheus](https://github.com/metrics-rs/metrics) from 0.6.0 to 0.10.0. - [Release notes](https://github.com/metrics-rs/metrics/releases) - [Changelog](https://github.com/metrics-rs/metrics/blob/main/release.toml) - [Commits](https://github.com/metrics-rs/metrics/compare/metrics-exporter-prometheus-v0.6.0...metrics-exporter-prometheus-v0.10.0) --- updated-dependencies: - dependency-name: metrics-exporter-prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 221 +++++++++++++++------------------------------ metasrv/Cargo.toml | 2 +- query/Cargo.toml | 2 +- store/Cargo.toml | 2 +- 4 files changed, 74 insertions(+), 153 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b08b67184703..a8478ea06314e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -202,11 +202,11 @@ dependencies = [ [[package]] name = "atomic-shim" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20fdac7156779a1a30d970e838195558b4810dd06aa69e7c7461bdc518edf9b" +checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77" dependencies = [ - "crossbeam 0.7.3", + "crossbeam-utils", ] [[package]] @@ -631,7 +631,7 @@ dependencies = [ "chrono-tz 0.5.3", "clickhouse-rs-cityhash-sys", "combine", - "crossbeam 0.8.1", + "crossbeam", "futures-core", "futures-sink", "futures-util", @@ -1117,7 +1117,7 @@ dependencies = [ "common-datavalues", "common-exception", "common-io", - "crossbeam 0.8.1", + "crossbeam", "futures", "pin-project-lite", "pretty_assertions", @@ -1242,20 +1242,6 @@ dependencies = [ "itertools", ] -[[package]] -name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.4", - "crossbeam-epoch 0.8.2", - "crossbeam-queue 0.2.3", - "crossbeam-utils 0.7.2", -] - [[package]] name = "crossbeam" version = "0.8.1" @@ -1263,21 +1249,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" dependencies = [ "cfg-if 1.0.0", - "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.1", - "crossbeam-epoch 0.9.5", - "crossbeam-queue 0.3.2", - "crossbeam-utils 0.8.5", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", ] [[package]] @@ -1287,18 +1263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "crossbeam-utils", ] [[package]] @@ -1308,23 +1273,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.5", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg 1.0.1", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] @@ -1334,23 +1284,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "crossbeam-utils", "lazy_static", - "memoffset 0.6.4", + "memoffset", "scopeguard", ] -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - [[package]] name = "crossbeam-queue" version = "0.3.2" @@ -1358,18 +1297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg 1.0.1", - "cfg-if 0.1.10", - "lazy_static", + "crossbeam-utils", ] [[package]] @@ -1483,16 +1411,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if 1.0.0", - "num_cpus", -] - [[package]] name = "data-encoding" version = "2.3.2" @@ -1570,8 +1488,8 @@ dependencies = [ "common-streams", "common-tracing", "criterion", - "crossbeam 0.8.1", - "crossbeam-queue 0.3.2", + "crossbeam", + "crossbeam-queue", "ctrlc", "env_logger 0.9.0", "flaky_test", @@ -1581,7 +1499,7 @@ dependencies = [ "indexmap", "lazy_static", "log", - "metrics", + "metrics 0.17.0", "metrics-exporter-prometheus", "msql-srv", "mysql", @@ -1654,7 +1572,7 @@ dependencies = [ "log", "maplit", "metasrv", - "metrics", + "metrics 0.17.0", "metrics-exporter-prometheus", "num", "num_cpus", @@ -3067,12 +2985,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "md-5" version = "0.9.1" @@ -3100,15 +3012,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg 1.0.1", -] - [[package]] name = "memoffset" version = "0.6.4" @@ -3152,7 +3055,7 @@ dependencies = [ "lazy_static", "log", "maplit", - "metrics", + "metrics 0.17.0", "metrics-exporter-prometheus", "num", "num_cpus", @@ -3185,24 +3088,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00f42f354a2ed4894db863b3a4db47aef2d2e4435b937221749bd37a8a7aaa8" dependencies = [ "ahash", - "metrics-macros", + "metrics-macros 0.4.0", "proc-macro-hack", ] +[[package]] +name = "metrics" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2" +dependencies = [ + "ahash", + "metrics-macros 0.5.1", +] + [[package]] name = "metrics-exporter-prometheus" -version = "0.6.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9db7052a7cb0b0c0922a1ce499c9e78576763b1d47499ba980a4fe731b96909d" +checksum = "953cbbb6f9ba4b9304f4df79b98cdc9d14071ed93065a9fca11c00c5d9181b66" dependencies = [ "hyper", + "indexmap", "ipnet", - "metrics", + "metrics 0.19.0", "metrics-util", "parking_lot", "quanta", "thiserror", "tokio", + "tracing", ] [[package]] @@ -3219,26 +3134,31 @@ dependencies = [ "syn", ] +[[package]] +name = "metrics-macros" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "metrics-util" -version = "0.10.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a58e622a425b7308e73e4390c68b8cb3df4443f2a57495e391b978412531638c" +checksum = "fd1f4b69bef1e2b392b2d4a12902f2af90bb438ba4a66aa222d1023fa6561b50" dependencies = [ - "ahash", - "aho-corasick", "atomic-shim", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.5", - "dashmap", + "crossbeam-epoch", + "crossbeam-utils", "hashbrown", - "indexmap", - "metrics", + "metrics 0.19.0", "num_cpus", - "ordered-float 2.8.0", "parking_lot", "quanta", - "radix_trie", "sketches-ddsketch", ] @@ -3459,7 +3379,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "memoffset 0.6.4", + "memoffset", ] [[package]] @@ -3472,7 +3392,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "memoffset 0.6.4", + "memoffset", ] [[package]] @@ -3485,7 +3405,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "libc", - "memoffset 0.6.4", + "memoffset", ] [[package]] @@ -3729,7 +3649,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" dependencies = [ "async-trait", - "crossbeam-channel 0.5.1", + "crossbeam-channel", "futures", "js-sys", "lazy_static", @@ -4338,16 +4258,17 @@ dependencies = [ [[package]] name = "quanta" -version = "0.7.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e76a3afdefd0ce2c0363bf3146271e947782240ea617885dd64e56c4de9fb3c9" +checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" dependencies = [ - "atomic-shim", - "ctor", + "crossbeam-utils", "libc", "mach", "once_cell", "raw-cpuid", + "wasi", + "web-sys", "winapi", ] @@ -4454,9 +4375,9 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "9.1.1" +version = "10.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1733f6f80c9c24268736a501cd00d41a9849b4faa7a9f9334c096e5d10553206" +checksum = "738bc47119e3eeccc7e94c4a506901aea5e7b4944ecd0829cbebf4af04ceda12" dependencies = [ "bitflags", ] @@ -4468,7 +4389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ "autocfg 1.0.1", - "crossbeam-deque 0.8.1", + "crossbeam-deque", "either", "rayon-core", ] @@ -4479,9 +4400,9 @@ version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ - "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.1", - "crossbeam-utils 0.8.5", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", "lazy_static", "num_cpus", ] @@ -5114,9 +5035,9 @@ dependencies = [ [[package]] name = "sketches-ddsketch" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a77a8fd93886010f05e7ea0720e569d6d16c65329dbe3ec033bbbccccb017b" +checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee" [[package]] name = "slab" @@ -5859,7 +5780,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9965507e507f12c8901432a33e31131222abac31edd90cabbcf85cf544b7127a" dependencies = [ "chrono", - "crossbeam-channel 0.5.1", + "crossbeam-channel", "tracing-subscriber", ] diff --git a/metasrv/Cargo.toml b/metasrv/Cargo.toml index 8c56320e7fdd5..1cc52cceb3503 100644 --- a/metasrv/Cargo.toml +++ b/metasrv/Cargo.toml @@ -45,7 +45,7 @@ indexmap = "1.7.0" lazy_static = "1.4.0" log = "0.4" metrics = "0.17.0" -metrics-exporter-prometheus = "0.6.0" +metrics-exporter-prometheus = "0.10.0" num = "0.4" num_cpus = "1.0" prost = "0.8.0" diff --git a/query/Cargo.toml b/query/Cargo.toml index 0c983b3c9807c..ffa9deedea84b 100644 --- a/query/Cargo.toml +++ b/query/Cargo.toml @@ -65,7 +65,7 @@ indexmap = "1.7.0" lazy_static = "1.4.0" log = "0.4" metrics = "0.17.0" -metrics-exporter-prometheus = "0.6.0" +metrics-exporter-prometheus = "0.10.0" num = "0.4" nom = "7.0.0" num_cpus = "1.0" diff --git a/store/Cargo.toml b/store/Cargo.toml index 39a17284a5822..1ba0b6b85087d 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -49,7 +49,7 @@ indexmap = "1.7.0" lazy_static = "1.4.0" log = "0.4" metrics = "0.17.0" -metrics-exporter-prometheus = "0.6.0" +metrics-exporter-prometheus = "0.10.0" num = "0.4" num_cpus = "1.0" prost = "0.8.0"