From 678495a972e4371715d7f786e08ed757ee70e98e Mon Sep 17 00:00:00 2001 From: Callum Styan Date: Thu, 4 Nov 2021 13:46:45 -0700 Subject: [PATCH] Instrument s3 client DeleteObject requests. (#4649) Signed-off-by: Callum Styan --- pkg/storage/chunk/aws/s3_storage_client.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/storage/chunk/aws/s3_storage_client.go b/pkg/storage/chunk/aws/s3_storage_client.go index 736ec44815587..ddd619ac0b782 100644 --- a/pkg/storage/chunk/aws/s3_storage_client.go +++ b/pkg/storage/chunk/aws/s3_storage_client.go @@ -337,15 +337,15 @@ func (a *S3ObjectClient) Stop() {} // DeleteObject deletes the specified objectKey from the appropriate S3 bucket func (a *S3ObjectClient) DeleteObject(ctx context.Context, objectKey string) error { - _, err := a.S3.DeleteObject(&s3.DeleteObjectInput{ - Bucket: aws.String(a.bucketFromKey(objectKey)), - Key: aws.String(objectKey), - }) - if err != nil { - return err - } + return instrument.CollectedRequest(ctx, "S3.DeleteObject", s3RequestDuration, instrument.ErrorCode, func(ctx context.Context) error { + deleteObjectInput := &s3.DeleteObjectInput{ + Bucket: aws.String(a.bucketFromKey(objectKey)), + Key: aws.String(objectKey), + } - return nil + _, err := a.S3.DeleteObjectWithContext(ctx, deleteObjectInput) + return err + }) } // bucketFromKey maps a key to a bucket name