client issue statistic HTTP call

Author: ghubertpalo

mithril-client/src/aggregator_client/http_client.rs

@@ -54,6 +54,13 @@ pub trait AggregatorClient: Sync + Send {
     /// Get the content back from the Aggregator, the URL is a relative path for a resource
     async fn get_content(&self, url: &str) -> Result<String, AggregatorHTTPClientError>;
 
+    /// Post information to the Aggregator, the URL is a relative path for a resource
+    async fn post_content(
+        &self,
+        url: &str,
+        json: &str,
+    ) -> Result<String, AggregatorHTTPClientError>;
+
     /// Download and unpack large archives on the disk
     async fn download_unpack(
         &self,
@@ -149,6 +156,27 @@ impl AggregatorHTTPClient {
         }
     }
 
+    /// Issue a POST HTTP request.
+    async fn post(&self, url: &str, json: &str) -> Result<Response, AggregatorHTTPClientError> {
+        let request_builder = Client::new().post(url.to_owned()).json(json);
+        let current_api_version = self
+            .compute_current_api_version()
+            .await
+            .unwrap()
+            .to_string();
+        debug!("Prepare request with version: {current_api_version}");
+        let request_builder =
+            request_builder.header(MITHRIL_API_VERSION_HEADER, current_api_version);
+
+        request_builder
+            .send()
+            .await
+            .map_err(|e| AggregatorHTTPClientError::SubsystemError {
+                message: format!("Error while posting data '{json}' to URL '{url}'."),
+                error: e.into(),
+            })
+    }
+
     /// API version error handling
     async fn handle_api_error(&self, response: &Response) -> AggregatorHTTPClientError {
         if let Some(version) = response.headers().get(MITHRIL_API_VERSION_HEADER) {
@@ -183,6 +211,26 @@ impl AggregatorClient for AggregatorHTTPClient {
             })
     }
 
+    async fn post_content(
+        &self,
+        url: &str,
+        json: &str,
+    ) -> Result<String, AggregatorHTTPClientError> {
+        let url = format!("{}/{}", self.aggregator_endpoint.trim_end_matches('/'), url);
+        let response = self.post(&url, json).await?;
+
+        let body =
+            response
+                .text()
+                .await
+                .map_err(|e| AggregatorHTTPClientError::SubsystemError {
+                    message: "Could not find a text body in the response.".to_string(),
+                    error: e.into(),
+                })?;
+
+        Ok(body)
+    }
+
     async fn download_unpack(
         &self,
         url: &str,

mithril-client/src/aggregator_client/snapshot_client.rs

@@ -75,7 +75,12 @@ impl SnapshotClient {
                     )
                     .await
                 {
-                    Ok(()) => Ok(()),
+                    Ok(()) => {
+                        // the snapshot download does not fail if the statistic call fails.
+                        let _ = self.add_statistics(snapshot).await;
+
+                        Ok(())
+                    }
                     Err(e) => {
                         warn!("Failed downloading snapshot from '{url}' Error: {e}.");
                         Err(e.into())
@@ -92,4 +97,13 @@ impl SnapshotClient {
         }
         .into())
     }
+
+    /// Increments Aggregator's download statistics
+    pub async fn add_statistics(&self, snapshot: &Snapshot) -> StdResult<()> {
+        let url = "statistics/snapshot";
+        let json = serde_json::to_string(snapshot)?;
+        let _response = self.http_client.post_content(url, &json).await?;
+
+        Ok(())
+    }
 }

mithril-client/src/services/snapshot.rs

@@ -260,7 +260,12 @@ impl SnapshotService for MithrilClientSnapshotService {
                 DownloadProgressReporter::new(pb, progress_output_type),
             )
             .await
-            .with_context(|| format!("Could not download file in '{}'", download_dir.display()))?;
+            .with_context(|| {
+                format!(
+                    "Could not download file in directory '{}'",
+                    download_dir.display()
+                )
+            })?;
 
         // Append 'clean' file to speedup node bootstrap
         if let Err(error) = File::create(db_dir.join("clean")) {
@@ -541,8 +546,11 @@ mod tests {
         let test_path = std::env::temp_dir().join("test_download_snapshot_ok");
         let _ = std::fs::remove_dir_all(&test_path);
 
-        let (http_client, certificate_verifier, digester) =
+        let (mut http_client, certificate_verifier, digester) =
             get_mocks_for_snapshot_service_configured_to_make_download_succeed();
+        http_client
+            .expect_post_content()
+            .returning(|_, _| Ok(String::new()));
 
         let mut builder = get_dep_builder(Arc::new(http_client));
         builder.certificate_verifier = Some(Arc::new(certificate_verifier));
@@ -581,8 +589,11 @@ mod tests {
             .join("test_download_snapshot_ok_add_clean_file_allowing_node_bootstrap_speedup");
         let _ = std::fs::remove_dir_all(&test_path);
 
-        let (http_client, certificate_verifier, digester) =
+        let (mut http_client, certificate_verifier, digester) =
             get_mocks_for_snapshot_service_configured_to_make_download_succeed();
+        http_client
+            .expect_post_content()
+            .returning(|_, _| Ok(String::new()));
 
         let mut builder = get_dep_builder(Arc::new(http_client));
         builder.certificate_verifier = Some(Arc::new(certificate_verifier));
@@ -625,8 +636,11 @@ mod tests {
         let test_path = std::env::temp_dir().join("test_download_snapshot_invalid_digest");
         let _ = std::fs::remove_dir_all(&test_path);
 
-        let (http_client, certificate_verifier, _) =
+        let (mut http_client, certificate_verifier, _) =
             get_mocks_for_snapshot_service_configured_to_make_download_succeed();
+        http_client
+            .expect_post_content()
+            .returning(|_, _| Ok(String::new()));
         let immutable_digester = DumbImmutableDigester::new("snapshot-digest-KO", true);
 
         let mut dep_builder = get_dep_builder(Arc::new(http_client));