cargo fmt
This commit is contained in:
parent
c055d8b992
commit
95f923f7c7
|
@ -50,14 +50,18 @@ async fn batch_inner(
|
||||||
let market_name = &market.name.clone();
|
let market_name = &market.name.clone();
|
||||||
let candles = batch_1m_candles(pool, market).await?;
|
let candles = batch_1m_candles(pool, market).await?;
|
||||||
send_candles(candles.clone(), candles_sender).await;
|
send_candles(candles.clone(), candles_sender).await;
|
||||||
METRIC_CANDLES_TOTAL.with_label_values(&[market.name.as_str()]).inc_by(candles.clone().len() as u64);
|
METRIC_CANDLES_TOTAL
|
||||||
|
.with_label_values(&[market.name.as_str()])
|
||||||
|
.inc_by(candles.clone().len() as u64);
|
||||||
for resolution in Resolution::iter() {
|
for resolution in Resolution::iter() {
|
||||||
if resolution == Resolution::R1m {
|
if resolution == Resolution::R1m {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let candles = batch_higher_order_candles(pool, market_name, resolution).await?;
|
let candles = batch_higher_order_candles(pool, market_name, resolution).await?;
|
||||||
send_candles(candles.clone(), candles_sender).await;
|
send_candles(candles.clone(), candles_sender).await;
|
||||||
METRIC_CANDLES_TOTAL.with_label_values(&[market.name.as_str()]).inc_by(candles.clone().len() as u64);
|
METRIC_CANDLES_TOTAL
|
||||||
|
.with_label_values(&[market.name.as_str()])
|
||||||
|
.inc_by(candles.clone().len() as u64);
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,10 @@ use openbook_candles::structs::candle::Candle;
|
||||||
use openbook_candles::structs::markets::{fetch_market_infos, load_markets};
|
use openbook_candles::structs::markets::{fetch_market_infos, load_markets};
|
||||||
use openbook_candles::structs::openbook::OpenBookFillEvent;
|
use openbook_candles::structs::openbook::OpenBookFillEvent;
|
||||||
use openbook_candles::utils::Config;
|
use openbook_candles::utils::Config;
|
||||||
use openbook_candles::worker::metrics::{serve_metrics, METRIC_DB_POOL_AVAILABLE, METRIC_DB_POOL_SIZE, METRIC_CANDLES_QUEUE_LENGTH, METRIC_FILLS_QUEUE_LENGTH};
|
use openbook_candles::worker::metrics::{
|
||||||
|
serve_metrics, METRIC_CANDLES_QUEUE_LENGTH, METRIC_DB_POOL_AVAILABLE, METRIC_DB_POOL_SIZE,
|
||||||
|
METRIC_FILLS_QUEUE_LENGTH,
|
||||||
|
};
|
||||||
use openbook_candles::worker::trade_fetching::scrape::scrape;
|
use openbook_candles::worker::trade_fetching::scrape::scrape;
|
||||||
use openbook_candles::{
|
use openbook_candles::{
|
||||||
database::{
|
database::{
|
||||||
|
@ -91,8 +94,10 @@ async fn main() -> anyhow::Result<()> {
|
||||||
METRIC_DB_POOL_AVAILABLE.set(pool_status.available as i64);
|
METRIC_DB_POOL_AVAILABLE.set(pool_status.available as i64);
|
||||||
METRIC_DB_POOL_SIZE.set(pool_status.size as i64);
|
METRIC_DB_POOL_SIZE.set(pool_status.size as i64);
|
||||||
|
|
||||||
METRIC_CANDLES_QUEUE_LENGTH.set((candles_queue_max_size - monitor_candle_channel.capacity()) as i64);
|
METRIC_CANDLES_QUEUE_LENGTH
|
||||||
METRIC_FILLS_QUEUE_LENGTH.set((fills_queue_max_size - monitor_fill_channel.capacity()) as i64);
|
.set((candles_queue_max_size - monitor_candle_channel.capacity()) as i64);
|
||||||
|
METRIC_FILLS_QUEUE_LENGTH
|
||||||
|
.set((fills_queue_max_size - monitor_fill_channel.capacity()) as i64);
|
||||||
|
|
||||||
tokio::time::sleep(WaitDuration::from_secs(10)).await;
|
tokio::time::sleep(WaitDuration::from_secs(10)).await;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
use actix_web::{dev::Server, http::StatusCode, App, HttpServer};
|
use actix_web::{dev::Server, http::StatusCode, App, HttpServer};
|
||||||
use actix_web_prom::PrometheusMetricsBuilder;
|
use actix_web_prom::PrometheusMetricsBuilder;
|
||||||
use lazy_static::lazy_static;
|
use lazy_static::lazy_static;
|
||||||
use prometheus::{register_int_counter_vec_with_registry, IntCounterVec, Registry, IntGauge, register_int_gauge_with_registry, register_int_counter_with_registry, IntCounter};
|
use prometheus::{
|
||||||
|
register_int_counter_vec_with_registry, register_int_gauge_with_registry, IntCounterVec,
|
||||||
|
IntGauge, Registry,
|
||||||
|
};
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
static ref METRIC_REGISTRY: Registry =
|
static ref METRIC_REGISTRY: Registry =
|
||||||
|
@ -39,13 +42,14 @@ lazy_static! {
|
||||||
METRIC_REGISTRY
|
METRIC_REGISTRY
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
pub static ref METRIC_RPC_ERRORS_TOTAL: IntCounterVec = register_int_counter_vec_with_registry!(
|
pub static ref METRIC_RPC_ERRORS_TOTAL: IntCounterVec =
|
||||||
"rpc_errors_total",
|
register_int_counter_vec_with_registry!(
|
||||||
"RPC errors while scraping",
|
"rpc_errors_total",
|
||||||
&["method"],
|
"RPC errors while scraping",
|
||||||
METRIC_REGISTRY
|
&["method"],
|
||||||
)
|
METRIC_REGISTRY
|
||||||
.unwrap();
|
)
|
||||||
|
.unwrap();
|
||||||
pub static ref METRIC_DB_POOL_SIZE: IntGauge = register_int_gauge_with_registry!(
|
pub static ref METRIC_DB_POOL_SIZE: IntGauge = register_int_gauge_with_registry!(
|
||||||
"db_pool_size",
|
"db_pool_size",
|
||||||
"Current size of the DB connection pool",
|
"Current size of the DB connection pool",
|
||||||
|
|
|
@ -5,7 +5,10 @@ use solana_transaction_status::{
|
||||||
};
|
};
|
||||||
use std::{collections::HashMap, io::Error};
|
use std::{collections::HashMap, io::Error};
|
||||||
|
|
||||||
use crate::{structs::openbook::{OpenBookFillEvent, OpenBookFillEventRaw}, worker::metrics::METRIC_RPC_ERRORS_TOTAL};
|
use crate::{
|
||||||
|
structs::openbook::{OpenBookFillEvent, OpenBookFillEventRaw},
|
||||||
|
worker::metrics::METRIC_RPC_ERRORS_TOTAL,
|
||||||
|
};
|
||||||
|
|
||||||
const PROGRAM_DATA: &str = "Program data: ";
|
const PROGRAM_DATA: &str = "Program data: ";
|
||||||
|
|
||||||
|
@ -35,7 +38,9 @@ pub fn parse_trades_from_openbook_txns(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
METRIC_RPC_ERRORS_TOTAL.with_label_values(&["getTransaction"]).inc();
|
METRIC_RPC_ERRORS_TOTAL
|
||||||
|
.with_label_values(&["getTransaction"])
|
||||||
|
.inc();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,9 @@ use std::{collections::HashMap, str::FromStr, time::Duration as WaitDuration};
|
||||||
use tokio::sync::mpsc::Sender;
|
use tokio::sync::mpsc::Sender;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
structs::openbook::OpenBookFillEvent, utils::Config, worker::metrics::{METRIC_FILLS_TOTAL, METRIC_RPC_ERRORS_TOTAL},
|
structs::openbook::OpenBookFillEvent,
|
||||||
|
utils::Config,
|
||||||
|
worker::metrics::{METRIC_FILLS_TOTAL, METRIC_RPC_ERRORS_TOTAL},
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::parsing::parse_trades_from_openbook_txns;
|
use super::parsing::parse_trades_from_openbook_txns;
|
||||||
|
@ -60,7 +62,9 @@ pub async fn scrape_transactions(
|
||||||
Ok(s) => s,
|
Ok(s) => s,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
println!("Error in get_signatures_for_address_with_config: {}", e);
|
println!("Error in get_signatures_for_address_with_config: {}", e);
|
||||||
METRIC_RPC_ERRORS_TOTAL.with_label_values(&["getSignaturesForAddress"]).inc();
|
METRIC_RPC_ERRORS_TOTAL
|
||||||
|
.with_label_values(&["getSignaturesForAddress"])
|
||||||
|
.inc();
|
||||||
return before_sig;
|
return before_sig;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue