github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113325 from panslava/fix-time-since-defer

Browse Source 
Fix time.Since() in defer. Wrap in anonymous function
This commit is contained in:
Kubernetes Prow Robot 2022-10-25 06:42:36 -07:00 committed by GitHub
commit 449c46258b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/credentialprovider/plugin/plugin.go
View File

@ -435,7 +435,9 @@ func (e *execPlugin) ExecPlugin(ctx context.Context, image string) (*credentialp
func (e *execPlugin) runPlugin(ctx context.Context, cmd *exec.Cmd, image string) error { func (e *execPlugin) runPlugin(ctx context.Context, cmd *exec.Cmd, image string) error {
startTime := time.Now() startTime := time.Now()
defer kubeletCredentialProviderPluginDuration.WithLabelValues(e.name).Observe(time.Since(startTime).Seconds()) defer func() {
kubeletCredentialProviderPluginDuration.WithLabelValues(e.name).Observe(time.Since(startTime).Seconds())
}()
err := cmd.Run() err := cmd.Run()
if ctx.Err() != nil { if ctx.Err() != nil {

5
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/compilation.go
View File

@ -101,7 +101,10 @@ func getBaseEnv() (*cel.Env, error) {
// perCallLimit was added for testing purpose only. Callers should always use const PerCallLimit as input. // perCallLimit was added for testing purpose only. Callers should always use const PerCallLimit as input.
func Compile(s *schema.Structural, declType *apiservercel.DeclType, perCallLimit uint64) ([]CompilationResult, error) { func Compile(s *schema.Structural, declType *apiservercel.DeclType, perCallLimit uint64) ([]CompilationResult, error) {
t := time.Now() t := time.Now()
defer metrics.Metrics.ObserveCompilation(time.Since(t)) defer func() {
metrics.Metrics.ObserveCompilation(time.Since(t))
}()
if len(s.Extensions.XValidations) == 0 { if len(s.Extensions.XValidations) == 0 {
return nil, nil return nil, nil
} }

4
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation.go
View File

@ -139,7 +139,9 @@ func validator(s *schema.Structural, isResourceRoot bool, declType *cel.DeclType
// context is passed for supporting context cancellation during cel validation // context is passed for supporting context cancellation during cel validation
func (s *Validator) Validate(ctx context.Context, fldPath *field.Path, sts *schema.Structural, obj, oldObj interface{}, costBudget int64) (errs field.ErrorList, remainingBudget int64) { func (s *Validator) Validate(ctx context.Context, fldPath *field.Path, sts *schema.Structural, obj, oldObj interface{}, costBudget int64) (errs field.ErrorList, remainingBudget int64) {
t := time.Now() t := time.Now()
defer metrics.Metrics.ObserveEvaluation(time.Since(t)) defer func() {
metrics.Metrics.ObserveEvaluation(time.Since(t))
}()
remainingBudget = costBudget remainingBudget = costBudget
if s == nil || obj == nil { if s == nil || obj == nil {
return nil, remainingBudget return nil, remainingBudget