Skip to content

Commit

Permalink
Merge pull request #28723 from teskje/update-console-subscriber
Browse files Browse the repository at this point in the history 
Update the `console-subscriber` crate (and `hyper`, `axum`, `prost`, ...)
  • Loading branch information
@teskje
teskje authored Aug 5, 2024
2 parents 9f17933 + 9ea1dac commit 2bb6314
Show file tree
Hide file tree
Showing 95 changed files with 1,030 additions and 737 deletions.
476 changes: 260 additions & 216 deletions Cargo.lock
View file

Large diffs are not rendered by default.

16 changes: 4 additions & 12 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,22 +291,10 @@ mysql_async = { git = "https://github.com/MaterializeInc/mysql_async" }
# Waiting on https://github.com/MaterializeInc/serde-value/pull/35.
serde-value = { git = "https://github.com/MaterializeInc/serde-value.git" }

# Waiting on https://github.com/hyperium/tonic/pull/1398.
tonic-build = { git = "https://github.com/MaterializeInc/tonic", rev = "0d86e360ab45779770ca150c8487fe7940c299a9" }

# Waiting on https://github.com/MaterializeInc/tracing/pull/1 to be submitted
# upstream.
tracing-opentelemetry = { git = "https://github.com/MaterializeInc/tracing-opentelemetry.git" }

# Waiting on a patch release to `opentelemetry-otlp` to include
# <https://github.com/open-telemetry/opentelemetry-rust/pull/1335#issuecomment-1907101992>
# Cherry-picked on a known-good rev (the one for version 0.21.2 <https://github.com/open-telemetry/opentelemetry-rust/releases/tag/v0.21.2>
#
# Note that we can't just patch `opentelemetry-otlp`, or it will rely on traits/structs in conflicting versions of the other crates.
opentelemetry = { git = "https://github.com/MaterializeInc/opentelemetry-rust", rev = "9d300167e728983f3d655cf20782fc832d31ceac" }
opentelemetry_sdk = { git = "https://github.com/MaterializeInc/opentelemetry-rust", rev = "9d300167e728983f3d655cf20782fc832d31ceac" }
opentelemetry-otlp = { git = "https://github.com/MaterializeInc/opentelemetry-rust", rev = "9d300167e728983f3d655cf20782fc832d31ceac" }

# Waiting on https://github.com/launchdarkly/rust-server-sdk/pull/20 to make
# it into a release.
# Also bumps lru to 0.12.0
Expand All @@ -329,6 +317,10 @@ openssh = { git = "https://github.com/MaterializeInc/openssh.git" }
reqwest-middleware = { git = "https://github.com/MaterializeInc/reqwest-middleware.git" }
reqwest-retry = { git = "https://github.com/MaterializeInc/reqwest-middleware.git" }

# Waiting on https://github.com/polarsignals/rust-jemalloc-pprof/pull/10 to
# make it into a release.
pprof_util = { git = "https://github.com/MaterializeInc/rust-jemalloc-pprof.git" }

