Update crates

Author: tazz4843

Cargo.lock

@@ -48,6 +48,7 @@ csv = "1"
 url = "2"
 num = "0.4"
 hex = "0.4"
+http = "1"
 stfu = "0.1"
 time = "0.3"
 rand = "0.9"
@@ -63,11 +64,11 @@ fluent = "0.16"
 base64 = "0.22"
 dashmap = "6"
 futures = "0.3"
-secrecy = "0.8"
+secrecy = "0.10"
 num_cpus = "1"
 indexmap = "2"
 bitflags = "2"
-deadpool = "0.11"
+deadpool = "0.12"
 once_cell = "1"
 byteorder = "1"
 rmp-serde = "1"
@@ -86,28 +87,28 @@ dasp_signal = "0.11"
 serde_derive = "1"
 futures-util = "0.3"
 intl-memoizer = "0.5"
-deadpool-redis = "0.15"
+deadpool-redis = "0.20"
 futures-channel = "0.3"
 small-fixed-array = "0.4"
 prometheus-static-metric = "0.5"
 
 # additional config deps
-axum = { version = "0.7", features = ["json"] }
-uuid = { version = "1", features = ["rand", "v4"] }
-fern = { version = "0.6", features = ["colored"] }
+axum = { version = "0.8", features = ["json"] }
+uuid = { version = "1", features = ["rng-rand", "v4"] }
+fern = { version = "0.7", features = ["colored"] }
 serde = { version = "1", features = ["derive"] }
-redis = { version = "0.25", features = ["tokio-rustls"] }
+redis = { version = "0.29", features = ["tokio-rustls-comp"] }
 tracing = { version = "0.1", features = ["log"] }
 aes-gcm = { version = "0.10", features = ["std"] }
 typesize = { version = "0.1", features = ["details"] }
-prometheus = { version = "0.13", features = ["process"] }
+prometheus = { version = "0.14", features = ["process"] }
 audiopus_sys = { version = "0.2", features = ["static"] }
-tokio-metrics = { version = "0.3", features = ["rt"] }
-async-tempfile = { version = "0.5", features = ["uuid"] }
+tokio-metrics = { version = "0.4", features = ["rt"] }
+async-tempfile = { version = "0.7", features = ["uuid"] }
 dasp_interpolate = { version = "0.11", features = ["linear"] }
 tokio = { version = "1", features = ["parking_lot", "signal", "rt-multi-thread"] }
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
-sqlx = { version = "0.7", features = ["postgres", "macros", "migrate", "runtime-tokio-rustls", "time"] }
+sqlx = { version = "0.8", features = ["postgres", "macros", "migrate", "runtime-tokio-rustls", "time"] }
 
 # git deps
 scripty-common = { git = "https://github.com/scripty-bot/scripty-common" }
@@ -131,12 +132,3 @@ serenity = { git = "https://github.com/serenity-rs/serenity", branch = "next", f
     "typesize",
     "transport_compression_zstd"
 ] }
-
-
-[patch.crates-io]
-serenity = { git = "https://github.com/serenity-rs/serenity", branch = "next" }
-songbird = { git = "https://github.com/serenity-rs/songbird", branch = "serenity-next" }
-
-[patch.crates-io.serenity-voice-model]
-git = "https://github.com/serenity-rs/serenity"
-branch = "current"

Cargo.toml

@@ -31,7 +31,7 @@ pub async fn init_blocked() -> Result<(), scripty_redis::redis::RedisError> {
 		}
 		blocked_user_pipe
 			.ignore()
-			.query_async::<_, ()>(&mut redis_pool)
+			.query_async::<()>(&mut redis_pool)
 			.await?;
 	}
 
@@ -52,7 +52,7 @@ pub async fn init_blocked() -> Result<(), scripty_redis::redis::RedisError> {
 
 		blocked_guild_pipe
 			.ignore()
-			.query_async::<_, ()>(&mut redis_pool)
+			.query_async::<()>(&mut redis_pool)
 			.await?;
 	}
 

scripty_bot_utils/src/entity_block.rs

