add prom timer to delete bucket

scality · Dec 24, 2024 · cf1d211 · cf1d211
1 parent 0af4ba1
commit cf1d211
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/pkg/clients/s3/s3_client.go b/pkg/clients/s3/s3_client.go
@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/config"
@@ -90,16 +89,16 @@ func (client *S3Client) CreateBucket(ctx context.Context, bucketName string, par
 }
 
 func (client *S3Client) DeleteBucket(ctx context.Context, bucketName string) error {
-	start := time.Now()
-	_, err := client.S3Service.DeleteBucket(ctx, &s3.DeleteBucketInput{Bucket: &bucketName})
-	duration := time.Since(start).Seconds()
+	metricStatus := "success"
+	timer := prometheus.NewTimer(prometheus.ObserverFunc(func(duration float64) {
+		metrics.S3RequestDuration.WithLabelValues("DeleteBucket", metricStatus).Observe(duration)
+	}))
+	defer timer.ObserveDuration()
 
-	status := "success"
+	_, err := client.S3Service.DeleteBucket(ctx, &s3.DeleteBucketInput{Bucket: &bucketName})
 	if err != nil {
-		status = "error"
+		metricStatus = "error"
 	}
-	metrics.S3RequestsTotal.WithLabelValues("DeleteBucket", status).Inc()
-	metrics.S3RequestDuration.WithLabelValues("DeleteBucket", status).Observe(duration)
-
+	metrics.S3RequestsTotal.WithLabelValues("DeleteBucket", metricStatus).Inc()
 	return err
 }