diff --git a/go.mod b/go.mod index f7b1498e40..632f61498a 100644 --- a/go.mod +++ b/go.mod @@ -29,20 +29,20 @@ require ( golang.org/x/sync v0.12.0 golang.org/x/sys v0.31.0 golang.org/x/text v0.23.0 - k8s.io/api v0.32.2 - k8s.io/apimachinery v0.32.2 - k8s.io/apiserver v0.32.2 - k8s.io/client-go v0.32.2 - k8s.io/cloud-provider v0.32.2 - k8s.io/component-base v0.32.2 - k8s.io/component-helpers v0.32.2 - k8s.io/controller-manager v0.32.2 + k8s.io/api v0.32.3 + k8s.io/apimachinery v0.32.3 + k8s.io/apiserver v0.32.3 + k8s.io/client-go v0.32.3 + k8s.io/cloud-provider v0.32.3 + k8s.io/component-base v0.32.3 + k8s.io/component-helpers v0.32.3 + k8s.io/controller-manager v0.32.3 k8s.io/klog/v2 v2.130.1 - k8s.io/kubelet v0.32.2 + k8s.io/kubelet v0.32.3 k8s.io/utils v0.0.0-20241210054802-24370beab758 - sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.12 - sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.1 - sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1 + sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.14 + sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.3 + sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.4 sigs.k8s.io/yaml v1.4.0 ) @@ -131,7 +131,7 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/kms v0.32.2 // indirect + k8s.io/kms v0.32.3 // indirect k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect diff --git a/go.sum b/go.sum index 35a5e49eca..0f33575a20 100644 --- a/go.sum +++ b/go.sum @@ -342,40 +342,40 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYs gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= -k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= -k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= -k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw= -k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM= -k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= -k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= -k8s.io/cloud-provider v0.32.2 h1:8EC+fCYo0r0REczSjOZcVuQPCMxXxCKlgxDbYMrzC30= -k8s.io/cloud-provider v0.32.2/go.mod h1:2s8TeAXhVezp5VISaTxM6vW3yDonOZXoN4Aryz1p1PQ= -k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU= -k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0= -k8s.io/component-helpers v0.32.2 h1:2usSAm3zNE5yu5DdAdrKBWLfSYNpU4OPjZywJY5ovP8= -k8s.io/component-helpers v0.32.2/go.mod h1:fvQAoiiOP7jUEUBc9qR0PXiBPuB0I56WTxTkkpcI8g8= -k8s.io/controller-manager v0.32.2 h1:/9XuHWEqofO2Aqa4l7KJGckJUcLVRWfx+qnVkdXoStI= -k8s.io/controller-manager v0.32.2/go.mod h1:o5uo2tLCQhuoMt0RfKcQd0eqaNmSKOKiT+0YELCqXOk= +k8s.io/api v0.32.3 h1:Hw7KqxRusq+6QSplE3NYG4MBxZw1BZnq4aP4cJVINls= +k8s.io/api v0.32.3/go.mod h1:2wEDTXADtm/HA7CCMD8D8bK4yuBUptzaRhYcYEEYA3k= +k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U= +k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.3 h1:kOw2KBuHOA+wetX1MkmrxgBr648ksz653j26ESuWNY8= +k8s.io/apiserver v0.32.3/go.mod h1:q1x9B8E/WzShF49wh3ADOh6muSfpmFL0I2t+TG0Zdgc= +k8s.io/client-go v0.32.3 h1:RKPVltzopkSgHS7aS98QdscAgtgah/+zmpAogooIqVU= +k8s.io/client-go v0.32.3/go.mod h1:3v0+3k4IcT9bXTc4V2rt+d2ZPPG700Xy6Oi0Gdl2PaY= +k8s.io/cloud-provider v0.32.3 h1:WC7KhWrqXsU4b0E4tjS+nBectGiJbr1wuc1TpWXvtZM= +k8s.io/cloud-provider v0.32.3/go.mod h1:/fwBfgRPuh16n8vLHT+PPT+Bc4LAEaJYj38opO2wsYY= +k8s.io/component-base v0.32.3 h1:98WJvvMs3QZ2LYHBzvltFSeJjEx7t5+8s71P7M74u8k= +k8s.io/component-base v0.32.3/go.mod h1:LWi9cR+yPAv7cu2X9rZanTiFKB2kHA+JjmhkKjCZRpI= +k8s.io/component-helpers v0.32.3 h1:9veHpOGTPLluqU4hAu5IPOwkOIZiGAJUhHndfVc5FT4= +k8s.io/component-helpers v0.32.3/go.mod h1:utTBXk8lhkJewBKNuNf32Xl3KT/0VV19DmiXU/SV4Ao= +k8s.io/controller-manager v0.32.3 h1:jBxZnQ24k6IMeWLyxWZmpa3QVS7ww+osAIzaUY/jqyc= +k8s.io/controller-manager v0.32.3/go.mod h1:out1L3DZjE/p7JG0MoMMIaQGWIkt3c+pKaswqSHgKsI= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.32.2 h1:7Ff23ht7W40gTcDwUC8G5WjX5W/nxD8WxbNhIYYNZCI= -k8s.io/kms v0.32.2/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= +k8s.io/kms v0.32.3 h1:HhHw5+pRCzEJp3oFFJ1q5W2N6gAI7YkUg4ay4Z0dgwM= +k8s.io/kms v0.32.3/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= -k8s.io/kubelet v0.32.2 h1:WFTSYdt3BB1aTApDuKNI16x/4MYqqX8WBBBBh3KupDg= -k8s.io/kubelet v0.32.2/go.mod h1:cC1ms5RS+lu0ckVr6AviCQXHLSPKEBC3D5oaCBdTGkI= +k8s.io/kubelet v0.32.3 h1:B9HzW4yB67flx8tN2FYuDwZvxnmK3v5EjxxFvOYjmc8= +k8s.io/kubelet v0.32.3/go.mod h1:yyAQSCKC+tjSlaFw4HQG7Jein+vo+GeKBGdXdQGvL1U= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.12 h1:9CnsYC1HVu/QPExszNb7sRLvbjeFsNiby2WsDUugSZs= -sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.12/go.mod h1:qMLI6HgC4GL/2w+KINP8YVDRzKCH/zQaoYHbfu7YOfU= -sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.1 h1:aPOmgpm6UHwFR3onNJA3juWG551ezJF7A6XCN49QujU= -sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.1/go.mod h1:/g7sgO4vZ4l2PIGQBeE6oxPq7hgm5NSYnaPSWycDs/4= -sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1 h1:F5qZPS35TGb0ghlLGcHrbwzoO3mFnCBMM4ADGAlY+rI= -sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1/go.mod h1:rEQnoF3pmD1kmAFQCwA/SqHiiftLFeMwdQt0gsuKWbM= +sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.14 h1:81DZINoz++Qii1LJWxTJD4LvfIVxGXbJNzp8GXRolN4= +sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.14/go.mod h1:5ZmwXbPbTYOy3GmOp9NBy3JX2fOvCf8PwefHceRuvcE= +sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.3 h1:jrBGF1VJy1Dl3KSu/rDES/yl1SH/ZhU1+Ft/0pRgt5g= +sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.3/go.mod h1:sp3NF7RKtDd3NoIVXOUOFX2jRITVLHwRblGG8Uad8e4= +sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.4 h1:iUuz6adm2lc/Kz8TqmBJFQsbh77S2t12uvZalArMOJg= +sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.4/go.mod h1:qGzNe34WaewXmqBAc2ati8mpt+UJa+EfmEDeJxMuiDU= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= diff --git a/vendor/k8s.io/api/resource/v1alpha3/types.go b/vendor/k8s.io/api/resource/v1alpha3/types.go index fb4d7041db..49d7c86de3 100644 --- a/vendor/k8s.io/api/resource/v1alpha3/types.go +++ b/vendor/k8s.io/api/resource/v1alpha3/types.go @@ -145,6 +145,10 @@ type ResourceSliceSpec struct { Devices []Device `json:"devices" protobuf:"bytes,6,name=devices"` } +// DriverNameMaxLength is the maximum valid length of a driver name in the +// ResourceSliceSpec and other places. It's the same as for CSI driver names. +const DriverNameMaxLength = 63 + // ResourcePool describes the pool that ResourceSlices belong to. type ResourcePool struct { // Name is used to identify the pool. For node-local devices, this diff --git a/vendor/k8s.io/api/resource/v1beta1/types.go b/vendor/k8s.io/api/resource/v1beta1/types.go index ca79c5a664..fbdc35ca86 100644 --- a/vendor/k8s.io/api/resource/v1beta1/types.go +++ b/vendor/k8s.io/api/resource/v1beta1/types.go @@ -144,6 +144,10 @@ type ResourceSliceSpec struct { Devices []Device `json:"devices" protobuf:"bytes,6,name=devices"` } +// DriverNameMaxLength is the maximum valid length of a driver name in the +// ResourceSliceSpec and other places. It's the same as for CSI driver names. +const DriverNameMaxLength = 63 + // ResourcePool describes the pool that ResourceSlices belong to. type ResourcePool struct { // Name is used to identify the pool. For node-local devices, this diff --git a/vendor/modules.txt b/vendor/modules.txt index 9fd74b3132..05b0fa0ff9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -650,7 +650,7 @@ gopkg.in/natefinch/lumberjack.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 +# k8s.io/api v0.32.3 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -711,7 +711,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.32.2 +# k8s.io/apimachinery v0.32.3 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -776,7 +776,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.32.2 +# k8s.io/apiserver v0.32.3 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -931,7 +931,7 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/client-go v0.32.2 +# k8s.io/client-go v0.32.3 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1270,7 +1270,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.32.2 +# k8s.io/cloud-provider v0.32.3 ## explicit; go 1.23.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1290,7 +1290,7 @@ k8s.io/cloud-provider/names k8s.io/cloud-provider/node/helpers k8s.io/cloud-provider/options k8s.io/cloud-provider/service/helpers -# k8s.io/component-base v0.32.2 +# k8s.io/component-base v0.32.3 ## explicit; go 1.23.0 k8s.io/component-base/cli/flag k8s.io/component-base/cli/globalflag @@ -1320,10 +1320,10 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/zpages/flagz -# k8s.io/component-helpers v0.32.2 +# k8s.io/component-helpers v0.32.3 ## explicit; go 1.23.0 k8s.io/component-helpers/node/util -# k8s.io/controller-manager v0.32.2 +# k8s.io/controller-manager v0.32.3 ## explicit; go 1.23.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -1350,7 +1350,7 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.32.2 +# k8s.io/kms v0.32.3 ## explicit; go 1.23.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 @@ -1377,7 +1377,7 @@ k8s.io/kube-openapi/pkg/validation/errors k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson -# k8s.io/kubelet v0.32.2 +# k8s.io/kubelet v0.32.3 ## explicit; go 1.23.0 k8s.io/kubelet/pkg/apis/credentialprovider k8s.io/kubelet/pkg/apis/credentialprovider/install @@ -1403,8 +1403,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client -# sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.12 -## explicit; go 1.23.1 +# sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.14 +## explicit; go 1.23.0 sigs.k8s.io/cloud-provider-azure/pkg/azclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/mock_accountclient @@ -1488,11 +1488,11 @@ sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualnetworkclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualnetworkclient/mock_virtualnetworkclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualnetworklinkclient sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualnetworklinkclient/mock_virtualnetworklinkclient -# sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.1 -## explicit; go 1.23.2 +# sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.3 +## explicit; go 1.23.0 sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache -# sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1 -## explicit; go 1.23.1 +# sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.4 +## explicit; go 1.23.0 sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader # sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 ## explicit; go 1.21 diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/custom.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/custom.go index 2b73ed9b32..27e5429ac3 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/custom.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/custom.go @@ -19,12 +19,25 @@ package accountclient import ( "context" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage" + "sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics" "sigs.k8s.io/cloud-provider-azure/pkg/azclient/utils" ) -func (client *Client) Create(ctx context.Context, resourceGroupName string, resourceName string, resource *armstorage.AccountCreateParameters) (*armstorage.Account, error) { +const CreateOperationName = "AccountsClient.Create" +const UpdateOperationName = "AccountsClient.Update" +const GetPropertiesOperationName = "AccountsClient.GetProperties" +const DeleteOperationName = "AccountsClient.Delete" +const ListKeysOperationName = "AccountsClient.ListKeys" + +func (client *Client) Create(ctx context.Context, resourceGroupName string, resourceName string, resource *armstorage.AccountCreateParameters) (result *armstorage.Account, err error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "create") + defer func() { metricsCtx.Observe(ctx, err) }() + ctx, endSpan := runtime.StartSpan(ctx, CreateOperationName, client.tracer, nil) + defer endSpan(err) + if resource == nil { resource = &armstorage.AccountCreateParameters{} } @@ -39,6 +52,11 @@ func (client *Client) Create(ctx context.Context, resourceGroupName string, reso } func (client *Client) Update(ctx context.Context, resourceGroupName string, resourceName string, parameters *armstorage.AccountUpdateParameters) (*armstorage.Account, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "update") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, UpdateOperationName, client.tracer, nil) + defer endSpan(nil) + if parameters == nil { parameters = &armstorage.AccountUpdateParameters{} } @@ -50,6 +68,11 @@ func (client *Client) Update(ctx context.Context, resourceGroupName string, reso } func (client *Client) GetProperties(ctx context.Context, resourceGroupName string, accountName string, options *armstorage.AccountsClientGetPropertiesOptions) (*armstorage.Account, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "getProperties") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, GetPropertiesOperationName, client.tracer, nil) + defer endSpan(nil) + resp, err := client.AccountsClient.GetProperties(ctx, resourceGroupName, accountName, options) if err != nil { return nil, err @@ -60,11 +83,21 @@ func (client *Client) GetProperties(ctx context.Context, resourceGroupName strin // Delete deletes a Interface by name. func (client *Client) Delete(ctx context.Context, resourceGroupName string, resourceName string) error { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "delete") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, DeleteOperationName, client.tracer, nil) + defer endSpan(nil) + _, err := client.AccountsClient.Delete(ctx, resourceGroupName, resourceName, nil) return err } func (client *Client) ListKeys(ctx context.Context, resourceGroupName string, accountName string) ([]*armstorage.AccountKey, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "Account", "listKeys") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, ListKeysOperationName, client.tracer, nil) + defer endSpan(nil) + resp, err := client.AccountsClient.ListKeys(ctx, resourceGroupName, accountName, nil) if err != nil { return nil, err diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobcontainerclient/custom.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobcontainerclient/custom.go index f4268df08e..cc5467b0d6 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobcontainerclient/custom.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobcontainerclient/custom.go @@ -19,11 +19,23 @@ package blobcontainerclient import ( "context" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" armstorage "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage" + + "sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics" ) +const ListOperationName = "BlobContainersClient.List" +const CreateOperationName = "BlobContainersClient.Create" +const DeleteOperationName = "BlobContainersClient.Delete" + // List gets a list of BlobContainer in the resource group. func (client *Client) List(ctx context.Context, resourceGroupName string, parentResourceName string) (result []*armstorage.ListContainerItem, rerr error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobContainer", "list") + defer func() { metricsCtx.Observe(ctx, rerr) }() + ctx, endSpan := runtime.StartSpan(ctx, ListOperationName, client.tracer, nil) + defer endSpan(rerr) + pager := client.BlobContainersClient.NewListPager(resourceGroupName, parentResourceName, nil) for pager.More() { nextResult, err := pager.NextPage(ctx) @@ -36,6 +48,11 @@ func (client *Client) List(ctx context.Context, resourceGroupName string, parent } func (client *Client) CreateContainer(ctx context.Context, resourceGroupName, accountName, containerName string, parameters armstorage.BlobContainer) (*armstorage.BlobContainer, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobContainer", "create") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, CreateOperationName, client.tracer, nil) + defer endSpan(nil) + resp, err := client.BlobContainersClient.Create(ctx, resourceGroupName, accountName, containerName, parameters, nil) if err != nil { return nil, err @@ -44,6 +61,11 @@ func (client *Client) CreateContainer(ctx context.Context, resourceGroupName, ac } func (client *Client) DeleteContainer(ctx context.Context, resourceGroupName, accountName, containerName string) error { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobContainer", "delete") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, DeleteOperationName, client.tracer, nil) + defer endSpan(nil) + _, err := client.BlobContainersClient.Delete(ctx, resourceGroupName, accountName, containerName, nil) return err } diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobservicepropertiesclient/custom.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobservicepropertiesclient/custom.go index 42a8fab223..3bc274eb0b 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobservicepropertiesclient/custom.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobservicepropertiesclient/custom.go @@ -19,11 +19,21 @@ package blobservicepropertiesclient import ( "context" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" armstorage "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage" + + "sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics" ) +const GetOperationName = "BlobServicesClient.GetServiceProperties" +const SetOperationName = "BlobServicesClient.SetServiceProperties" + // Get gets the BlobServiceProperties func (client *Client) Get(ctx context.Context, resourceGroupName string, resourceName string) (*armstorage.BlobServiceProperties, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobService", "getServiceProperties") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, GetOperationName, client.tracer, nil) + defer endSpan(nil) resp, err := client.BlobServicesClient.GetServiceProperties(ctx, resourceGroupName, resourceName, nil) if err != nil { @@ -34,6 +44,11 @@ func (client *Client) Get(ctx context.Context, resourceGroupName string, resourc } func (client *Client) Set(ctx context.Context, resourceGroupName string, resourceName string, parameters armstorage.BlobServiceProperties) (*armstorage.BlobServiceProperties, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "BlobService", "setServiceProperties") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, SetOperationName, client.tracer, nil) + defer endSpan(nil) + resp, err := client.BlobServicesClient.SetServiceProperties(ctx, resourceGroupName, resourceName, parameters, nil) if err != nil { return nil, err diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/fileservicepropertiesclient/custom.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/fileservicepropertiesclient/custom.go index 15ea31c91c..c24f51b1c1 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/fileservicepropertiesclient/custom.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/fileservicepropertiesclient/custom.go @@ -19,11 +19,21 @@ package fileservicepropertiesclient import ( "context" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" armstorage "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage" + + "sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics" ) +const GetOperationName = "FileServicesClient.GetServiceProperties" +const SetOperationName = "FileServicesClient.SetServiceProperties" + // Get gets the FileServiceProperties func (client *Client) Get(ctx context.Context, resourceGroupName string, resourceName string) (*armstorage.FileServiceProperties, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileService", "getServiceProperties") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, GetOperationName, client.tracer, nil) + defer endSpan(nil) resp, err := client.FileServicesClient.GetServiceProperties(ctx, resourceGroupName, resourceName, nil) if err != nil { @@ -34,6 +44,11 @@ func (client *Client) Get(ctx context.Context, resourceGroupName string, resourc } func (client *Client) Set(ctx context.Context, resourceGroupName string, resourceName string, parameters armstorage.FileServiceProperties) (*armstorage.FileServiceProperties, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileService", "setServiceProperties") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, SetOperationName, client.tracer, nil) + defer endSpan(nil) + resp, err := client.FileServicesClient.SetServiceProperties(ctx, resourceGroupName, resourceName, parameters, nil) if err != nil { return nil, err diff --git a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/fileshareclient/custom.go b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/fileshareclient/custom.go index b001802f98..55f7bf0887 100644 --- a/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/fileshareclient/custom.go +++ b/vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/fileshareclient/custom.go @@ -25,7 +25,16 @@ import ( "sigs.k8s.io/cloud-provider-azure/pkg/azclient/metrics" ) +const CreateOperationName = "FileSharesClient.Create" +const DeleteOperationName = "FileSharesClient.Delete" +const UpdateOperationName = "FileSharesClient.Update" + func (client *Client) Create(ctx context.Context, resourceGroupName string, resourceName string, parentResourceName string, resource armstorage.FileShare, expand *string) (*armstorage.FileShare, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileShare", "create") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, CreateOperationName, client.tracer, nil) + defer endSpan(nil) + resp, err := client.FileSharesClient.Create(ctx, resourceGroupName, resourceName, parentResourceName, resource, &armstorage.FileSharesClientCreateOptions{ Expand: expand, }) @@ -36,6 +45,11 @@ func (client *Client) Create(ctx context.Context, resourceGroupName string, reso } func (client *Client) Update(ctx context.Context, resourceGroupName string, resourceName string, parentResourceName string, resource armstorage.FileShare) (*armstorage.FileShare, error) { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileShare", "update") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, UpdateOperationName, client.tracer, nil) + defer endSpan(nil) + resp, err := client.FileSharesClient.Update(ctx, resourceGroupName, resourceName, parentResourceName, resource, nil) if err != nil { return nil, err @@ -45,6 +59,11 @@ func (client *Client) Update(ctx context.Context, resourceGroupName string, reso // Delete deletes a FileShare by name. func (client *Client) Delete(ctx context.Context, resourceGroupName string, parentResourceName string, resourceName string, expand *string) error { + metricsCtx := metrics.BeginARMRequest(client.subscriptionID, resourceGroupName, "FileShare", "delete") + defer func() { metricsCtx.Observe(ctx, nil) }() + ctx, endSpan := runtime.StartSpan(ctx, DeleteOperationName, client.tracer, nil) + defer endSpan(nil) + _, err := client.FileSharesClient.Delete(ctx, resourceGroupName, parentResourceName, resourceName, &armstorage.FileSharesClientDeleteOptions{ Include: expand, })