Skip to content

Commit

Permalink
Replace remaining usages of futures_executor::block_on with spawn_future
Browse files Browse the repository at this point in the history
  • Loading branch information
mendess committed Aug 23, 2024
1 parent d4b8fe5 commit 4881b69
Showing 1 changed file with 18 additions and 10 deletions.
28 changes: 18 additions & 10 deletions opentelemetry-sdk/src/metrics/periodic_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,9 @@ impl MetricReader for PeriodicReader {

drop(inner); // don't hold lock when blocking on future

futures_executor::block_on(receiver)
.map_err(|err| MetricsError::Other(err.to_string()))
.and_then(|res| res)
crate::util::spawn_future(receiver);

Ok(())
}

fn shutdown(&self) -> Result<()> {
Expand All @@ -395,14 +395,22 @@ impl MetricReader for PeriodicReader {
.map_err(|e| MetricsError::Other(e.to_string()))?;
drop(inner); // don't hold lock when blocking on future

let shutdown_result = futures_executor::block_on(receiver)
.map_err(|err| MetricsError::Other(err.to_string()))?;

// Acquire the lock again to set the shutdown flag
let mut inner = self.inner.lock()?;
inner.is_shutdown = true;
let inner = self.inner.clone();
crate::util::spawn_future(async move {
match receiver
.await
.map_err(|err| MetricsError::Other(err.to_string()))
{
// Acquire the lock again to set the shutdown flag
Ok(Ok(())) => match inner.lock() {
Ok(mut inner) => inner.is_shutdown = true,
Err(_poisoned) => {}

Check warning on line 407 in opentelemetry-sdk/src/metrics/periodic_reader.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/metrics/periodic_reader.rs#L407

Added line #L407 was not covered by tests
},
Err(err) | Ok(Err(err)) => global::handle_error(err),

Check warning on line 409 in opentelemetry-sdk/src/metrics/periodic_reader.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-sdk/src/metrics/periodic_reader.rs#L409

Added line #L409 was not covered by tests
}
});

shutdown_result
Ok(())
}
}

Expand Down

0 comments on commit 4881b69

Please sign in to comment.