Skip to content

split service&instance metrics, serve metrics for build-server & watcher #2038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 4, 2023
Merged

split service&instance metrics, serve metrics for build-server & watcher #2038

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b989af
split service&instance metrics, serve metrics for build-server & watcher
syphar Feb 10, 2023
a212834
switch to using new axum-extra `option_layer`
syphar Feb 13, 2023
b745e2b
directly use `SocketAddr` in command line arguments & methods
syphar Jun 3, 2023
e22ebdd
use runtime.spawn instead of thread::spawn
syphar Jun 3, 2023
8eda7f7
fix panic in metrics webserver without templates
syphar Jun 3, 2023
b30a394
move metrics encoding into blocking task
syphar Jun 3, 2023
b02cf89
fully split service/instance metric classes & usages
syphar Jun 3, 2023
45d0ff3
fix DEFAULT_BIND
syphar Jun 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/bin/cratesfyi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::env;
use std::fmt::Write;
use std::net::SocketAddr;
use std::path::PathBuf;
use std::str::FromStr;
use std::sync::Arc;
Expand Down Expand Up @@ -107,12 +108,12 @@ enum CommandLine {
/// Starts web server
StartWebServer {
#[arg(name = "SOCKET_ADDR", default_value = "0.0.0.0:3000")]
socket_addr: String,
socket_addr: SocketAddr,
},

StartRegistryWatcher {
#[arg(name = "SOCKET_ADDR", default_value = "0.0.0.0:3000")]
metric_server_socket_addr: String,
metric_server_socket_addr: SocketAddr,
/// Enable or disable the repository stats updater
#[arg(
long = "repository-stats-updater",
Expand All @@ -126,7 +127,7 @@ enum CommandLine {

StartBuildServer {
#[arg(name = "SOCKET_ADDR", default_value = "0.0.0.0:3000")]
metric_server_socket_addr: String,
metric_server_socket_addr: SocketAddr,
},

/// Starts the daemon
Expand Down Expand Up @@ -170,22 +171,22 @@ impl CommandLine {
docs_rs::utils::daemon::start_background_cdn_invalidator(&ctx)?;
}

start_background_metrics_webserver(Some(&metric_server_socket_addr), &ctx)?;
start_background_metrics_webserver(Some(metric_server_socket_addr), &ctx)?;

docs_rs::utils::watch_registry(ctx.build_queue()?, ctx.config()?, ctx.index()?)?;
}
Self::StartBuildServer {
metric_server_socket_addr,
} => {
start_background_metrics_webserver(Some(&metric_server_socket_addr), &ctx)?;
start_background_metrics_webserver(Some(metric_server_socket_addr), &ctx)?;

let build_queue = ctx.build_queue()?;
let rustwide_builder = RustwideBuilder::init(&ctx)?;
queue_builder(rustwide_builder, build_queue)?;
}
Self::StartWebServer { socket_addr } => {
// Blocks indefinitely
start_web_server(Some(&socket_addr), &ctx)?;
start_web_server(Some(socket_addr), &ctx)?;
}
Self::Daemon { registry_watcher } => {
docs_rs::utils::start_daemon(ctx, registry_watcher == Toggle::Enabled)?;
Expand Down
11 changes: 6 additions & 5 deletions src/web/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
use postgres::Client;
use semver::{Version, VersionReq};
use serde::Serialize;
use std::net::{IpAddr, Ipv4Addr};
use std::{
borrow::{Borrow, Cow},
net::SocketAddr,
Expand All @@ -65,7 +66,7 @@ pub(crate) fn encode_url_path(path: &str) -> String {
utf8_percent_encode(path, PATH).to_string()
}

const DEFAULT_BIND: &str = "0.0.0.0:3000";
const DEFAULT_BIND: SocketAddr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8080);

#[derive(Debug)]
struct MatchVersion {
Expand Down Expand Up @@ -311,10 +312,10 @@ pub(crate) fn build_metrics_axum_app(context: &dyn Context) -> Result<AxumRouter
}

pub fn start_background_metrics_webserver(
addr: Option<&str>,
addr: Option<SocketAddr>,
context: &dyn Context,
) -> Result<(), Error> {
let axum_addr: SocketAddr = addr.unwrap_or(DEFAULT_BIND).parse()?;
let axum_addr: SocketAddr = addr.unwrap_or(DEFAULT_BIND);

tracing::info!(
"Starting metrics web server on `{}:{}`",
Expand All @@ -341,13 +342,13 @@ pub fn start_background_metrics_webserver(
}

#[instrument(skip_all)]
pub fn start_web_server(addr: Option<&str>, context: &dyn Context) -> Result<(), Error> {
pub fn start_web_server(addr: Option<SocketAddr>, context: &dyn Context) -> Result<(), Error> {
let template_data = Arc::new(TemplateData::new(
&mut *context.pool()?.get()?,
context.config()?.render_threads,
)?);

let axum_addr: SocketAddr = addr.unwrap_or(DEFAULT_BIND).parse()?;
let axum_addr = addr.unwrap_or(DEFAULT_BIND);

tracing::info!(
"Starting web server on `{}:{}`",
Expand Down