kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-30 04:35:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename a metric

Browse Source 
other fixes recommended in PR 2461
This commit is contained in:
wileyj
2021-03-15 09:58:18 -04:00
parent 9b6ef48d3a
commit f834ec9950
5 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-test/etc/bitcoin-neon-controller.toml.in
View File

@@ -1,6 +1,6 @@
[network] [network]
rpc_bind = "0.0.0.0:28443" rpc_bind = "0.0.0.0:28443"
block_time = 120000 block_time = 60000
miner_address = "mmNe3BjtYa8ZWtpQxfpsE8aWKgHh77LYTT" miner_address = "mmNe3BjtYa8ZWtpQxfpsE8aWKgHh77LYTT"
faucet_address = "n3k15aVS4rEWhVYn4YfAFjD8Em5mmsducg" faucet_address = "n3k15aVS4rEWhVYn4YfAFjD8Em5mmsducg"
bitcoind_rpc_host = "127.0.0.1:18443" bitcoind_rpc_host = "127.0.0.1:18443"

5
src/chainstate/coordinator/mod.rs
View File

@@ -40,7 +40,8 @@ use chainstate::stacks::{
TransactionPayload, TransactionPayload,
}; };
use monitoring::{ use monitoring::{
increment_stx_blocks_processed_counter, increment_stx_smart_contracts, update_stacks_tip_height, increment_contract_calls_processed, increment_stx_blocks_processed_counter,
update_stacks_tip_height,
}; //promserver }; //promserver
use net::atlas::{AtlasConfig, AttachmentInstance}; use net::atlas::{AtlasConfig, AttachmentInstance};
use util::db::Error as DBError; use util::db::Error as DBError;
@@ -688,7 +689,7 @@ impl<'a, T: BlockEventDispatcher, N: CoordinatorNotices, U: RewardSetProvider>
transaction.payload transaction.payload
{ {
let contract_id = contract_call.to_clarity_contract_id(); let contract_id = contract_call.to_clarity_contract_id();
increment_stx_smart_contracts(); //promserver increment_contract_calls_processed(); //promserver
if self.atlas_config.contracts.contains(&contract_id) { if self.atlas_config.contracts.contains(&contract_id) {
for event in receipt.events.iter() { for event in receipt.events.iter() {
if let StacksTransactionEvent::SmartContractEvent( if let StacksTransactionEvent::SmartContractEvent(

4
src/monitoring/mod.rs
View File

@@ -266,7 +266,7 @@ pub fn increment_stx_mempool_gc() {
prometheus::STX_MEMPOOL_GC.inc(); prometheus::STX_MEMPOOL_GC.inc();
} }
pub fn increment_stx_smart_contracts() { pub fn increment_contract_calls_processed() {
#[cfg(feature = "monitoring_prom")] #[cfg(feature = "monitoring_prom")]
prometheus::STX_SMART_CONTRACT_COUNT.inc(); prometheus::CONTRACT_CALLS_PROCESSED_COUNT.inc();
} }

6
src/monitoring/prometheus.rs
View File

@@ -144,9 +144,9 @@ lazy_static! {
"Total count of all mempool garbage collections" "Total count of all mempool garbage collections"
)).unwrap(); )).unwrap();
pub static ref STX_SMART_CONTRACT_COUNT: IntCounter = register_int_counter!(opts!( pub static ref CONTRACT_CALLS_PROCESSED_COUNT: IntCounter = register_int_counter!(opts!(
"stacks_node_smart_contracts", "stacks_contract_calls_processed",
"Total count of smart contracts" "Total count of processed contract calls"
)).unwrap(); )).unwrap();
pub static ref MEMPOOL_OUTSTANDING_TXS: IntGauge = register_int_gauge!(opts!( pub static ref MEMPOOL_OUTSTANDING_TXS: IntGauge = register_int_gauge!(opts!(

10
src/net/rpc.rs
View File

@@ -112,16 +112,6 @@ use super::{RPCPoxCurrentCycleInfo, RPCPoxNextCycleInfo};
pub const STREAM_CHUNK_SIZE: u64 = 4096; pub const STREAM_CHUNK_SIZE: u64 = 4096;
// #[cfg(feature = "monitoring_prom")]
// lazy_static! {
// static ref RPC_REQ_HISTOGRAM: prometheus::monitoring::HistogramVec = register_histogram_vec!(
// "stacks_node_rpc_request_duration_seconds",
// "Stacks RPC request latencies in seconds",
// &["handler"]
// )
// .unwrap();
// }
#[derive(Default)] #[derive(Default)]
pub struct RPCHandlerArgs<'a> { pub struct RPCHandlerArgs<'a> {
pub exit_at_block_height: Option<&'a u64>, pub exit_at_block_height: Option<&'a u64>,