From 4881b69f71f0d6774fb33dadca5d921b5741ab27 Mon Sep 17 00:00:00 2001
From: pmendes <pmendes@cloudflare.com>
Date: Wed, 21 Aug 2024 17:21:43 +0100
Subject: [PATCH] Replace remaining usages of futures_executor::block_on with
 spawn_future

---
 .../src/metrics/periodic_reader.rs            | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/opentelemetry-sdk/src/metrics/periodic_reader.rs b/opentelemetry-sdk/src/metrics/periodic_reader.rs
index 034053bdbc..56b59cccc8 100644
--- a/opentelemetry-sdk/src/metrics/periodic_reader.rs
+++ b/opentelemetry-sdk/src/metrics/periodic_reader.rs
@@ -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<()> {
@@ -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) => {}
+                },
+                Err(err) | Ok(Err(err)) => global::handle_error(err),
+            }
+        });
 
-        shutdown_result
+        Ok(())
     }
 }