Skip to content

Prometheus Metrics Support #280

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 2 commits into from
Feb 11, 2023
Merged

Prometheus Metrics Support #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7e1524
Initial Prometheus Metrics #3
syepes Feb 10, 2023
c73eb48
Move to actix-web-prometheus, it nativly supports process in linux
syepes Feb 11, 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
137 changes: 125 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ actix-web-httpauth = "0.8"
actix-web = { version = "4.3", features = ["rustls"] }
actix-cors = "0.6"
actix-files = "0.6"
actix-web-prometheus = { version = "0.1", features = ["process"] }
prometheus = { version = "0.13", features = ["process"] }
anyhow = { version = "1.0", features = ["backtrace"] }
arrow-schema = { version = "31.0", features = ["serde"] }
async-trait = "0.1"
Expand Down
15 changes: 11 additions & 4 deletions server/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use actix_web::dev::ServiceRequest;
use actix_web::{middleware, web, App, HttpServer};
use actix_web_httpauth::extractors::basic::BasicAuth;
use actix_web_httpauth::middleware::HttpAuthentication;
use actix_web_prometheus::{PrometheusMetrics, PrometheusMetricsBuilder};
use actix_web_static_files::ResourceFiles;
use clokwerk::{AsyncScheduler, Scheduler, TimeUnits};
use log::warn;
Expand Down Expand Up @@ -68,6 +69,11 @@ async fn main() -> anyhow::Result<()> {
CONFIG.validate_storage(&*storage).await;
let metadata = storage::resolve_parseable_metadata().await?;
banner::print(&CONFIG, metadata);
let prometheus = PrometheusMetricsBuilder::new(env!("CARGO_PKG_NAME"))
.registry(prometheus::default_registry().clone())
.endpoint("/metrics")
.build()
.unwrap();

migration::run_migration(&CONFIG).await?;

Expand All @@ -82,7 +88,7 @@ async fn main() -> anyhow::Result<()> {
let (mut remote_sync_handler, mut remote_sync_outbox, mut remote_sync_inbox) =
object_store_sync();

let app = run_http();
let app = run_http(prometheus);
tokio::pin!(app);
loop {
tokio::select! {
Expand Down Expand Up @@ -206,7 +212,7 @@ async fn validator(
Err((actix_web::error::ErrorUnauthorized("Unauthorized"), req))
}

async fn run_http() -> anyhow::Result<()> {
async fn run_http(prometheus: PrometheusMetrics) -> anyhow::Result<()> {
let ssl_acceptor = match (
&CONFIG.parseable.tls_cert_path,
&CONFIG.parseable.tls_key_path,
Expand Down Expand Up @@ -242,7 +248,7 @@ async fn run_http() -> anyhow::Result<()> {
};

// concurrent workers equal to number of cores on the cpu
let http_server = HttpServer::new(move || create_app!()).workers(num_cpus::get());
let http_server = HttpServer::new(move || create_app!(prometheus)).workers(num_cpus::get());
if let Some(config) = ssl_acceptor {
http_server
.bind_rustls(&CONFIG.parseable.address, config)?
Expand Down Expand Up @@ -313,8 +319,9 @@ pub fn configure_routes(cfg: &mut web::ServiceConfig) {

#[macro_export]
macro_rules! create_app {
() => {
($prometheus: expr) => {
App::new()
.wrap($prometheus.clone())
.configure(|cfg| configure_routes(cfg))
.wrap(middleware::Logger::default())
.wrap(middleware::Compress::default())
Expand Down