From bb9f8e8807d24006a4b493fd796bc1bd79364181 Mon Sep 17 00:00:00 2001 From: asonix Date: Fri, 21 Jun 2024 15:06:10 -0500 Subject: [PATCH] Update console-subscriber, be more specific about latest point versions --- Cargo.lock | 44 +++++++------------------------ Cargo.toml | 76 +++++++++++++++++++++++++++--------------------------- deny.toml | 1 - 3 files changed, 47 insertions(+), 74 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1744b50..b38446c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -701,22 +701,22 @@ dependencies = [ [[package]] name = "console-api" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" +checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd" dependencies = [ "futures-core", "prost", "prost-types", - "tonic 0.10.2", + "tonic", "tracing-core", ] [[package]] name = "console-subscriber" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" +checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758" dependencies = [ "console-api", "crossbeam-channel", @@ -724,13 +724,14 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", + "prost", "prost-types", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic 0.10.2", + "tonic", "tracing", "tracing-core", "tracing-subscriber", @@ -1834,7 +1835,7 @@ dependencies = [ "prost", "thiserror", "tokio", - "tonic 0.11.0", + "tonic", ] [[package]] @@ -1846,7 +1847,7 @@ dependencies = [ "opentelemetry", "opentelemetry_sdk", "prost", - "tonic 0.11.0", + "tonic", ] [[package]] @@ -3172,33 +3173,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tonic" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.7", - "bytes", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.29", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.11.0" diff --git a/Cargo.toml b/Cargo.toml index 9b0a7ee..e325ed5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,67 +20,67 @@ random-errors = ["dep:nanorand"] [dependencies] actix-form-data = "0.7.0-beta.7" -actix-web = { version = "4.6.0", default-features = false, features = ["rustls-0_23"] } -async-trait = "0.1.51" +actix-web = { version = "4.8.0", default-features = false, features = ["rustls-0_23"] } +async-trait = "0.1.80" barrel = { version = "0.7.0", features = ["pg"] } -base64 = "0.22.0" -bb8 = "0.8.3" +base64 = "0.22.1" +bb8 = "0.8.5" blurhash-update = "0.1.0" -clap = { version = "4.0.2", features = ["derive"] } -color-eyre = "0.6" +clap = { version = "4.5.7", features = ["derive"] } +color-eyre = "0.6.3" config = { version = "0.14.0", default-features = false, features = ["json", "ron", "toml", "yaml"] } -console-subscriber = "0.2" -dashmap = "5.1.0" -diesel = { version = "2.1.1", features = ["postgres_backend", "serde_json", "time", "uuid"] } +console-subscriber = "0.3" +dashmap = "5.5.3" +diesel = { version = "2.1.6", features = ["postgres_backend", "serde_json", "time", "uuid"] } diesel-async = { version = "0.4.1", features = ["bb8", "postgres"] } diesel-derive-enum = { version = "2.1.0", features = ["postgres"] } -futures-core = "0.3" +futures-core = "0.3.30" hex = "0.4.3" -md-5 = "0.10.5" +md-5 = "0.10.6" metrics = "0.23.0" metrics-exporter-prometheus = { version = "0.15.0", default-features = false, features = ["http-listener"] } -mime = "0.3.1" -nanorand = { version = "0.7", optional = true } -opentelemetry_sdk = { version = "0.23", features = ["rt-tokio"] } -opentelemetry = "0.23" -opentelemetry-otlp = "0.16" -pin-project-lite = "0.2.7" -refinery = { version = "0.8.10", features = ["tokio-postgres", "postgres"] } +mime = "0.3.17" +nanorand = { version = "0.7.0", optional = true } +opentelemetry_sdk = { version = "0.23.0", features = ["rt-tokio"] } +opentelemetry = "0.23.0" +opentelemetry-otlp = "0.16.0" +pin-project-lite = "0.2.14" +refinery = { version = "0.8.14", features = ["tokio-postgres", "postgres"] } reqwest = { version = "0.12.5", default-features = false, features = ["json", "rustls-tls-no-provider", "stream"] } -reqwest-middleware = "0.3.0" +reqwest-middleware = "0.3.1" reqwest-tracing = "0.5.0" # pinned to tokio-postgres-generic-rustls # pinned to actix-web -rustls = "0.23" +rustls = "0.23.10" # pinned to rustls rustls-channel-resolver = "0.3.0" # pinned to rustls -rustls-pemfile = "2.0.0" +rustls-pemfile = "2.1.2" rusty-s3 = "0.5.0" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" +serde = { version = "1.0.203", features = ["derive"] } +serde_json = "1.0.117" serde-tuple-vec-map = "1.0.1" serde_urlencoded = "0.7.1" -sha2 = "0.10.0" +sha2 = "0.10.8" sled = { version = "0.34.7" } streem = "0.2.0" -subtle = { version = "2.5.0", default-features = false } -thiserror = "1.0" -time = { version = "0.3.0", features = ["serde", "serde-well-known"] } -tokio = { version = "1", features = ["full", "tracing"] } +subtle = { version = "2.6.0", default-features = false } +thiserror = "1.0.61" +time = { version = "0.3.36", features = ["serde", "serde-well-known"] } +tokio = { version = "1.38.0", features = ["full", "tracing"] } tokio-postgres = { version = "0.7.10", features = ["with-uuid-1", "with-time-0_3", "with-serde_json-1"] } tokio-postgres-generic-rustls = { version = "0.1.0", default-features = false, features = ["aws-lc-rs"] } -tokio-uring = { version = "0.5", optional = true, features = ["bytes"] } -tokio-util = { version = "0.7", default-features = false, features = [ +tokio-uring = { version = "0.5.0", optional = true, features = ["bytes"] } +tokio-util = { version = "0.7.11", default-features = false, features = [ "codec", "io", ] } -toml = "0.8.0" -tracing = "0.1.15" +toml = "0.8.14" +tracing = "0.1.40" tracing-error = "0.2.0" tracing-log = "0.2.0" -tracing-opentelemetry = "0.24" -tracing-subscriber = { version = "0.3.0", features = [ +tracing-opentelemetry = "0.24.0" +tracing-subscriber = { version = "0.3.18", features = [ "ansi", "env-filter", "fmt", @@ -88,12 +88,12 @@ tracing-subscriber = { version = "0.3.0", features = [ "registry", "tracing-log", ] } -url = { version = "2.2", features = ["serde"] } -uuid = { version = "1", features = ["serde", "std", "v4", "v7"] } +url = { version = "2.5.2", features = ["serde"] } +uuid = { version = "1.8.0", features = ["serde", "std", "v4", "v7"] } # pinned to rustls -webpki-roots = "0.26.0" +webpki-roots = "0.26.3" [dependencies.tracing-actix-web] -version = "0.7.10" +version = "0.7.11" default-features = false features = ["opentelemetry_0_23"] diff --git a/deny.toml b/deny.toml index cfeeb38..b4d7670 100644 --- a/deny.toml +++ b/deny.toml @@ -224,7 +224,6 @@ skip = [ "regex-syntax", "siphasher", "sync_wrapper", - "tonic", "untrusted", # Ignore duplicates for systems we don't target