diff --git a/Cargo.lock b/Cargo.lock index 483b56d999..8ae0c2f74e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2231,7 +2231,6 @@ dependencies = [ "clock", "collab_ui", "collections", - "console-subscriber", "ctor", "dashmap", "editor", @@ -2431,43 +2430,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "console-api" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" -dependencies = [ - "futures-core", - "prost 0.12.3", - "prost-types 0.12.3", - "tonic", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures-task", - "hdrhistogram", - "humantime", - "prost-types 0.12.3", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "const-cstr" version = "0.3.0" @@ -4545,19 +4507,6 @@ dependencies = [ "hashbrown 0.14.0", ] -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "base64 0.21.4", - "byteorder", - "flate2", - "nom", - "num-traits", -] - [[package]] name = "headers" version = "0.3.9" @@ -4784,18 +4733,6 @@ dependencies = [ "tokio-rustls", ] -[[package]] -name = "hyper-timeout" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" -dependencies = [ - "hyper", - "pin-project-lite", - "tokio", - "tokio-io-timeout", -] - [[package]] name = "hyper-tls" version = "0.5.0" @@ -7435,16 +7372,6 @@ dependencies = [ "prost-derive 0.9.0", ] -[[package]] -name = "prost" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" -dependencies = [ - "bytes 1.5.0", - "prost-derive 0.12.3", -] - [[package]] name = "prost-build" version = "0.9.0" @@ -7491,19 +7418,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "prost-derive" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" -dependencies = [ - "anyhow", - "itertools 0.11.0", - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "prost-types" version = "0.8.0" @@ -7524,15 +7438,6 @@ dependencies = [ "prost 0.9.0", ] -[[package]] -name = "prost-types" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" -dependencies = [ - "prost 0.12.3", -] - [[package]] name = "protobuf" version = "2.28.0" @@ -10178,7 +10083,6 @@ dependencies = [ "signal-hook-registry", "socket2 0.5.4", "tokio-macros", - "tracing", "windows-sys 0.48.0", ] @@ -10193,16 +10097,6 @@ dependencies = [ "log", ] -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-macros" version = "2.1.0" @@ -10337,33 +10231,6 @@ dependencies = [ "winnow 0.6.1", ] -[[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.4", - "bytes 1.5.0", - "h2", - "http 0.2.9", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.12.3", - "tokio", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower" version = "0.4.13" @@ -10372,13 +10239,9 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", - "slab", "tokio", - "tokio-util", "tower-layer", "tower-service", "tracing", diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index c32bb53237..0e4df30987 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -17,7 +17,6 @@ name = "collab" name = "seed" [dependencies] -console-subscriber = "0.2" anyhow.workspace = true async-tungstenite = "0.16" aws-config = { version = "1.1.5" } diff --git a/crates/collab/k8s/collab.template.yml b/crates/collab/k8s/collab.template.yml index 528479105b..c6862a984d 100644 --- a/crates/collab/k8s/collab.template.yml +++ b/crates/collab/k8s/collab.template.yml @@ -70,8 +70,6 @@ spec: ports: - containerPort: 8080 protocol: TCP - - containerPort: 6669 - protocol: TCP livenessProbe: httpGet: path: /healthz diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs index 7f4cb8e0cb..e4b134b06b 100644 --- a/crates/collab/src/main.rs +++ b/crates/collab/src/main.rs @@ -184,7 +184,6 @@ pub fn init_tracing(config: &Config) -> Option<()> { let filter = EnvFilter::from_str(config.rust_log.as_deref()?).log_err()?; tracing_subscriber::registry() - .with(console_subscriber::spawn()) .with(if config.log_json.unwrap_or(false) { Box::new( tracing_subscriber::fmt::layer()