update dependencies further

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0.72"
-axum = { version = "0.6.19", features = ["tracing", "ws"] }
+axum = { version = "0.7", features = ["tracing", "ws"] }
 axum-macros = "0.3.8"
 console-subscriber = "0.1.10"
 futures-util = "0.3.28"
@@ -16,6 +16,6 @@ serde_json = "1.0.104"
 serde_repr = "0.1.16"
 sqlx = { version = "0.7.1", features = ["sqlite", "runtime-tokio-rustls"] }
 tokio = { version = "1.29.1", features = ["full", "tracing"] }
-tower-http = { version = "0.4.3", features = ["trace"] }
+tower-http = { version = "0.5.2", features = ["trace"] }
 tracing = "0.1.37"
 tracing-subscriber = "0.3.17"

src/main.rs

@@ -63,12 +63,10 @@ async fn run() -> anyhow::Result<()> {
         .layer(TraceLayer::new_for_http())
         .with_state(state);
 
-    let listener = std::net::TcpListener::bind("0.0.0.0:3000")?;
+    let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await?;
     tracing::info!("Listening on {}...", listener.local_addr()?);
 
-    axum::Server::from_tcp(listener)?
-        .serve(app.into_make_service_with_connect_info::<SocketAddr>())
-        .await?;
+    axum::serve(listener, app.into_make_service_with_connect_info::<SocketAddr>()).await?;
     Ok(())
 }
 

src/websockets.rs

@@ -6,6 +6,7 @@ use axum::{
     response::IntoResponse,
 };
 use futures_util::StreamExt;
+use tracing::instrument;
 use std::{net::SocketAddr, sync::Arc};
 use tokio::select;
 
@@ -22,6 +23,7 @@ pub async fn ws_handler(
     ws.on_upgrade(move |socket| handle_socket(socket, addr, state))
 }
 
+#[instrument(name = "websocket_connection")]
 async fn handle_socket(mut socket: WebSocket, who: SocketAddr, state: Arc<AppState>) {
     let mut recv = state.tx.subscribe();