@@ -102,6 +102,14 @@ make_static_metric! {
 	}
 
 	pub label_enum RuntimeMetrics {
+		blocking_queue_depth,
+		blocking_threads_count,
+		budget_forced_yield_count,
+		elapsed,
+		global_queue_depth,
+		idle_blocking_threads_count,
+		io_driver_ready_count,
+		live_tasks_count,
 		workers_count,
 		total_park_count,
 		max_park_count,
@@ -131,13 +139,9 @@ make_static_metric! {
 		total_busy_duration,
 		max_busy_duration,
 		min_busy_duration,
-		injection_queue_depth,
 		total_local_queue_depth,
 		max_local_queue_depth,
 		min_local_queue_depth,
-		elapsed,
-		budget_forced_yield_count,
-		io_driver_ready_count,
 	}
 	pub struct RuntimeMetricsVec: IntGauge {
 		"runtime_metrics" => RuntimeMetrics,

scripty_metrics/src/metrics.rs

@@ -20,6 +20,14 @@ pub fn register_metrics(handle: &tokio::runtime::Handle) {
 		for interval in monitor.intervals() {
 			trace!("runtime metrics: {:?}", interval);
 			let RuntimeMetrics {
+				blocking_queue_depth,
+				blocking_threads_count,
+				budget_forced_yield_count,
+				elapsed,
+				global_queue_depth,
+				idle_blocking_threads_count,
+				io_driver_ready_count,
+				live_tasks_count,
 				workers_count,
 				total_park_count,
 				max_park_count,
@@ -49,15 +57,30 @@ pub fn register_metrics(handle: &tokio::runtime::Handle) {
 				total_busy_duration,
 				max_busy_duration,
 				min_busy_duration,
-				injection_queue_depth,
 				total_local_queue_depth,
 				max_local_queue_depth,
 				min_local_queue_depth,
-				elapsed,
-				budget_forced_yield_count,
-				io_driver_ready_count,
 				..
 			} = interval;
+			m.runtime_metrics
+				.blocking_queue_depth
+				.set(blocking_queue_depth as i64);
+			m.runtime_metrics
+				.blocking_threads_count
+				.set(blocking_threads_count as i64);
+			m.runtime_metrics
+				.budget_forced_yield_count
+				.set(budget_forced_yield_count as i64);
+			m.runtime_metrics.elapsed.set(elapsed.as_nanos() as i64);
+			m.runtime_metrics
+				.global_queue_depth
+				.set(global_queue_depth as i64);
+			m.runtime_metrics
+				.idle_blocking_threads_count
+				.set(idle_blocking_threads_count as i64);
+			m.runtime_metrics
+				.live_tasks_count
+				.set(live_tasks_count as i64);
 			m.runtime_metrics.workers_count.set(workers_count as i64);
 			m.runtime_metrics
 				.total_park_count
@@ -135,9 +158,6 @@ pub fn register_metrics(handle: &tokio::runtime::Handle) {
 			m.runtime_metrics
 				.min_busy_duration
 				.set(min_busy_duration.as_nanos() as i64);
-			m.runtime_metrics
-				.injection_queue_depth
-				.set(injection_queue_depth as i64);
 			m.runtime_metrics
 				.total_local_queue_depth
 				.set(total_local_queue_depth as i64);
@@ -147,10 +167,6 @@ pub fn register_metrics(handle: &tokio::runtime::Handle) {
 			m.runtime_metrics
 				.min_local_queue_depth
 				.set(min_local_queue_depth as i64);
-			m.runtime_metrics.elapsed.set(elapsed.as_nanos() as i64);
-			m.runtime_metrics
-				.budget_forced_yield_count
-				.set(budget_forced_yield_count as i64);
 			m.runtime_metrics
 				.io_driver_ready_count
 				.set(io_driver_ready_count as i64);

scripty_metrics/src/rt_metrics.rs

@@ -7,13 +7,13 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
+axum.workspace = true
 time.workspace = true
-tracing.workspace = true
-serde_json.workspace = true
+sqlx.workspace = true
 serde.workspace = true
 tokio.workspace = true
-axum.workspace = true
-sqlx.workspace = true
+tracing.workspace = true
+serde_json.workspace = true
 
 scripty_db = { path = "../scripty_db" }
 scripty_i18n = { path = "../scripty_i18n" }

scripty_webserver/Cargo.toml

@@ -15,7 +15,6 @@ pub struct Authentication {
 	pub user_id: u64,
 }
 
-#[axum::async_trait]
 impl<S> FromRequestParts<S> for Authentication
 where
 	S: Send + Sync,

scripty_webserver/src/auth.rs

@@ -1,6 +1,5 @@
 use axum::{
 	Json,
-	async_trait,
 	extract::FromRequestParts,
 	http::{StatusCode, request::Parts},
 };
@@ -10,8 +9,10 @@ use scripty_botlists::discordservices_net::{Bot, DiscordServicesNetIncomingWebho
 use crate::errors::WebServerError;
 
 pub struct DiscordServicesNetAuthorization;
-#[async_trait]
-impl<S> FromRequestParts<S> for DiscordServicesNetAuthorization {
+impl<S> FromRequestParts<S> for DiscordServicesNetAuthorization
+where
+	S: Send + Sync,
+{
 	type Rejection = (StatusCode, &'static str);
 
 	async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {

scripty_webserver/src/endpoints/webhooks/discordservices_net.rs

@@ -1,6 +1,5 @@
 use axum::{
 	Json,
-	async_trait,
 	extract::FromRequestParts,
 	http::{StatusCode, request::Parts},
 };
@@ -10,8 +9,10 @@ use scripty_botlists::top_gg::IncomingWebhook;
 use crate::errors::WebServerError;
 
 pub struct TopGgAuthorization;
-#[async_trait]
-impl<S> FromRequestParts<S> for TopGgAuthorization {
+impl<S> FromRequestParts<S> for TopGgAuthorization
+where
+	S: Send + Sync,
+{
 	type Rejection = (StatusCode, &'static str);
 
 	async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {

scripty_webserver/src/endpoints/webhooks/top_gg.rs

@@ -1,6 +1,5 @@
 use axum::{
 	Json,
-	async_trait,
 	extract::FromRequestParts,
 	http::{StatusCode, request::Parts},
 };
@@ -10,8 +9,10 @@ use scripty_botlists::wumpus_store::IncomingWebhook;
 use crate::errors::WebServerError;
 
 pub struct WumpusStoreAuthorization;
-#[async_trait]
-impl<S> FromRequestParts<S> for WumpusStoreAuthorization {
+impl<S> FromRequestParts<S> for WumpusStoreAuthorization
+where
+	S: Send + Sync,
+{
 	type Rejection = (StatusCode, &'static str);
 
 	async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {