Skip to content

Commit 9fb4fb4

Browse files
olix0rolix0r
committed
deps: Update tokio, tonic, and prost
* tokio 1.34 * tonic 0.10 * prost 0.12 * linkerd2-proxy-api 0.12 (linkerd/linkerd2-proxy-api#269)
1 parent 1b2039d commit 9fb4fb4

File tree

25 files changed

+146
-185
lines changed

25 files changed

+146
-185
lines changed

‎Cargo.lock

Lines changed: 59 additions & 131 deletions
Large diffs are not rendered by default.

‎Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@ members = [
7575
[profile.release]
7676
debug = 1
7777
lto = true
78+
79+
[patch.crates-io]
80+
linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", branch = "ver/deps" }

‎deny.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,13 @@ skip = [
7979
# https://github.com/hawkw/matchers/pull/4
8080
{ name = "regex-automata", version = "0.1" },
8181
{ name = "regex-syntax", version = "0.6" },
82-
# linkerd2-proxy-api needs to upgrade tonic to upgrade prost...
83-
{ name = "prost", version = "0.11" },
84-
{ name = "prost-build", version = "0.11" },
85-
{ name = "prost-derive", version = "0.11" },
86-
{ name = "prost-types", version = "0.11" },
87-
{ name = "prettyplease", version = "0.1" },
8882
]
8983
skip-tree = [
9084
# right now we have a mix of versions of this crate in the ecosystem
9185
# procfs uses 0.36.14, tempfile uses 0.37.4
9286
{ name = "rustix" },
87+
# Hyper v0.14 depends on an older socket2 version.
88+
{ name = "socket2" },
9389
]
9490

9591
[sources]

‎linkerd/app/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ regex = "1"
3030
thiserror = "1"
3131
tokio = { version = "1", features = ["rt"] }
3232
tokio-stream = { version = "0.1", features = ["time", "sync"] }
33-
tonic = { version = "0.8", default-features = false, features = ["prost"] }
33+
tonic = { version = "0.10", default-features = false, features = ["prost"] }
3434
tower = "0.4"
3535
tracing = "0.1"

‎linkerd/app/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ serde_json = "1"
6363
thiserror = "1"
6464
tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
6565
tokio-stream = { version = "0.1", features = ["time"] }
66-
tonic = { version = "0.8", default-features = false, features = ["prost"] }
66+
tonic = { version = "0.10", default-features = false, features = ["prost"] }
6767
tracing = "0.1"
6868
parking_lot = "0.12"
6969
pin-project = "1"

‎linkerd/app/gateway/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ linkerd-proxy-client-policy = { path = "../../proxy/client-policy" }
1616
once_cell = "1"
1717
thiserror = "1"
1818
tokio = { version = "1", features = ["sync"] }
19-
tonic = { version = "0.8", default-features = false }
19+
tonic = { version = "0.10", default-features = false }
2020
tower = { version = "0.4", default-features = false }
2121
tracing = "0.1"
2222

‎linkerd/app/inbound/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ linkerd-meshtls = { path = "../../meshtls", optional = true }
2929
linkerd-meshtls-rustls = { path = "../../meshtls/rustls", optional = true }
3030
linkerd-proxy-client-policy = { path = "../../proxy/client-policy" }
3131
linkerd-tonic-watch = { path = "../../tonic-watch" }
32-
linkerd2-proxy-api = { version = "0.11", features = ["inbound"] }
32+
linkerd2-proxy-api = { version = "0.12", features = ["inbound"] }
3333
once_cell = "1"
3434
parking_lot = "0.12"
3535
rangemap = "1"
3636
thiserror = "1"
3737
tokio = { version = "1", features = ["sync"] }
38-
tonic = { version = "0.8", default-features = false }
38+
tonic = { version = "0.10", default-features = false }
3939
tower = { version = "0.4", features = ["util"] }
4040
tracing = "0.1"
4141

‎linkerd/app/integration/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ipnet = "2"
3333
linkerd-app = { path = "..", features = ["allow-loopback"] }
3434
linkerd-app-core = { path = "../core" }
3535
linkerd-metrics = { path = "../../metrics", features = ["test_util"] }
36-
linkerd2-proxy-api = { version = "0.11", features = [
36+
linkerd2-proxy-api = { version = "0.12", features = [
3737
"destination",
3838
"arbitrary",
3939
] }
@@ -48,7 +48,7 @@ tokio-stream = { version = "0.1", features = ["sync"] }
4848
tokio-rustls = "0.24"
4949
rustls-pemfile = "1.0"
5050
tower = { version = "0.4", default-features = false }
51-
tonic = { version = "0.8", features = ["transport"], default-features = false }
51+
tonic = { version = "0.10", features = ["transport"], default-features = false }
5252
tracing = "0.1"
5353
tracing-subscriber = { version = "0.3", default-features = false, features = [
5454
"fmt",

‎linkerd/app/outbound/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ahash = "0.8"
2020
bytes = "1"
2121
http = "0.2"
2222
futures = { version = "0.3", default-features = false }
23-
linkerd2-proxy-api = { version = "0.11", features = ["outbound"] }
23+
linkerd2-proxy-api = { version = "0.12", features = ["outbound"] }
2424
linkerd-app-core = { path = "../core" }
2525
linkerd-app-test = { path = "../test", optional = true }
2626
linkerd-distribute = { path = "../../distribute" }
@@ -38,7 +38,7 @@ once_cell = "1"
3838
parking_lot = "0.12"
3939
thiserror = "1"
4040
tokio = { version = "1", features = ["sync"] }
41-
tonic = { version = "0.8", default-features = false }
41+
tonic = { version = "0.10", default-features = false }
4242
tower = { version = "0.4", features = ["util"] }
4343
tracing = "0.1"
4444
pin-project = "1"

‎linkerd/app/test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ regex = "1"
2929
tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
3030
tokio-test = "0.4"
3131
tokio-stream = { version = "0.1", features = ["sync"] }
32-
tonic = { version = "0.8", default-features = false, optional = true }
32+
tonic = { version = "0.10", default-features = false, optional = true }
3333
tower = { version = "0.4", default-features = false }
3434
tracing = "0.1"
3535
thiserror = "1"

‎linkerd/exp-backoff/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ license = "Apache-2.0"
66
edition = "2021"
77
publish = false
88

9-
109
[dependencies]
1110
futures = { version = "0.3", default-features = false }
1211
rand = { version = "0.8", features = ["small_rng"] }

‎linkerd/http-route/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tracing = "0.1"
1717
url = "2"
1818

1919
[dependencies.linkerd2-proxy-api]
20-
version = "0.11"
20+
version = "0.12"
2121
features = ["http-route", "grpc-route"]
2222
optional = true
2323

‎linkerd/opencensus/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ http-body = "0.4"
1313
linkerd-error = { path = "../error" }
1414
linkerd-metrics = { path = "../metrics" }
1515
opencensus-proto = { path = "../../opencensus-proto" }
16-
tonic = { version = "0.8", default-features = false, features = ["prost", "codegen"] }
16+
tonic = { version = "0.10", default-features = false, features = [
17+
"prost",
18+
"codegen",
19+
] }
1720
tokio = { version = "1", features = ["macros", "sync", "time"] }
1821
tokio-stream = { version = "0.1", features = ["sync"] }
1922
tracing = "0.1"

‎linkerd/proxy/api-resolve/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ async-stream = "0.3"
1414
futures = { version = "0.3", default-features = false }
1515
linkerd-addr = { path = "../../addr" }
1616
linkerd-error = { path = "../../error" }
17-
linkerd2-proxy-api = { version = "0.11", features = ["destination"] }
17+
linkerd2-proxy-api = { version = "0.12", features = ["destination"] }
1818
linkerd-proxy-core = { path = "../core" }
1919
linkerd-stack = { path = "../../stack" }
2020
linkerd-tls = { path = "../../tls" }
2121
http = "0.2"
2222
http-body = "0.4"
2323
pin-project = "1"
24-
prost = "0.11"
25-
tonic = { version = "0.8", default-features = false }
24+
prost = "0.12"
25+
tonic = { version = "0.10", default-features = false }
2626
tower = { version = "0.4", default-features = false }
2727
tracing = "0.1"

‎linkerd/proxy/client-policy/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ proto = [
1818
ahash = "0.8"
1919
ipnet = "2"
2020
http = "0.2"
21-
linkerd2-proxy-api = { version = "0.11", optional = true, features = [
21+
linkerd2-proxy-api = { version = "0.12", optional = true, features = [
2222
"outbound",
2323
] }
2424
linkerd-error = { path = "../../error" }
@@ -27,8 +27,8 @@ linkerd-http-route = { path = "../../http-route" }
2727
linkerd-proxy-api-resolve = { path = "../api-resolve" }
2828
linkerd-proxy-core = { path = "../core" }
2929
once_cell = { version = "1" }
30-
prost-types = { version = "0.11", optional = true }
31-
tonic = { version = "0.8", default-features = false }
30+
prost-types = { version = "0.12", optional = true }
31+
tonic = { version = "0.10", default-features = false }
3232
thiserror = { version = "1", optional = true }
3333

3434
[dev-dependencies]

‎linkerd/proxy/identity-client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ publish = false
88

99
[dependencies]
1010
futures = { version = "0.3", default-features = false }
11-
linkerd2-proxy-api = { version = "0.11", features = ["identity"] }
11+
linkerd2-proxy-api = { version = "0.12", features = ["identity"] }
1212
linkerd-dns-name = { path = "../../dns/name" }
1313
linkerd-error = { path = "../../error" }
1414
linkerd-identity = { path = "../../identity" }
@@ -18,6 +18,6 @@ parking_lot = "0.12"
1818
pin-project = "1"
1919
thiserror = "1"
2020
tokio = { version = "1", features = ["time", "sync"] }
21-
tonic = { version = "0.8", default-features = false }
21+
tonic = { version = "0.10", default-features = false }
2222
tracing = "0.1"
2323
http-body = "0.4"

‎linkerd/proxy/server-policy/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ proto = ["linkerd-http-route/proto", "linkerd2-proxy-api", "prost-types"]
1313
ipnet = "2"
1414
http = "0.2"
1515
linkerd-http-route = { path = "../../http-route" }
16-
prost-types = { version = "0.11", optional = true }
16+
prost-types = { version = "0.12", optional = true }
1717
thiserror = "1"
1818

1919
[dependencies.linkerd2-proxy-api]
20-
version = "0.11"
20+
version = "0.12"
2121
features = ["inbound"]
2222
optional = true
2323

‎linkerd/proxy/tap/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ http = "0.2"
1111
hyper = { version = "0.14", features = ["http1", "http2"] }
1212
futures = { version = "0.3", default-features = false }
1313
ipnet = "2.7"
14-
linkerd2-proxy-api = { version = "0.11", features = ["tap"] }
14+
linkerd2-proxy-api = { version = "0.12", features = ["tap"] }
1515
linkerd-conditional = { path = "../../conditional" }
1616
linkerd-error = { path = "../../error" }
1717
linkerd-meshtls = { path = "../../meshtls" }
@@ -20,15 +20,15 @@ linkerd-proxy-http = { path = "../http" }
2020
linkerd-stack = { path = "../../stack" }
2121
linkerd-tls = { path = "../../tls" }
2222
parking_lot = "0.12"
23-
prost-types = "0.11"
23+
prost-types = "0.12"
2424
rand = { version = "0.8" }
2525
thiserror = "1"
2626
tokio = { version = "1", features = ["time"] }
2727
tower = { version = "0.4", default-features = false }
28-
tonic = { version = "0.8", default-features = false }
28+
tonic = { version = "0.10", default-features = false }
2929
tracing = "0.1"
3030
pin-project = "1"
3131

3232
[dev-dependencies]
33-
linkerd2-proxy-api = { version = "0.11", features = ["arbitrary"] }
33+
linkerd2-proxy-api = { version = "0.12", features = ["arbitrary"] }
3434
quickcheck = { version = "1", default-features = false }

‎linkerd/service-profiles/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ linkerd-http-box = { path = "../http-box" }
2121
linkerd-proxy-api-resolve = { path = "../proxy/api-resolve" }
2222
linkerd-stack = { path = "../stack" }
2323
linkerd-tonic-watch = { path = "../tonic-watch" }
24-
linkerd2-proxy-api = { version = "0.11", features = ["destination"] }
24+
linkerd2-proxy-api = { version = "0.12", features = ["destination"] }
2525
once_cell = "1.17"
26-
prost-types = "0.11"
26+
prost-types = "0.12"
2727
regex = "1"
2828
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
2929
tokio-stream = { version = "0.1", features = ["sync"] }
30-
tonic = { version = "0.8", default-features = false }
30+
tonic = { version = "0.10", default-features = false }
3131
tower = { version = "0.4.13", features = ["retry", "util"] }
3232
thiserror = "1"
3333
tracing = "0.1"
3434

3535
[dev-dependencies]
36-
linkerd2-proxy-api = { version = "0.11", features = ["arbitrary"] }
36+
linkerd2-proxy-api = { version = "0.12", features = ["arbitrary"] }
3737
quickcheck = { version = "1", default-features = false }

‎linkerd/tonic-watch/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Provides a utility for creating robust watches from a service that returns a str
1313
futures = { version = "0.3", default-features = false }
1414
linkerd-error = { path = "../error" }
1515
linkerd-stack = { path = "../stack" }
16-
tonic = { version = "0.8", default-features = false }
16+
tonic = { version = "0.10", default-features = false }
1717
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
1818
tracing = "0.1"
1919

‎linkerd/transport-header/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ linkerd-dns-name = { path = "../dns/name" }
1414
linkerd-error = { path = "../error" }
1515
linkerd-io = { path = "../io" }
1616
linkerd-stack = { path = "../stack" }
17-
prost = "0.11"
17+
prost = "0.12"
1818
tokio = { version = "1", features = ["time"] }
1919
tracing = "0.1"
2020

@@ -23,6 +23,6 @@ arbitrary = { version = "1", features = ["derive"] }
2323
libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
2424

2525
[dev-dependencies]
26-
prost-build = { version = "0.11", default-features = false }
26+
prost-build = { version = "0.12", default-features = false }
2727
tokio = { version = "1", features = ["macros"] }
2828
tokio-test = "0.4"

‎opencensus-proto/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ Vendored from https://github.com/census-instrumentation/opencensus-proto/.
1313

1414
[dependencies]
1515
bytes = "1"
16-
prost = "0.11"
17-
prost-types = "0.11"
16+
prost = "0.12"
17+
prost-types = "0.12"
1818

1919
[dependencies.tonic]
20-
version = "0.8"
20+
version = "0.10"
2121
default-features = false
2222
features = ["prost", "codegen"]
2323

2424
[dev-dependencies.tonic-build]
25-
version = "0.8"
25+
version = "0.10"
2626
default-features = false
2727
features = ["prost"]
2828

‎opencensus-proto/src/gen/opencensus.proto.agent.trace.v1.rs

Lines changed: 36 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)