Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tower: update dependency to 0.4.7 #990

Merged
merged 2 commits into from
Apr 28, 2021
Merged

tower: update dependency to 0.4.7 #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf74a18
tower: update dependency to 0.4.7
hawkw Apr 27, 2021
c7d77d4
update fuzz lockfiles
hawkw Apr 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2263,9 +2263,9 @@ dependencies = [

[[package]]
name = "tower"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f715efe02c0862926eb463e49368d38ddb119383475686178e32e26d15d06a66"
checksum = "bf0aa6dfc29148c3826708dabbfa83c121eeb84df4d1468220825e3a33651687"
dependencies = [
"futures-core",
"futures-util",
Expand Down
2 changes: 1 addition & 1 deletion hyper-balance/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ futures = "0.3.9"
http = "0.2"
hyper = "0.14.2"
pin-project = "1"
tower = { version = "0.4.5", default-features = false, features = ["load"] }
tower = { version = "0.4.7", default-features = false, features = ["load"] }
tokio = { version = "1", features = ["macros"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ thiserror = "1.0"
tokio = { version = "1", features = ["rt"] }
tokio-stream = { version = "0.1.5", features = ["time", "sync"] }
tonic = { version = "0.4", default-features = false, features = ["prost"] }
tower = "0.4"
tower = "0.4.7"
tracing = "0.1.23"
4 changes: 1 addition & 3 deletions linkerd/app/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@ tracing = "0.1.23"
pin-project = "1"

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
version = "0.4.7"
default-features = false
features = [
"buffer",
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/gateway/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ linkerd-app-inbound = { path = "../inbound" }
linkerd-app-outbound = { path = "../outbound" }
thiserror = "1.0"
tokio = { version = "1", features = ["sync"] }
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
tracing = "0.1.23"

[dev-dependencies]
tokio = { version = "1", features = ["rt", "macros"] }
tokio-test = "0.4"
tower = { version = "0.4.5", default-features = false, features = ["util"] }
tower = { version = "0.4.7", default-features = false, features = ["util"] }
tower-test = "0.4"
linkerd-app-test = { path = "../test" }
10 changes: 1 addition & 9 deletions linkerd/app/inbound/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ indexmap = "1.0"
linkerd-app-core = { path = "../core" }
thiserror = "1.0"
tokio = { version = "1", features = ["sync"] }
tower = { version = "0.4.7", features = ["util"] }
tracing = "0.1.23"

[target.'cfg(fuzzing)'.dependencies]
Expand All @@ -25,15 +26,6 @@ linkerd-app-test = { path = "../test" }
arbitrary = { version = "1", features = ["derive"] }
libfuzzer-sys = { version = "0.4.0", features = ["arbitrary-derive"] }

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
default-features = false
features = [
"util",
]

[dev-dependencies]
hyper = { version = "0.14.2", features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" }
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/inbound/fuzz/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2069,9 +2069,9 @@ dependencies = [

[[package]]
name = "tower"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f715efe02c0862926eb463e49368d38ddb119383475686178e32e26d15d06a66"
checksum = "bf0aa6dfc29148c3826708dabbfa83c121eeb84df4d1468220825e3a33651687"
dependencies = [
"futures-core",
"futures-util",
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/integration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ rustls = "0.19"
tokio = { version = "1", features = ["io-util", "net", "rt", "macros"]}
tokio-stream = { version = "0.1.5", features = ["sync"] }
tokio-rustls = "0.22"
tower = { version = "0.4.5", default-features = false}
tower = { version = "0.4.7", default-features = false}
tonic = { version = "0.4", default-features = false }
tracing = "0.1.23"
webpki = "0.21"
Expand Down
10 changes: 1 addition & 9 deletions linkerd/app/outbound/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,10 @@ linkerd-identity = { path = "../../identity" }
linkerd-retry = { path = "../../retry" }
thiserror = "1.0"
tokio = { version = "1", features = ["sync"]}
tower = { version = "0.4.7", features = ["util"]}
tracing = "0.1.23"
pin-project = "1"

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
default-features = false
features = [
"util",
]

[dev-dependencies]
hyper = { version = "0.14.2", features = ["http1", "http2"] }
ipnet = "2.0"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ regex = "1"
tokio = { version = "1", features = ["io-util", "net", "rt", "sync"]}
tokio-test = "0.4"
tokio-stream = { version = "0.1.5", features = ["sync"] }
tower = { version = "0.4.5", default-features = false}
tower = { version = "0.4.7", default-features = false}
tracing = "0.1.23"
tracing-subscriber = "0.2.16"
thiserror = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/cache/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
parking_lot = "0.11"
tokio = { version = "1", default-features = false, features = ["rt", "sync", "time"] }
tower = { version = "0.4.5", default-features = false, features = ["util"] }
tower = { version = "0.4.7", default-features = false, features = ["util"] }
tracing = "0.1.23"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion linkerd/concurrency-limit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ futures = "0.3.9"
linkerd-stack = { path = "../stack" }
tokio = { version = "1", features = ["sync"] }
tokio-util = "0.6.5"
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
tracing = "0.1.23"
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/detect/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ linkerd-io = { path = "../io" }
linkerd-stack = { path = "../stack" }
tokio = { version = "1", features = ["time"] }
thiserror = "1.0"
tower = "0.4"
tower = "0.4.7"
tracing = "0.1.23"
2 changes: 1 addition & 1 deletion linkerd/drain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ futures = "0.3.9"
tokio = { version = "1", features = ["macros", "sync"] }

linkerd-stack = { path = "../stack", optional = true }
tower = { version = "0.4.5", default-features = false, optional = true }
tower = { version = "0.4.7", default-features = false, optional = true }

[dev-dependencies]
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/error-metrics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ publish = false
futures = "0.3.9"
indexmap = "1.0"
linkerd-metrics = { path = "../metrics" }
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/error-respond/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ publish = false
[dependencies]
futures = "0.3.9"
linkerd-error = { path = "../error" }
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/http-classify/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ publish = false
http = "0.2"
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
7 changes: 1 addition & 6 deletions linkerd/http-metrics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ linkerd-error = { path = "../error" }
linkerd-http-classify = { path = "../http-classify" }
linkerd-metrics = { path = "../metrics" }
linkerd-stack = { path = "../stack" }
tower = "0.4.7"
tracing = "0.1.23"
pin-project = "1"

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
default-features = false
2 changes: 1 addition & 1 deletion linkerd/opencensus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ linkerd-error = { path = "../error" }
linkerd-metrics = { path = "../metrics" }
opencensus-proto = { path = "../../opencensus-proto" }
tonic = { version = "0.4", default-features = false, features = ["prost", "codegen"] }
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
tokio = { version = "1", features = ["macros", "sync", "time"] }
tokio-stream = { version = "0.1.5", features = ["sync"] }
tracing = "0.1.23"
2 changes: 1 addition & 1 deletion linkerd/proxy/api-resolve/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ indexmap = "1.0"
pin-project = "1"
prost = "0.7"
tonic = { version = "0.4", default-features = false }
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
tracing = "0.1.23"
2 changes: 1 addition & 1 deletion linkerd/proxy/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ Core interfaces needed to implement proxy components
[dependencies]
futures = "0.3.9"
linkerd-error = { path = "../../error" }
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
pin-project = "1"
10 changes: 2 additions & 8 deletions linkerd/proxy/discover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,11 @@ linkerd-proxy-core = { path = "../core" }
linkerd-stack = { path = "../../stack" }
tokio = { version = "1", features = ["sync", "time"] }
tokio-util = "0.6.5"
tower = { version = "0.4.7", features = ["discover"] }
tracing = "0.1.23"
pin-project = "1"

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
default-features = false
features = ["discover"]

[dev-dependencies]
async-stream = "0.3"
tokio = { version = "1", features = ["macros", "rt"] }
tower = { version = "0.4.5", default-features = false, features = ["discover", "util"]}
tower = { version = "0.4.7", default-features = false, features = ["discover", "util"]}
9 changes: 2 additions & 7 deletions linkerd/proxy/dns-resolve/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,5 @@ linkerd-proxy-core = { path = "../core" }
linkerd-stack = { path = "../../stack" }
tokio = { version = "1", features = ["sync"] }
tokio-stream = { version = "0.1.5", features = ["sync"]}
tracing = "0.1.9"

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
default-features = false
tower = "0.4.7"
tracing = "0.1.9"
2 changes: 1 addition & 1 deletion linkerd/proxy/http/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ linkerd-timeout = { path = "../../timeout" }
rand = "0.8"
thiserror = "1.0"
tokio = { version = "1", features = ["time", "rt"] }
tower = { version = "0.4.5", default-features = false, features = ["balance", "load", "discover"] }
tower = { version = "0.4.7", default-features = false, features = ["balance", "load", "discover"] }
tracing = "0.1.23"
try-lock = "0.2"
pin-project = "1"
Expand Down
4 changes: 2 additions & 2 deletions linkerd/proxy/http/fuzz/Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,9 +1013,9 @@ dependencies = [

[[package]]
name = "tower"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f715efe02c0862926eb463e49368d38ddb119383475686178e32e26d15d06a66"
checksum = "bf0aa6dfc29148c3826708dabbfa83c121eeb84df4d1468220825e3a33651687"
dependencies = [
"futures-core",
"futures-util",
Expand Down
9 changes: 2 additions & 7 deletions linkerd/proxy/resolve/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ futures = "0.3.9"
linkerd-error = { path = "../../error" }
linkerd-proxy-core = { path = "../core" }
thiserror = "1.0"
tower = "0.4.7"
tracing = "0.1"
pin-project = "1"

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
default-features = false
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/proxy/tap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ linkerd-tls = { path = "../../tls" }
rand = { version = "0.8" }
thiserror = "1.0"
tokio = { version = "1", features = ["time"]}
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
tonic = { version = "0.4", default-features = false }
tracing = "0.1.23"
pin-project = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/tcp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ linkerd-error = { path = "../../error" }
linkerd-stack = { path = "../../stack" }
rand = "0.8"
tokio = { version = "1" }
tower = { version = "0.4.5", default-features = false, features = ["balance", "load", "discover"] }
tower = { version = "0.4.7", default-features = false, features = ["balance", "load", "discover"] }
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/reconnect/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ publish = false
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
futures = "0.3.9"
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
tracing = "0.1.23"
pin-project = "1"
2 changes: 1 addition & 1 deletion linkerd/retry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ publish = false
[dependencies]
linkerd-error = { path = "../error" }
linkerd-stack = { path = "../stack" }
tower = { version = "0.4.5", default-features = false, features = ["retry", "util"] }
tower = { version = "0.4.7", default-features = false, features = ["retry", "util"] }
tracing = "0.1.23"
pin-project = "1"
12 changes: 1 addition & 11 deletions linkerd/service-profiles/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,10 @@ regex = "1.0.0"
tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
async-stream = "0.3"
tonic = { version = "0.4", default-features = false }
tower = { version = "0.4.7", features = [ "ready-cache", "retry", "util"] }
tracing = "0.1.23"
pin-project = "1"

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
default-features = false
features = [
"ready-cache",
"retry",
"util",
]

[dev-dependencies]
linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", tag = "v0.1.18", features = ["arbitrary"] }
prost-types = "0.7.0"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/stack/metrics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ publish = false
[dependencies]
indexmap = "1.0"
linkerd-metrics = { path = "../../metrics" }
tower = { version = "0.4.5", default-features = false }
tower = { version = "0.4.7", default-features = false }
tokio = { version = "1", features = ["time"] }
7 changes: 1 addition & 6 deletions linkerd/stack/tracing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ publish = false
futures = "0.3.9"
linkerd-error = { path = "../../error" }
linkerd-stack = { path = ".." }
tower = "0.4.7"
tracing = "0.1.25"
pin-project = "1"

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
default-features = false
11 changes: 1 addition & 10 deletions linkerd/timeout/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,7 @@ thiserror = "1"
tracing = "0.1.23"
pin-project = "1"
tokio = { version = "1", features = ["time"] }

[dependencies.tower]
version = "0.4"
# disable tower's tracing `log` integration for performance reasons, since we
# will consume tower's traces as traces.
default-features = false
features = [
"util",
"make",
]
tower = { version = "0.4.7", features = ["util", "make"] }

[dev-dependencies]
tower-test = "0.4"
Expand Down
4 changes: 2 additions & 2 deletions linkerd/tls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ rustls = "0.19"
thiserror = "1.0"
tokio = { version = "1", features = ["macros", "time"]}
tokio-rustls = "0.22"
tower = "0.4.5"
tower = "0.4.7"
tracing = "0.1.23"
webpki = "0.21"
untrusted = "0.7"
Expand All @@ -29,5 +29,5 @@ untrusted = "0.7"
linkerd-identity = { path = "../identity", features = ["test-util"] }
linkerd-proxy-transport = { path = "../proxy/transport" }
tokio = { version = "1", features = ["rt-multi-thread"] }
tower = { version = "0.4.5", default-features = false, features = ["util"] }
tower = { version = "0.4.7", default-features = false, features = ["util"] }
tracing-subscriber = "0.2.16"
Loading