Skip to content

Commit 06eab55

Browse files
authored
chore: big round of dep updates + use cargo-autoinherit to move to workspace deps + MSRV bump (#530)
1 parent b0d84ba commit 06eab55

File tree

15 files changed

+171
-116
lines changed

15 files changed

+171
-116
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
name: Test ${{ matrix.rust_version }}
4545
runs-on: ubuntu-latest
4646
strategy:
47-
# 1.70 is the MSRV for the project, which currently does not match the version specified in
47+
# 1.71.1 is the MSRV for the project, which currently does not match the version specified in
4848
# the rust-toolchain.toml file as metrics-observer requires 1.74 to build. See
4949
# https://github.com/metrics-rs/metrics/pull/505#discussion_r1724092556 for more information.
5050
matrix:
51-
rust_version: ['stable', 'nightly', '1.70']
51+
rust_version: ['stable', 'nightly', '1.71.1']
5252
include:
53-
- rust_version: '1.70'
53+
- rust_version: '1.71.1'
5454
exclude-packages: '--exclude metrics-observer'
5555
steps:
5656
- uses: actions/checkout@v3

Cargo.toml

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,68 @@
11
[workspace]
22
members = [
33
"metrics",
4-
"metrics-util",
5-
"metrics-exporter-tcp",
4+
"metrics-benchmark",
65
"metrics-exporter-prometheus",
7-
"metrics-tracing-context",
6+
"metrics-exporter-tcp",
87
"metrics-observer",
9-
"metrics-benchmark",
8+
"metrics-tracing-context",
9+
"metrics-util",
1010
]
11+
12+
[workspace.dependencies]
13+
ahash = { version = "0.8", default-features = false }
14+
aho-corasick = { version = "1", default-features = false }
15+
approx = { version = "0.5", default-features = false }
16+
base64 = { version = "0.22", default-features = false, features = ["std"] }
17+
bytes = { version = "1", default-features = false }
18+
chrono = { version = "0.4", default-features = false }
19+
criterion = { version = "=0.3.3", default-features = false }
20+
crossbeam-channel = { version = "0.5", default-features = false }
21+
crossbeam-epoch = { version = "0.9", default-features = false }
22+
crossbeam-queue = { version = "0.3", default-features = false, features = ["std"] }
23+
crossbeam-utils = { version = "0.8", default-features = false }
24+
getopts = { version = "0.2", default-features = false }
25+
hashbrown = { version = "0.15", default-features = false, features = ["default-hasher", "raw-entry"] }
26+
hdrhistogram = { version = "7.2", default-features = false }
27+
home = { version = "0.5", default-features = false }
28+
http-body-util = { version = "0.1", default-features = false }
29+
hyper = { version = "1.1", default-features = false, features = ["server", "client"] }
30+
hyper-rustls = { version = "0.27", default-features = false, features = ["aws-lc-rs", "http1", "rustls-native-certs"] }
31+
hyper-util = { version = "0.1", default-features = false, features = ["tokio", "service", "client", "client-legacy", "http1"] }
32+
indexmap = { version = "2.6", default-features = false, features = ["std"] }
33+
ipnet = { version = "2", default-features = false, features = ["std"] }
34+
itertools = { version = "0.13.0", default-features = false }
35+
itoa = { version = "1", default-features = false }
36+
lockfree-object-pool = { version = "0.1", default-features = false }
37+
log = { version = "0.4", default-features = false }
38+
mio = { version = "1.0", default-features = false }
39+
mockall = { version = "0.12", default-features = false }
40+
ndarray = { version = "0.16", default-features = false }
41+
ndarray-stats = { version = "0.6", default-features = false }
42+
noisy_float = { version = "0.2", default-features = false }
43+
once_cell = { version = "1", default-features = false, features = ["std"] }
44+
ordered-float = { version = "4.2", default-features = false }
45+
parking_lot = { version = "0.12", default-features = false }
46+
portable-atomic = { version = "1", default-features = false }
47+
predicates = { version = "=3.1.0", default-features = false }
48+
predicates-core = { version = "=1.0.6", default-features = false }
49+
predicates-tree = { version = "=1.0.9", default-features = false }
50+
pretty_env_logger = { version = "0.5", default-features = false }
51+
proptest = { version = "1", default-features = false, features = ["std"] }
52+
prost = { version = "0.13", default-features = false, features = ["derive"] }
53+
prost-build = { version = "0.13", default-features = false }
54+
prost-types = { version = "0.13", default-features = false }
55+
quanta = { version = "0.12", default-features = false }
56+
quickcheck = { version = "1", default-features = false }
57+
quickcheck_macros = { version = "1", default-features = false }
58+
radix_trie = { version = "0.2", default-features = false }
59+
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
60+
rand_distr = { version = "0.4", default-features = false }
61+
ratatui = { version = "0.28", default-features = false }
62+
sketches-ddsketch = { version = "0.3", default-features = false }
63+
thiserror = { version = "1", default-features = false }
64+
tokio = { version = "1", default-features = false, features = ["rt", "net", "time", "rt-multi-thread"] }
65+
tracing = { version = "0.1", default-features = false }
66+
tracing-core = { version = "0.1", default-features = false }
67+
tracing-subscriber = { version = "0.3", default-features = false }
68+
trybuild = { version = "1", default-features = false }

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Additionally, here are some learning resource(s) to help you get started:
7070

7171
## MSRV and MSRV policy
7272

73-
Minimum supported Rust version (MSRV) is currently **1.70.0**, enforced by CI.
73+
Minimum supported Rust version (MSRV) is currently **1.71.1**, enforced by CI.
7474

7575
`metrics` will always support _at least_ the latest four versions of stable Rust, based on minor
7676
version releases, and excluding patch versions. Overall, we strive to support older versions where

metrics-benchmark/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ name = "metrics-benchmark"
33
version = "0.1.1-alpha.5"
44
authors = ["Toby Lawrence <[email protected]>"]
55
edition = "2018"
6-
rust-version = "1.70.0"
6+
rust-version = "1.71.1"
77
publish = false
88

99
[dependencies]
10-
log = "0.4"
11-
pretty_env_logger = "0.5"
12-
getopts = "0.2"
13-
hdrhistogram = { version = "7.2", default-features = false }
14-
quanta = "0.12"
15-
portable-atomic = { version = "1", default-features = false, features = ["fallback"] }
10+
getopts = { workspace = true }
11+
hdrhistogram = { workspace = true }
12+
log = { workspace = true }
1613
metrics = { version = "^0.23", path = "../metrics" }
1714
metrics-util = { version = "^0.17", path = "../metrics-util" }
15+
portable-atomic = { workspace = true, features = ["fallback"] }
16+
pretty_env_logger = { workspace = true }
17+
quanta = { workspace = true }

metrics-exporter-prometheus/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
### Changed
1616

1717
- Fixed a number of Clippy lints. ([#510](https://github.com/metrics-rs/metrics/pull/510))
18+
- Bump MSRV to 1.71.1. ([#530](https://github.com/metrics-rs/metrics/pull/530))
1819

1920
## [0.15.3] - 2024-07-13
2021

metrics-exporter-prometheus/Cargo.toml

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "metrics-exporter-prometheus"
33
version = "0.15.3"
44
authors = ["Toby Lawrence <[email protected]>"]
55
edition = "2018"
6-
rust-version = "1.70.0"
6+
rust-version = "1.71.1"
77

88
license = "MIT"
99

@@ -33,42 +33,31 @@ _hyper-client = [
3333
]
3434

3535
[dependencies]
36+
base64 = { workspace = true }
37+
http-body-util = { workspace = true, optional = true }
38+
39+
# Optional
40+
hyper = { workspace = true, optional = true }
41+
hyper-rustls = { workspace = true, optional = true }
42+
hyper-util = { workspace = true, optional = true }
43+
indexmap = { workspace = true }
44+
ipnet = { workspace = true, optional = true }
3645
metrics = { version = "^0.23", path = "../metrics" }
3746
metrics-util = { version = "^0.17", path = "../metrics-util", default-features = false, features = [
3847
"recency",
3948
"registry",
4049
"summary",
4150
] }
42-
thiserror = { version = "1", default-features = false }
43-
quanta = { version = "0.12", default-features = false }
44-
indexmap = { version = "2.1", default-features = false, features = ["std"] }
45-
base64 = { version = "0.22.0", default-features = false, features = ["std"] }
46-
47-
# Optional
48-
hyper = { version = "1.1", features = ["server", "client"], optional = true }
49-
hyper-util = { version = "0.1.3", features = [
50-
"tokio",
51-
"service",
52-
"client",
53-
"client-legacy",
54-
"http1",
55-
], optional = true }
56-
http-body-util = { version = "0.1.0", optional = true }
57-
ipnet = { version = "2", optional = true }
58-
tokio = { version = "1", features = [
59-
"rt",
60-
"net",
61-
"time",
62-
"rt-multi-thread",
63-
], optional = true }
64-
tracing = { version = "0.1.26", optional = true }
65-
hyper-rustls = { version = "0.27.2", optional = true }
51+
quanta = { workspace = true }
52+
thiserror = { workspace = true }
53+
tokio = { workspace = true, optional = true }
54+
tracing = { workspace = true, optional = true }
6655

6756
[dev-dependencies]
68-
tracing = "0.1"
69-
tracing-subscriber = "0.3"
70-
rand = "0.8"
71-
proptest = "1"
57+
proptest = { workspace = true }
58+
rand = { workspace = true }
59+
tracing = { workspace = true }
60+
tracing-subscriber = { workspace = true, features = ["fmt"] }
7261

7362
[[example]]
7463
name = "prometheus_push_gateway"

metrics-exporter-tcp/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
### Changed
1616

1717
- Updated `mio` to `1.0`.
18+
- Bump MSRV to 1.71.1. ([#530](https://github.com/metrics-rs/metrics/pull/530))
1819

1920
## [0.10.0] - 2024-05-27
2021

metrics-exporter-tcp/Cargo.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "metrics-exporter-tcp"
33
version = "0.10.0"
44
authors = ["Toby Lawrence <[email protected]>"]
55
edition = "2018"
6-
rust-version = "1.70.0"
6+
rust-version = "1.71.1"
77

88
license = "MIT"
99

@@ -17,20 +17,20 @@ categories = ["development-tools::debugging"]
1717
keywords = ["metrics", "telemetry", "tcp"]
1818

1919
[dependencies]
20+
bytes = { workspace = true }
21+
crossbeam-channel = { workspace = true, features = ["std"] }
2022
metrics = { version = "^0.23", path = "../metrics" }
21-
bytes = { version = "1", default-features = false }
22-
crossbeam-channel = { version = "0.5", default-features = false, features = ["std"] }
23-
prost = { version = "0.12", default-features = false }
24-
prost-types = { version = "0.12", default-features = false, features = ["std"] }
25-
mio = { version = "1.0", default-features = false, features = ["os-poll", "net"] }
26-
tracing = { version = "0.1", default-features = false, features = ["attributes"] }
23+
mio = { workspace = true, features = ["os-poll", "net"] }
24+
prost = { workspace = true }
25+
prost-types = { workspace = true, features = ["std"] }
26+
tracing = { workspace = true, features = ["attributes"] }
2727

2828
[build-dependencies]
29-
prost-build = "0.12"
30-
home = "0.5.9"
29+
home = { workspace = true }
30+
prost-build = { workspace = true }
3131

3232
[dev-dependencies]
33-
quanta = "0.12"
34-
tracing = "0.1"
35-
tracing-subscriber = "0.3"
36-
rand = "0.8"
33+
quanta = { workspace = true }
34+
rand = { workspace = true }
35+
tracing = { workspace = true }
36+
tracing-subscriber = { workspace = true, features = ["fmt"] }

metrics-observer/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ categories = ["development-tools::debugging"]
1717
keywords = ["metrics", "facade", "macros"]
1818

1919
[dependencies]
20+
bytes = { workspace = true }
21+
chrono = { workspace = true, features = ["clock"] }
22+
crossbeam-channel = { workspace = true, features = ["std"] }
2023
metrics = { version = "^0.23", path = "../metrics", default-features = false }
2124
metrics-util = { version = "^0.17", path = "../metrics-util", default-features = false, features = ["summary"] }
22-
bytes = { version = "1", default-features = false }
23-
crossbeam-channel = { version = "0.5", default-features = false, features = ["std"] }
24-
prost = { version = "0.12", default-features = false }
25-
prost-types = { version = "0.12", default-features = false }
26-
ratatui = { version = "0.28.0", default-features = false, features = ["crossterm"] }
27-
chrono = { version = "0.4", default-features = false, features = ["clock"] }
25+
prost = { workspace = true }
26+
prost-types = { workspace = true }
27+
ratatui = { workspace = true, features = ["crossterm"] }
2828

2929
[build-dependencies]
30-
prost-build = "0.12"
31-
home = "0.5.9"
30+
home = { workspace = true }
31+
prost-build = { workspace = true }

metrics-tracing-context/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1515
### Changed
1616

1717
- Fixed a number of Clippy lints. ([#510](https://github.com/metrics-rs/metrics/pull/510))
18+
- Bump MSRV to 1.71.1. ([#530](https://github.com/metrics-rs/metrics/pull/530))
1819

1920
## [0.16.0] - 2024-05-27
2021

metrics-tracing-context/Cargo.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "metrics-tracing-context"
33
version = "0.16.0"
44
authors = ["MOZGIII <[email protected]>"]
55
edition = "2018"
6-
rust-version = "1.70.0"
6+
rust-version = "1.71.1"
77

88
license = "MIT"
99

@@ -28,19 +28,19 @@ name = "layer"
2828
harness = false
2929

3030
[dependencies]
31-
itoa = { version = "1", default-features = false }
31+
indexmap = { workspace = true }
32+
itoa = { workspace = true }
33+
lockfree-object-pool = { workspace = true }
3234
metrics = { version = "^0.23", path = "../metrics" }
3335
metrics-util = { version = "^0.17", path = "../metrics-util" }
34-
lockfree-object-pool = { version = "0.1.3", default-features = false }
35-
indexmap = { version = "2.1", default-features = false, features = ["std"] }
36-
once_cell = { version = "1", default-features = false, features = ["std"] }
37-
tracing = { version = "0.1.29", default-features = false }
38-
tracing-core = { version = "0.1.21", default-features = false }
39-
tracing-subscriber = { version = "0.3.1", default-features = false, features = ["std"] }
36+
once_cell = { workspace = true }
37+
tracing = { workspace = true }
38+
tracing-core = { workspace = true }
39+
tracing-subscriber = { workspace = true, features = ["std"] }
4040

4141
[dev-dependencies]
42-
criterion = { version = "=0.3.3", default-features = false }
43-
parking_lot = { version = "0.12.1", default-features = false }
44-
tracing = { version = "0.1.29", default-features = false, features = ["std"] }
45-
tracing-subscriber = { version = "0.3.1", default-features = false, features = ["registry"] }
46-
itertools = { version = "0.12.0", default-features = false, features = ["use_std"] }
42+
criterion = { workspace = true }
43+
itertools = { workspace = true, features = ["use_std"] }
44+
parking_lot = { workspace = true }
45+
tracing = { workspace = true, features = ["std"] }
46+
tracing-subscriber = { workspace = true, features = ["registry"] }

metrics-util/CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1818
- Replaced `num_cpus::get` with `std::thread::available_parallelism`.
1919
([#500](https://github.com/metrics-rs/metrics/pull/500))
2020
- Fixed a number of Clippy lints. ([#510](https://github.com/metrics-rs/metrics/pull/510))
21-
- Added `Sync` constraint to generic parameter in `RecoverableRecorder` and `Stack`. ([#511](https://github.com/metrics-rs/metrics/pull/511))
21+
- Added `Sync` constraint to generic parameter in `RecoverableRecorder` and `Stack`.
22+
([#511](https://github.com/metrics-rs/metrics/pull/511))
23+
- Bump MSRV to 1.71.1. ([#530](https://github.com/metrics-rs/metrics/pull/530))
2224

2325
## [0.17.0] - 2024-05-27
2426

0 commit comments

Comments
 (0)