[patch."https://github.com/frankmcsherry/columnation"]
# Projects that do not reliably release to crates.io.
columnation = { git = "https://github.com/MaterializeInc/columnation.git" }
Expand Down
41 changes: 16 additions & 25 deletions deny.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ skip = [
{ name = "linux-raw-sys", version = "0.3.4" },
{ name = "rustix", version = "0.38.21" },

# Waiting on https://github.com/tokio-rs/prost/pull/833 to make it into a
# release. (not yet in v0.11.9)
{ name = "prettyplease", version = "0.1.25" },

# Will require updating many crates
{ name = "indexmap", version = "1.9.1" },
# Required by indexmap 1.9.1, which is depended on by many things
Expand All @@ -74,51 +70,47 @@ skip = [

# TODO: Required for Rust nightly upgrade
{ name = "portable-atomic", version = "0.3.20" },
{ name = "portable-atomic", version = "1.6.0" },

# TODO: Required for Rust nightly upgrade
{ name = "http", version = "0.2.9" },
{ name = "http", version = "1.1.0" },

# TODO: Required for Rust nightly upgrade
{ name = "http-body", version = "0.4.5" },
{ name = "http-body", version = "1.0.0" },

# The most recent version of `skeptic` depends on 0.14.2 and the latest
# version of `guppy` that uses `0.14` is very old.
{ name = "cargo_metadata", version = "0.14.2" },
{ name = "cargo_metadata", version = "0.18.1" },

# There are many external crates that rely on 0.10.5. Upgrading them should
# be its own PR.
{ name = "itertools", version = "0.10.5" },
{ name = "itertools", version = "0.12.1" },

# A few crates -> `num_enum_derive` -> `proc-macro-crate` -> `toml_edit v0.19.14`.
{ name = "toml_edit", version = "0.19.14" },
{ name = "toml_edit", version = "0.20.2" },

# `tonic` has yet to upgrade to `hyper 1.*`, but it is close! Until then
# we'll need to duplicate some related hyper deps.
#
# See: <https://github.com/hyperium/tonic/pull/1740>
# There are some crates in our dependency tree that have yet to upgrade to
# `hyper 1.*`. As of now these are:
# * `aws-config`
# * `aws-smithy-runtime`
# * `eventsource-client`
# * `launchdarkly-server-sdk`
# Until they upgrade we'll need to duplicate some related hyper deps.

{ name = "hyper", version = "0.14.27" },
{ name = "hyper", version = "1.3.1" },

{ name = "hyper-openssl", version = "0.9.2" },
{ name = "hyper-openssl", version = "0.10.2" },
{ name = "h2", version = "0.3.26" },

{ name = "hyper-tls", version = "0.5.0" },

{ name = "hyper-timeout", version = "0.4.1" },
{ name = "hyper-timeout", version = "0.5.1" },

{ name = "tokio-tungstenite", version = "0.20.1" },
{ name = "tokio-tungstenite", version = "0.23.1" },
{ name = "tokio-tungstenite", version = "0.21.0" },

{ name = "tungstenite", version = "0.20.1" },
{ name = "tungstenite", version = "0.23.0" },
{ name = "tungstenite", version = "0.21.0" },

{ name = "tower-http", version = "0.4.3" },
{ name = "tower-http", version = "0.5.2" },
# `axum 0.7.5` depends on both `sync_wrapper 1.*` and `axum-core 0.4.3`.
# The latter depends on `sync_wrapper 0.1.*`.
{ name = "sync_wrapper", version = "0.1.2" },
]

# Use `tracing` instead.
Expand Down Expand Up @@ -200,7 +192,6 @@ wrappers = [
"native-tls",
"prometheus",
"proptest",
"prost-build",
"rayon-core",
"schannel",
"sharded-slab",
Expand Down
145 changes: 145 additions & 0 deletions misc/cargo-vet/audits.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ Certification of this crate means the reviewer has confirmed the crate is:
"""
implies = "safe-to-deploy"

[[audits.aho-corasick]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "1.1.3"

[[audits.alloc-no-stdlib]]
who = "Parker Timmerman <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -131,6 +136,11 @@ who = "Roshan Jobanputra <[email protected]>"
criteria = "safe-to-deploy"
version = "2.0.0"

[[audits.atomic-waker]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "1.1.2"

[[audits.aws-sdk-s3]]
who = "Matt Arthur <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -141,6 +151,21 @@ who = "Roshan Jobanputra <[email protected]>"
criteria = "safe-to-deploy"
version = "1.22.0"

[[audits.axum]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.7.5"

[[audits.axum-core]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.4.3"

[[audits.axum-extra]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.9.3"

[[audits.base64]]
who = "Roshan Jobanputra <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -176,6 +201,11 @@ who = "Parker Timmerman <[email protected]>"
criteria = "safe-to-deploy"
version = "2.5.1"

[[audits.bstr]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "1.10.0"

[[audits.built]]
who = "Parker Timmerman <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -221,6 +251,16 @@ who = "Nikhil Benesch <[email protected]>"
criteria = "safe-to-deploy"
version = "2.5.0"

[[audits.console-api]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.8.0"

[[audits.console-subscriber]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.4.0"

[[audits.convert_case]]
who = "Parker Timmerman <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -318,6 +358,11 @@ who = "Roshan Jobanputra <[email protected]>"
criteria = "safe-to-deploy"
version = "3.0.2"

[[audits.globset]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.4.14"

[[audits.governor]]
who = "Roshan Jobanputra <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -343,6 +388,16 @@ who = "Parker Timmerman <[email protected]>"
criteria = "safe-to-deploy"
version = "0.14.5"

[[audits.headers]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.4.0"

[[audits.headers-core]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.3.0"

[[audits.hibitset]]
who = "Matt Jibson <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -373,6 +428,11 @@ who = "Nikhil Benesch <[email protected]>"
criteria = "safe-to-deploy"
version = "0.1.5"

[[audits.hyper-util]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.1.6"

[[audits.id-arena]]
who = "Matt Jibson <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -498,6 +558,11 @@ who = "Parker Timmerman <[email protected]>"
criteria = "safe-to-deploy"
version = "0.16.0+8.10.0"

[[audits.log]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.4.22"

[[audits.lz4_flex]]
who = "Parker Timmerman <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -593,16 +658,31 @@ who = "Gus Wynn <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.21.0"

[[audits.opentelemetry]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.24.0"

[[audits.opentelemetry-otlp]]
who = "Gus Wynn <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.14.0"

[[audits.opentelemetry-otlp]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.17.0"

[[audits.opentelemetry-proto]]
who = "Gus Wynn <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.4.0"

[[audits.opentelemetry-proto]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.7.0"

[[audits.opentelemetry-semantic-conventions]]
who = "Gus Wynn <[email protected]>"
criteria = "maintained-and-necessary"
Expand All @@ -613,6 +693,11 @@ who = "Gus Wynn <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.21.2"

[[audits.opentelemetry_sdk]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.24.1"

[[audits.ordered-float]]
who = "Roshan Jobanputra <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -723,6 +808,31 @@ who = "Nikhil Benesch <[email protected]>"
criteria = "maintained-and-necessary"
version = "1.0.82"

[[audits.prost]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.13.1"

[[audits.prost-build]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.13.1"

[[audits.prost-derive]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.13.1"

[[audits.prost-reflect]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.14.0"

[[audits.prost-types]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.13.1"

[[audits.protobuf]]
who = "Parker Timmerman <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -920,6 +1030,11 @@ who = "Matt Jibson <[email protected]>"
criteria = "safe-to-deploy"
version = "0.1.2"

[[audits.sync_wrapper]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "1.0.1"

[[audits.system-configuration]]
who = "Matt Jibson <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1015,11 +1130,26 @@ who = "Nikhil Benesch <[email protected]>"
criteria = "safe-to-deploy"
version = "0.20.1"

[[audits.tokio-tungstenite]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.21.0"

[[audits.tokio-tungstenite]]
who = "Nikhil Benesch <[email protected]>"
criteria = "safe-to-deploy"
version = "0.23.1"

[[audits.tonic]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.12.1"

[[audits.tonic-build]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.12.1"

[[audits.tower-http]]
who = "Nikhil Benesch <[email protected]>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1050,6 +1180,11 @@ who = "Gus Wynn <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.22.0@git:7035e641b683985cc3b8630f3b61d53c96f83695"

[[audits.tracing-opentelemetry]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.25.0@git:09f0cc90058f5834209aa3f48ac52fb544f5d2c0"

[[audits.tracing-subscriber]]
who = "Gus Wynn <[email protected]>"
criteria = "maintained-and-necessary"
Expand All @@ -1060,6 +1195,11 @@ who = "Matt Jibson <[email protected]>"
criteria = "safe-to-deploy"
version = "0.1.0"

[[audits.tungstenite]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.21.0"

[[audits.tungstenite]]
who = "Nikhil Benesch <[email protected]>"
criteria = "safe-to-deploy"
Expand All @@ -1085,6 +1225,11 @@ who = "Gus Wynn <[email protected]>"
criteria = "maintained-and-necessary"
version = "0.2.4"

[[audits.web-time]]
who = "Jan Teske <[email protected]>"
criteria = "maintained-and-necessary"
version = "1.1.0"

[[audits.windows-sys]]
who = "Nikhil Benesch <[email protected]>"
criteria = "safe-to-deploy"
Expand Down
Loading

0 comments on commit 2bb6314

Please sign in to comment.