refactor(blocking): use sync sender

nikhil-prabhu · Jan 2, 2025 · d70b692 · d70b692
1 parent cf6dea2
commit d70b692
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/blocking/mod.rs b/src/blocking/mod.rs
@@ -1,6 +1,6 @@
 pub(crate) mod providers;
 
-use std::sync::mpsc::Sender;
+use std::sync::mpsc::SyncSender;
 use std::sync::{mpsc, Arc, LazyLock, Mutex};
 use std::time::Duration;
 
@@ -13,7 +13,7 @@ use crate::{ProviderId, DEFAULT_DETECTION_TIMEOUT};
 #[allow(dead_code)]
 pub(crate) trait Provider: Send + Sync {
     fn identifier(&self) -> ProviderId;
-    fn identify(&self, tx: Sender<ProviderId>, timeout: Duration);
+    fn identify(&self, tx: SyncSender<ProviderId>, timeout: Duration);
 }
 
 type P = Arc<dyn Provider>;
@@ -51,7 +51,7 @@ pub fn supported_providers() -> Result<Vec<String>> {
 
 pub fn detect(timeout: Option<u64>) -> Result<ProviderId> {
     let timeout = Duration::from_secs(timeout.unwrap_or(DEFAULT_DETECTION_TIMEOUT));
-    let (tx, rx) = mpsc::channel::<ProviderId>();
+    let (tx, rx) = mpsc::sync_channel::<ProviderId>(1);
     let guard = PROVIDERS
         .lock()
         .map_err(|_| anyhow::anyhow!("Error locking providers"))?;

diff --git a/src/blocking/providers/alibaba.rs b/src/blocking/providers/alibaba.rs
@@ -2,7 +2,7 @@
 
 use std::fs;
 use std::path::Path;
-use std::sync::mpsc::Sender;
+use std::sync::mpsc::SyncSender;
 use std::time::Duration;
 
 use tracing::{debug, error, info, instrument};
@@ -23,7 +23,7 @@ impl Provider for Alibaba {
     }
 
     #[instrument(skip_all)]
-    fn identify(&self, tx: Sender<ProviderId>, timeout: Duration) {
+    fn identify(&self, tx: SyncSender<ProviderId>, timeout: Duration) {
         info!("Checking Alibaba Cloud");
         if self.check_vendor_file(VENDOR_FILE) || self.check_metadata_server(METADATA_URI, timeout)
         {

diff --git a/src/blocking/providers/aws.rs b/src/blocking/providers/aws.rs
@@ -1,7 +1,7 @@
 //! Amazon Web Services (AWS).
 
 use std::path::Path;
-use std::sync::mpsc::Sender;
+use std::sync::mpsc::SyncSender;
 use std::time::Duration;
 
 use reqwest::blocking::Client;
@@ -33,7 +33,7 @@ impl Provider for Aws {
         IDENTIFIER
     }
 
-    fn identify(&self, tx: Sender<ProviderId>, timeout: Duration) {
+    fn identify(&self, tx: SyncSender<ProviderId>, timeout: Duration) {
         info!("Checking Amazon Web Services");
         if self.check_product_version_file(PRODUCT_VERSION_FILE)
             || self.check_bios_vendor_file(BIOS_VENDOR_FILE)

diff --git a/src/blocking/providers/azure.rs b/src/blocking/providers/azure.rs
@@ -2,7 +2,7 @@
 
 use std::fs;
 use std::path::Path;
-use std::sync::mpsc::Sender;
+use std::sync::mpsc::SyncSender;
 use std::time::Duration;
 
 use reqwest::blocking::Client;
@@ -12,13 +12,9 @@ use tracing::{debug, error, info, instrument};
 use crate::blocking::Provider;
 use crate::ProviderId;
 
-#[allow(unused)]
 const METADATA_URI: &str = "http://169.254.169.254";
-#[allow(unused)]
 const METADATA_PATH: &str = "/metadata/instance?api-version=2017-12-01";
-#[allow(unused)]
 const VENDOR_FILE: &str = "/sys/class/dmi/id/sys_vendor";
-#[allow(unused)]
 const IDENTIFIER: ProviderId = ProviderId::Azure;
 
 #[derive(Serialize, Deserialize)]
@@ -40,7 +36,7 @@ impl Provider for Azure {
     }
 
     #[instrument(skip_all)]
-    fn identify(&self, tx: Sender<ProviderId>, timeout: Duration) {
+    fn identify(&self, tx: SyncSender<ProviderId>, timeout: Duration) {
         info!("Checking Microsoft Azure");
         if self.check_vendor_file(VENDOR_FILE) || self.check_metadata_server(METADATA_URI, timeout)
         {