fix: incorrect metric collection of PUT_MULTIPART

remove at the async writer
add only when put_part() is called and is successful

Author: nikhilsinhaparseable

src/storage/azure_blob.rs

@@ -378,13 +378,7 @@ impl BlobStore {
         let mut file = OpenOptions::new().read(true).open(path).await?;
         let location = &to_object_store_path(key);
 
-        // Track multipart initiation
         let async_writer = self.client.put_multipart(location).await;
-        increment_object_store_calls_by_date(
-            "azure_blob",
-            "PUT_MULTIPART",
-            &Utc::now().date_naive().to_string(),
-        );
         let mut async_writer = match async_writer {
             Ok(writer) => writer,
             Err(err) => {
@@ -445,16 +439,14 @@ impl BlobStore {
                 let part_data = data[start_pos..end_pos].to_vec();
 
                 let result = async_writer.put_part(part_data.into()).await;
+                if result.is_err() {
+                    return Err(result.err().unwrap().into());
+                }
                 increment_object_store_calls_by_date(
                     "azure_blob",
                     "PUT_MULTIPART",
                     &Utc::now().date_naive().to_string(),
                 );
-                if result.is_err() {
-                    return Err(result.err().unwrap().into());
-                }
-
-                // upload_parts.push(part_number as u64 + 1);
             }
 
             // Track multipart completion

src/storage/gcs.rs

@@ -322,13 +322,7 @@ impl Gcs {
         let mut file = OpenOptions::new().read(true).open(path).await?;
         let location = &to_object_store_path(key);
 
-        // Track multipart initiation
         let async_writer = self.client.put_multipart(location).await;
-        increment_object_store_calls_by_date(
-            "gcs",
-            "PUT_MULTIPART",
-            &Utc::now().date_naive().to_string(),
-        );
         let mut async_writer = match async_writer {
             Ok(writer) => writer,
             Err(err) => {
@@ -387,14 +381,14 @@ impl Gcs {
 
                 // Track individual part upload
                 let result = async_writer.put_part(part_data.into()).await;
+                if result.is_err() {
+                    return Err(result.err().unwrap().into());
+                }
                 increment_object_store_calls_by_date(
                     "gcs",
                     "PUT_MULTIPART",
                     &Utc::now().date_naive().to_string(),
                 );
-                if result.is_err() {
-                    return Err(result.err().unwrap().into());
-                }
             }
 
             // Track multipart completion

src/storage/s3.rs

@@ -486,13 +486,7 @@ impl S3 {
         let mut file = OpenOptions::new().read(true).open(path).await?;
         let location = &to_object_store_path(key);
 
-        // Track multipart initiation
         let async_writer = self.client.put_multipart(location).await;
-        increment_object_store_calls_by_date(
-            "s3",
-            "PUT_MULTIPART",
-            &Utc::now().date_naive().to_string(),
-        );
         let mut async_writer = match async_writer {
             Ok(writer) => writer,
             Err(err) => {
@@ -552,16 +546,14 @@ impl S3 {
 
                 // Track individual part upload
                 let result = async_writer.put_part(part_data.into()).await;
+                if result.is_err() {
+                    return Err(result.err().unwrap().into());
+                }
                 increment_object_store_calls_by_date(
                     "s3",
                     "PUT_MULTIPART",
                     &Utc::now().date_naive().to_string(),
                 );
-                if result.is_err() {
-                    return Err(result.err().unwrap().into());
-                }
-
-                // upload_parts.push(part_number as u64 + 1);
             }
 
             // Track multipart completion