From b02cca8608c3594a5afa2ac6e708362ae3fc65b5 Mon Sep 17 00:00:00 2001 From: shiroyashik Date: Wed, 26 Feb 2025 23:21:15 +0300 Subject: [PATCH] metric names renamed and small fixes --- src/api/figura/websocket/handler.rs | 3 +-- src/consts.rs | 2 +- src/main.rs | 20 +++++++++----------- src/metrics.rs | 14 +++++++------- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/api/figura/websocket/handler.rs b/src/api/figura/websocket/handler.rs index d7c5a4e..80424aa 100644 --- a/src/api/figura/websocket/handler.rs +++ b/src/api/figura/websocket/handler.rs @@ -15,7 +15,6 @@ pub async fn initial( ws.on_upgrade(|socket| handle_socket(socket, state)) } -#[instrument(skip_all)] async fn handle_socket(mut ws: WebSocket, state: AppState) { // Trying authenticate & get user data or dropping connection match authenticate(&mut ws, &state).await { @@ -65,7 +64,7 @@ async fn handle_socket(mut ws: WebSocket, state: AppState) { if let Err(kind) = ws.send(Message::Close(None)).await { tracing::trace!("[WebSocket] Closing fault: {}", kind) } } -#[instrument(skip_all, parent = None, fields(nickname = %session.user.nickname))] +#[instrument(skip_all, fields(nickname = %session.user.nickname))] async fn main_worker(session: &mut WSSession, ws: &mut WebSocket, state: &AppState) -> anyhow::Result<()> { tracing::debug!("WebSocket control for {} is transferred to the main worker", session.user.nickname); loop { diff --git a/src/consts.rs b/src/consts.rs index 01d5481..04ec1a1 100644 --- a/src/consts.rs +++ b/src/consts.rs @@ -15,7 +15,7 @@ pub const TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10); // Figura update checker pub const FIGURA_RELEASES_URL: &str = "https://api.github.com/repos/figuramc/figura/releases"; -pub const FIGURA_DEFAULT_VERSION: &str = "0.1.4"; +pub const FIGURA_DEFAULT_VERSION: &str = "0.1.5"; // Figura Assets pub const FIGURA_ASSETS_ZIP_URL: &str = "https://github.com/FiguraMC/Assets/archive/refs/heads/main.zip"; diff --git a/src/main.rs b/src/main.rs index e120835..e254790 100644 --- a/src/main.rs +++ b/src/main.rs @@ -105,6 +105,13 @@ async fn main() -> Result<()> { }, } + // Creating avatars folder + let path = PathBuf::from(&*AVATARS_VAR); + if !path.exists() { + fs::create_dir_all(path).await.expect("Can't create avatars folder!"); + tracing::info!("Created avatars directory"); + } + // 4. Starting an app() that starts to serve. If app() returns true, the sculptor will be restarted. TODO: for future loop { if !app().await? { @@ -116,15 +123,6 @@ async fn main() -> Result<()> { } async fn app() -> Result { - // Preparing for launch - { - let path = PathBuf::from(&*AVATARS_VAR); - if !path.exists() { - fs::create_dir_all(path).await.expect("Can't create avatars folder!"); - tracing::info!("Created avatars directory"); - } - } - // Config let config = Config::parse(CONFIG_VAR.clone().into()); let listen = config.listen.clone(); @@ -198,6 +196,8 @@ async fn app() -> Result { .nest("/api", api) .route("/api/", get(check_auth)) .route("/ws", get(ws)) + .merge(metrics::metrics_router(config.metrics_enabled)) + .with_state(state) .layer(TraceLayer::new_for_http() // .on_request(|request: &axum::http::Request<_>, _span: &tracing::Span| { // // only for developing purposes @@ -209,8 +209,6 @@ async fn app() -> Result { .on_request(()) ) .layer(axum::middleware::from_fn(track_metrics)) - .merge(metrics::metrics_router(config.metrics_enabled)) - .with_state(state) .route("/health", get(|| async { "ok" })); let listener = tokio::net::TcpListener::bind(listen).await?; diff --git a/src/metrics.rs b/src/metrics.rs index 5e8f493..2d45a9a 100644 --- a/src/metrics.rs +++ b/src/metrics.rs @@ -22,7 +22,7 @@ async fn metrics(State(state): State) -> String { let mut metric = prometheus::proto::Metric::default(); metric.set_gauge(prometheus::proto::Gauge::default()); metric.mut_gauge().set_value(state.session.len() as f64); - create_mf("players_count".to_string(), "Number of players".to_string(), MetricType::GAUGE, metric) + create_mf("sculptor_players_count".to_string(), "Number of players".to_string(), MetricType::GAUGE, metric) }; metric_families.push(players); @@ -58,14 +58,14 @@ pub async fn track_metrics(req: Request, next: Next) -> Result = LazyLock::new(|| { - register_int_counter!("pings_error", "Number of ping decoding errors").unwrap() -}); - pub static REQUESTS: LazyLock = LazyLock::new(|| { - register_histogram_vec!("requests_count", "Number of requests", &["uri", "code"], vec![0.025, 0.250, 0.500]).unwrap() + register_histogram_vec!("sculptor_requests_count", "Number of requests", &["uri", "code"], vec![0.025, 0.250, 0.500]).unwrap() }); pub static PINGS: LazyLock = LazyLock::new(|| { - register_histogram_vec!("pings_count", "Number of pings", &["type"], vec![0.000003, 0.00002, 0.0002]).unwrap() + register_histogram_vec!("sculptor_pings_count", "Number of pings", &["type"], vec![0.000003, 0.00002, 0.0002]).unwrap() +}); + +pub static PINGS_ERROR: LazyLock = LazyLock::new(|| { + register_int_counter!("sculptor_pings_error", "Number of ping decoding errors").unwrap() }); \ No newline at end of file