diff --git a/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go b/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go index afa815556..ab1343cd3 100644 --- a/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go +++ b/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go @@ -374,7 +374,7 @@ func (uss *uniformScenarioState) finalReview() { } if uss.evalExecutingMetrics && len(uss.expectedExecuting) > 0 { e := ` - # HELP apiserver_flowcontrol_current_executing_requests [ALPHA] Number of requests currently executing in the API Priority and Fairness system + # HELP apiserver_flowcontrol_current_executing_requests [ALPHA] Number of requests in regular execution phase in the API Priority and Fairness system # TYPE apiserver_flowcontrol_current_executing_requests gauge ` + uss.expectedExecuting err := metrics.GatherAndCompare(e, "apiserver_flowcontrol_current_executing_requests") @@ -386,7 +386,7 @@ func (uss *uniformScenarioState) finalReview() { } if uss.evalExecutingMetrics && len(uss.expectedConcurrencyInUse) > 0 { e := ` - # HELP apiserver_flowcontrol_request_concurrency_in_use [ALPHA] Concurrency (number of seats) occupided by the currently executing requests in the API Priority and Fairness system + # HELP apiserver_flowcontrol_request_concurrency_in_use [ALPHA] Concurrency (number of seats) occupided by the currently executing (all phases count) requests in the API Priority and Fairness system # TYPE apiserver_flowcontrol_request_concurrency_in_use gauge ` + uss.expectedConcurrencyInUse err := metrics.GatherAndCompare(e, "apiserver_flowcontrol_request_concurrency_in_use") diff --git a/pkg/util/flowcontrol/metrics/metrics.go b/pkg/util/flowcontrol/metrics/metrics.go index 365b80931..3ad52c22e 100644 --- a/pkg/util/flowcontrol/metrics/metrics.go +++ b/pkg/util/flowcontrol/metrics/metrics.go @@ -230,7 +230,7 @@ var ( Namespace: namespace, Subsystem: subsystem, Name: "current_executing_requests", - Help: "Number of requests currently executing in the API Priority and Fairness system", + Help: "Number of requests in regular execution phase in the API Priority and Fairness system", StabilityLevel: compbasemetrics.ALPHA, }, []string{priorityLevel, flowSchema}, @@ -240,7 +240,7 @@ var ( Namespace: namespace, Subsystem: subsystem, Name: "request_concurrency_in_use", - Help: "Concurrency (number of seats) occupided by the currently executing requests in the API Priority and Fairness system", + Help: "Concurrency (number of seats) occupided by the currently executing (all phases count) requests in the API Priority and Fairness system", StabilityLevel: compbasemetrics.ALPHA, }, []string{priorityLevel, flowSchema}, @@ -261,7 +261,7 @@ var ( Namespace: namespace, Subsystem: subsystem, Name: "request_execution_seconds", - Help: "Duration of request execution in the API Priority and Fairness system", + Help: "Duration of regular phase of request execution in the API Priority and Fairness system", Buckets: requestDurationSecondsBuckets, StabilityLevel: compbasemetrics.ALPHA, },