move metrics

mangas · mangas · commit 76f89663ce4b · 2022-01-17T14:36:59.000Z
diff --git a/core/src/subgraph/instance_manager.rs b/core/src/subgraph/instance_manager.rs
@@ -543,7 +543,7 @@ where
         let metrics = ctx.block_stream_metrics.clone();
         let filter = ctx.state.filter.clone();
         let stream_inputs = inputs.clone();
-        let mut block_stream = new_block_stream(stream_inputs, filter, metrics)
+        let mut block_stream = new_block_stream(stream_inputs, filter, metrics.cheap_clone())
             .await?
             .map_err(CancelableError::Error)
             .cancelable(&block_stream_canceler, || Err(CancelableError::Cancel));
@@ -560,7 +560,13 @@ where
 
         // Process events from the stream as long as no restart is needed
         loop {
-            let (block, cursor) = match block_stream.next().await {
+            let event = {
+                let _section = metrics.stopwatch.start_section("scan_blocks");
+
+                block_stream.next().await
+            };
+
+            let (block, cursor) = match event {
                 Some(Ok(BlockStreamEvent::ProcessBlock(block, cursor))) => (block, cursor),
                 Some(Ok(BlockStreamEvent::Revert(subgraph_ptr, _, optional_parent_ptr))) => {
                     info!(
diff --git a/graph/src/blockchain/polling_block_stream.rs b/graph/src/blockchain/polling_block_stream.rs
@@ -388,7 +388,6 @@ where
             };
             let to = cmp::min(from + range_size - 1, to_limit);
 
-            let section = ctx.metrics.stopwatch.start_section("scan_blocks");
             info!(
                 ctx.logger,
                 "Scanning blocks [{}, {}]", from, to;
@@ -397,7 +396,6 @@ where
 
             let blocks = self.adapter.scan_triggers(from, to, &self.filter).await?;
 
-            section.end();
             Ok(ReconciliationStep::ProcessDescendantBlocks(
                 blocks, range_size,
             ))
