Skip to content

Commit 255f595

Browse files
cvvzcvvz
authored
cleanup: add csi realted track2 metrics (#8643)
1 parent 8777e4e commit 255f595

File tree

5 files changed

+105
-1
lines changed

5 files changed

+105
-1
lines changed

‎pkg/azclient/accountclient/custom.go‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,25 @@ package accountclient
1919
import (
2020
"context"
2121

22+
"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
2223
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"
2324

25+
"sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics"
2426
"sigs.k8s.io/cloud-provider-azure/pkg/azclient/utils"
2527
)
2628

27-
func (client *Client) Create(ctx context.Context, resourceGroupName string, resourceName string, resource *armstorage.AccountCreateParameters) (*armstorage.Account, error) {
29+
const CreateOperationName = "AccountsClient.Create"
30+
const UpdateOperationName = "AccountsClient.Update"
31+
const GetPropertiesOperationName = "AccountsClient.GetProperties"
32+
const DeleteOperationName = "AccountsClient.Delete"
33+
const ListKeysOperationName = "AccountsClient.ListKeys"
34+
35+
func (client *Client) Create(ctx context.Context, resourceGroupName string, resourceName string, resource *armstorage.AccountCreateParameters) (result *armstorage.Account, err error) {
36+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "create")
37+
defer func() { metricsCtx.Observe(ctx, err) }()
38+
ctx, endSpan := runtime.StartSpan(ctx, CreateOperationName, client.tracer, nil)
39+
defer endSpan(err)
40+
2841
if resource == nil {
2942
resource = &armstorage.AccountCreateParameters{}
3043
}
@@ -39,6 +52,11 @@ func (client *Client) Create(ctx context.Context, resourceGroupName string, reso
3952
}
4053

4154
func (client *Client) Update(ctx context.Context, resourceGroupName string, resourceName string, parameters *armstorage.AccountUpdateParameters) (*armstorage.Account, error) {
55+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "update")
56+
defer func() { metricsCtx.Observe(ctx, nil) }()
57+
ctx, endSpan := runtime.StartSpan(ctx, UpdateOperationName, client.tracer, nil)
58+
defer endSpan(nil)
59+
4260
if parameters == nil {
4361
parameters = &armstorage.AccountUpdateParameters{}
4462
}
@@ -50,6 +68,11 @@ func (client *Client) Update(ctx context.Context, resourceGroupName string, reso
5068
}
5169

5270
func (client *Client) GetProperties(ctx context.Context, resourceGroupName string, accountName string, options *armstorage.AccountsClientGetPropertiesOptions) (*armstorage.Account, error) {
71+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "getProperties")
72+
defer func() { metricsCtx.Observe(ctx, nil) }()
73+
ctx, endSpan := runtime.StartSpan(ctx, GetPropertiesOperationName, client.tracer, nil)
74+
defer endSpan(nil)
75+
5376
resp, err := client.AccountsClient.GetProperties(ctx, resourceGroupName, accountName, options)
5477
if err != nil {
5578
return nil, err
@@ -60,11 +83,21 @@ func (client *Client) GetProperties(ctx context.Context, resourceGroupName strin
6083

6184
// Delete deletes a Interface by name.
6285
func (client *Client) Delete(ctx context.Context, resourceGroupName string, resourceName string) error {
86+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "delete")
87+
defer func() { metricsCtx.Observe(ctx, nil) }()
88+
ctx, endSpan := runtime.StartSpan(ctx, DeleteOperationName, client.tracer, nil)
89+
defer endSpan(nil)
90+
6391
_, err := client.AccountsClient.Delete(ctx, resourceGroupName, resourceName, nil)
6492
return err
6593
}
6694

6795
func (client *Client) ListKeys(ctx context.Context, resourceGroupName string, accountName string) ([]*armstorage.AccountKey, error) {
96+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "listKeys")
97+
defer func() { metricsCtx.Observe(ctx, nil) }()
98+
ctx, endSpan := runtime.StartSpan(ctx, ListKeysOperationName, client.tracer, nil)
99+
defer endSpan(nil)
100+
68101
resp, err := client.AccountsClient.ListKeys(ctx, resourceGroupName, accountName, nil)
69102
if err != nil {
70103
return nil, err

‎pkg/azclient/blobcontainerclient/custom.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,23 @@ package blobcontainerclient
1919
import (
2020
"context"
2121

22+
"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
2223
armstorage "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"
24+
25+
"sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics"
2326
)
2427

28+
const ListOperationName = "BlobContainersClient.List"
29+
const CreateOperationName = "BlobContainersClient.Create"
30+
const DeleteOperationName = "BlobContainersClient.Delete"
31+
2532
// List gets a list of BlobContainer in the resource group.
2633
func (client *Client) List(ctx context.Context, resourceGroupName string, parentResourceName string) (result []*armstorage.ListContainerItem, rerr error) {
34+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobContainer", "list")
35+
defer func() { metricsCtx.Observe(ctx, rerr) }()
36+
ctx, endSpan := runtime.StartSpan(ctx, ListOperationName, client.tracer, nil)
37+
defer endSpan(rerr)
38+
2739
pager := client.BlobContainersClient.NewListPager(resourceGroupName, parentResourceName, nil)
2840
for pager.More() {
2941
nextResult, err := pager.NextPage(ctx)
@@ -36,6 +48,11 @@ func (client *Client) List(ctx context.Context, resourceGroupName string, parent
3648
}
3749

3850
func (client *Client) CreateContainer(ctx context.Context, resourceGroupName, accountName, containerName string, parameters armstorage.BlobContainer) (*armstorage.BlobContainer, error) {
51+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobContainer", "create")
52+
defer func() { metricsCtx.Observe(ctx, nil) }()
53+
ctx, endSpan := runtime.StartSpan(ctx, CreateOperationName, client.tracer, nil)
54+
defer endSpan(nil)
55+
3956
resp, err := client.BlobContainersClient.Create(ctx, resourceGroupName, accountName, containerName, parameters, nil)
4057
if err != nil {
4158
return nil, err
@@ -44,6 +61,11 @@ func (client *Client) CreateContainer(ctx context.Context, resourceGroupName, ac
4461
}
4562

4663
func (client *Client) DeleteContainer(ctx context.Context, resourceGroupName, accountName, containerName string) error {
64+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobContainer", "delete")
65+
defer func() { metricsCtx.Observe(ctx, nil) }()
66+
ctx, endSpan := runtime.StartSpan(ctx, DeleteOperationName, client.tracer, nil)
67+
defer endSpan(nil)
68+
4769
_, err := client.BlobContainersClient.Delete(ctx, resourceGroupName, accountName, containerName, nil)
4870
return err
4971
}

‎pkg/azclient/blobservicepropertiesclient/custom.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,21 @@ package blobservicepropertiesclient
1919
import (
2020
"context"
2121

22+
"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
2223
armstorage "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"
24+
25+
"sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics"
2326
)
2427

28+
const GetOperationName = "BlobServicesClient.GetServiceProperties"
29+
const SetOperationName = "BlobServicesClient.SetServiceProperties"
30+
2531
// Get gets the BlobServiceProperties
2632
func (client *Client) Get(ctx context.Context, resourceGroupName string, resourceName string) (*armstorage.BlobServiceProperties, error) {
33+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobService", "getServiceProperties")
34+
defer func() { metricsCtx.Observe(ctx, nil) }()
35+
ctx, endSpan := runtime.StartSpan(ctx, GetOperationName, client.tracer, nil)
36+
defer endSpan(nil)
2737

2838
resp, err := client.BlobServicesClient.GetServiceProperties(ctx, resourceGroupName, resourceName, nil)
2939
if err != nil {
@@ -34,6 +44,11 @@ func (client *Client) Get(ctx context.Context, resourceGroupName string, resourc
3444
}
3545

3646
func (client *Client) Set(ctx context.Context, resourceGroupName string, resourceName string, parameters armstorage.BlobServiceProperties) (*armstorage.BlobServiceProperties, error) {
47+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobService", "setServiceProperties")
48+
defer func() { metricsCtx.Observe(ctx, nil) }()
49+
ctx, endSpan := runtime.StartSpan(ctx, SetOperationName, client.tracer, nil)
50+
defer endSpan(nil)
51+
3752
resp, err := client.BlobServicesClient.SetServiceProperties(ctx, resourceGroupName, resourceName, parameters, nil)
3853
if err != nil {
3954
return nil, err

‎pkg/azclient/fileservicepropertiesclient/custom.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,21 @@ package fileservicepropertiesclient
1919
import (
2020
"context"
2121

22+
"github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
2223
armstorage "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"
24+
25+
"sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics"
2326
)
2427

28+
const GetOperationName = "FileServicesClient.GetServiceProperties"
29+
const SetOperationName = "FileServicesClient.SetServiceProperties"
30+
2531
// Get gets the FileServiceProperties
2632
func (client *Client) Get(ctx context.Context, resourceGroupName string, resourceName string) (*armstorage.FileServiceProperties, error) {
33+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileService", "getServiceProperties")
34+
defer func() { metricsCtx.Observe(ctx, nil) }()
35+
ctx, endSpan := runtime.StartSpan(ctx, GetOperationName, client.tracer, nil)
36+
defer endSpan(nil)
2737

2838
resp, err := client.FileServicesClient.GetServiceProperties(ctx, resourceGroupName, resourceName, nil)
2939
if err != nil {
@@ -34,6 +44,11 @@ func (client *Client) Get(ctx context.Context, resourceGroupName string, resourc
3444
}
3545

3646
func (client *Client) Set(ctx context.Context, resourceGroupName string, resourceName string, parameters armstorage.FileServiceProperties) (*armstorage.FileServiceProperties, error) {
47+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileService", "setServiceProperties")
48+
defer func() { metricsCtx.Observe(ctx, nil) }()
49+
ctx, endSpan := runtime.StartSpan(ctx, SetOperationName, client.tracer, nil)
50+
defer endSpan(nil)
51+
3752
resp, err := client.FileServicesClient.SetServiceProperties(ctx, resourceGroupName, resourceName, parameters, nil)
3853
if err != nil {
3954
return nil, err

‎pkg/azclient/fileshareclient/custom.go‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,16 @@ import (
2525
"sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics"
2626
)
2727

28+
const CreateOperationName = "FileSharesClient.Create"
29+
const DeleteOperationName = "FileSharesClient.Delete"
30+
const UpdateOperationName = "FileSharesClient.Update"
31+
2832
func (client *Client) Create(ctx context.Context, resourceGroupName string, resourceName string, parentResourceName string, resource armstorage.FileShare, expand *string) (*armstorage.FileShare, error) {
33+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileShare", "create")
34+
defer func() { metricsCtx.Observe(ctx, nil) }()
35+
ctx, endSpan := runtime.StartSpan(ctx, CreateOperationName, client.tracer, nil)
36+
defer endSpan(nil)
37+
2938
resp, err := client.FileSharesClient.Create(ctx, resourceGroupName, resourceName, parentResourceName, resource, &armstorage.FileSharesClientCreateOptions{
3039
Expand: expand,
3140
})
@@ -36,6 +45,11 @@ func (client *Client) Create(ctx context.Context, resourceGroupName string, reso
3645
}
3746

3847
func (client *Client) Update(ctx context.Context, resourceGroupName string, resourceName string, parentResourceName string, resource armstorage.FileShare) (*armstorage.FileShare, error) {
48+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileShare", "update")
49+
defer func() { metricsCtx.Observe(ctx, nil) }()
50+
ctx, endSpan := runtime.StartSpan(ctx, UpdateOperationName, client.tracer, nil)
51+
defer endSpan(nil)
52+
3953
resp, err := client.FileSharesClient.Update(ctx, resourceGroupName, resourceName, parentResourceName, resource, nil)
4054
if err != nil {
4155
return nil, err
@@ -45,6 +59,11 @@ func (client *Client) Update(ctx context.Context, resourceGroupName string, reso
4559

4660
// Delete deletes a FileShare by name.
4761
func (client *Client) Delete(ctx context.Context, resourceGroupName string, parentResourceName string, resourceName string, expand *string) error {
62+
metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileShare", "delete")
63+
defer func() { metricsCtx.Observe(ctx, nil) }()
64+
ctx, endSpan := runtime.StartSpan(ctx, DeleteOperationName, client.tracer, nil)
65+
defer endSpan(nil)
66+
4867
_, err := client.FileSharesClient.Delete(ctx, resourceGroupName, parentResourceName, resourceName, &armstorage.FileSharesClientDeleteOptions{
4968
Include: expand,
5069
})

0 commit comments

Comments
 (0)