Skip to content

Commit 9a1238c

Browse files
apollo_integration_tests: make metric recorder init global in flow tests
1 parent d2dabd5 commit 9a1238c

File tree

1 file changed

+10
-9
lines changed
  • crates/apollo_integration_tests/tests/common

1 file changed

+10
-9
lines changed

crates/apollo_integration_tests/tests/common/mod.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use apollo_integration_tests::utils::{
1919
CreateRpcTxsFn,
2020
TestTxHashesFn,
2121
};
22-
use metrics_exporter_prometheus::{PrometheusBuilder, PrometheusRecorder};
22+
use metrics_exporter_prometheus::{PrometheusBuilder, PrometheusHandle};
2323
use pretty_assertions::assert_eq;
2424
use starknet_api::execution_resources::GasAmount;
2525
use starknet_api::transaction::TransactionHash;
@@ -38,8 +38,9 @@ pub async fn end_to_end_flow(
3838
configure_tracing().await;
3939

4040
let mut tx_generator = create_flow_test_tx_generator();
41-
let recorder = PrometheusBuilder::new().build_recorder();
42-
let _recorder_guard = metrics::set_default_local_recorder(&recorder);
41+
let global_recorder_handle = PrometheusBuilder::new()
42+
.install_recorder()
43+
.expect("Should be able to install global prometheus recorder");
4344

4445
const TEST_SCENARIO_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(50);
4546
// Setup.
@@ -106,7 +107,7 @@ pub async fn end_to_end_flow(
106107
{current_batched_txs_count}"
107108
);
108109

109-
current_batched_txs_count = get_total_batched_txs_count(&recorder);
110+
current_batched_txs_count = get_total_batched_txs_count(&global_recorder_handle);
110111
if current_batched_txs_count == total_expected_batched_txs_count {
111112
break;
112113
}
@@ -124,7 +125,7 @@ pub async fn end_to_end_flow(
124125
});
125126
}
126127

127-
assert_full_blocks_flow(&recorder, expecting_full_blocks);
128+
assert_full_blocks_flow(&global_recorder_handle, expecting_full_blocks);
128129
}
129130

130131
pub struct TestScenario {
@@ -133,13 +134,13 @@ pub struct TestScenario {
133134
pub test_tx_hashes_fn: TestTxHashesFn,
134135
}
135136

136-
fn get_total_batched_txs_count(recorder: &PrometheusRecorder) -> usize {
137-
let metrics = recorder.handle().render();
137+
fn get_total_batched_txs_count(handle: &PrometheusHandle) -> usize {
138+
let metrics = handle.render();
138139
apollo_batcher::metrics::BATCHED_TRANSACTIONS.parse_numeric_metric::<usize>(&metrics).unwrap()
139140
}
140141

141-
fn assert_full_blocks_flow(recorder: &PrometheusRecorder, expecting_full_blocks: bool) {
142-
let metrics = recorder.handle().render();
142+
fn assert_full_blocks_flow(recorder_handle: &PrometheusHandle, expecting_full_blocks: bool) {
143+
let metrics = recorder_handle.render();
143144
let full_blocks_metric = apollo_batcher::metrics::BLOCK_CLOSE_REASON
144145
.parse_numeric_metric::<u64>(
145146
&metrics,

0 commit comments

Comments
 (0)