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

Merge pull request #96236 from adtac/apfsnakecase

Browse Source 
APF: use snake_case in metric labels
This commit is contained in:
Kubernetes Prow Robot 2020-11-06 02:20:50 -08:00 committed by GitHub
commit 8f6ffb24df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go
View File

@ -168,7 +168,7 @@ func (uss *uniformScenarioState) exercise() {
for i, uc := range uss.clients { for i, uc := range uss.clients {
uss.integrators[i] = fq.NewIntegrator(uss.clk) uss.integrators[i] = fq.NewIntegrator(uss.clk)
fsName := fmt.Sprintf("client%d", i) fsName := fmt.Sprintf("client%d", i)
uss.expectedInqueue = uss.expectedInqueue + fmt.Sprintf(` apiserver_flowcontrol_current_inqueue_requests{flowSchema=%q,priorityLevel=%q} 0%s`, fsName, uss.name, "\n") uss.expectedInqueue = uss.expectedInqueue + fmt.Sprintf(` apiserver_flowcontrol_current_inqueue_requests{flow_schema=%q,priority_level=%q} 0%s`, fsName, uss.name, "\n")
for j := 0; j < uc.nThreads; j++ { for j := 0; j < uc.nThreads; j++ {
ust := uniformScenarioThread{ ust := uniformScenarioThread{
uss: uss, uss: uss,
@ -311,10 +311,10 @@ func (uss *uniformScenarioState) finalReview() {
for i := range uss.clients { for i := range uss.clients {
fsName := fmt.Sprintf("client%d", i) fsName := fmt.Sprintf("client%d", i)
if atomic.AddInt32(&uss.executions[i], 0) > 0 { if atomic.AddInt32(&uss.executions[i], 0) > 0 {
uss.expectedExecuting = uss.expectedExecuting + fmt.Sprintf(` apiserver_flowcontrol_current_executing_requests{flowSchema=%q,priorityLevel=%q} 0%s`, fsName, uss.name, "\n") uss.expectedExecuting = uss.expectedExecuting + fmt.Sprintf(` apiserver_flowcontrol_current_executing_requests{flow_schema=%q,priority_level=%q} 0%s`, fsName, uss.name, "\n")
} }
if atomic.AddInt32(&uss.rejects[i], 0) > 0 { if atomic.AddInt32(&uss.rejects[i], 0) > 0 {
expectedRejects = expectedRejects + fmt.Sprintf(` apiserver_flowcontrol_rejected_requests_total{flowSchema=%q,priorityLevel=%q,reason=%q} %d%s`, fsName, uss.name, uss.rejectReason, uss.rejects[i], "\n") expectedRejects = expectedRejects + fmt.Sprintf(` apiserver_flowcontrol_rejected_requests_total{flow_schema=%q,priority_level=%q,reason=%q} %d%s`, fsName, uss.name, uss.rejectReason, uss.rejects[i], "\n")
} }
} }
if uss.evalExecutingMetrics && len(uss.expectedExecuting) > 0 { if uss.evalExecutingMetrics && len(uss.expectedExecuting) > 0 {

82
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/metrics/metrics.go
View File

@ -34,8 +34,8 @@ const (
const ( const (
requestKind = "request_kind" requestKind = "request_kind"
priorityLevel = "priorityLevel" priorityLevel = "priority_level"
flowSchema = "flowSchema" flowSchema = "flow_schema"
phase = "phase" phase = "phase"
mark = "mark" mark = "mark"
) )
@ -84,19 +84,21 @@ func (rs Registerables) Append(more ...compbasemetrics.Registerable) Registerabl
var ( var (
apiserverRejectedRequestsTotal = compbasemetrics.NewCounterVec( apiserverRejectedRequestsTotal = compbasemetrics.NewCounterVec(
&compbasemetrics.CounterOpts{ &compbasemetrics.CounterOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "rejected_requests_total", Name: "rejected_requests_total",
Help: "Number of requests rejected by API Priority and Fairness system", Help: "Number of requests rejected by API Priority and Fairness system",
StabilityLevel: compbasemetrics.ALPHA,
}, },
[]string{priorityLevel, flowSchema, "reason"}, []string{priorityLevel, flowSchema, "reason"},
) )
apiserverDispatchedRequestsTotal = compbasemetrics.NewCounterVec( apiserverDispatchedRequestsTotal = compbasemetrics.NewCounterVec(
&compbasemetrics.CounterOpts{ &compbasemetrics.CounterOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "dispatched_requests_total", Name: "dispatched_requests_total",
Help: "Number of requests released by API Priority and Fairness system for service", Help: "Number of requests released by API Priority and Fairness system for service",
StabilityLevel: compbasemetrics.ALPHA,
}, },
[]string{priorityLevel, flowSchema}, []string{priorityLevel, flowSchema},
) )
@ -143,58 +145,64 @@ var (
apiserverCurrentInqueueRequests = compbasemetrics.NewGaugeVec( apiserverCurrentInqueueRequests = compbasemetrics.NewGaugeVec(
&compbasemetrics.GaugeOpts{ &compbasemetrics.GaugeOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "current_inqueue_requests", Name: "current_inqueue_requests",
Help: "Number of requests currently pending in queues of the API Priority and Fairness system", Help: "Number of requests currently pending in queues of the API Priority and Fairness system",
StabilityLevel: compbasemetrics.ALPHA,
}, },
[]string{priorityLevel, flowSchema}, []string{priorityLevel, flowSchema},
) )
apiserverRequestQueueLength = compbasemetrics.NewHistogramVec( apiserverRequestQueueLength = compbasemetrics.NewHistogramVec(
&compbasemetrics.HistogramOpts{ &compbasemetrics.HistogramOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "request_queue_length_after_enqueue", Name: "request_queue_length_after_enqueue",
Help: "Length of queue in the API Priority and Fairness system, as seen by each request after it is enqueued", Help: "Length of queue in the API Priority and Fairness system, as seen by each request after it is enqueued",
Buckets: queueLengthBuckets, Buckets: queueLengthBuckets,
StabilityLevel: compbasemetrics.ALPHA,
}, },
[]string{priorityLevel, flowSchema}, []string{priorityLevel, flowSchema},
) )
apiserverRequestConcurrencyLimit = compbasemetrics.NewGaugeVec( apiserverRequestConcurrencyLimit = compbasemetrics.NewGaugeVec(
&compbasemetrics.GaugeOpts{ &compbasemetrics.GaugeOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "request_concurrency_limit", Name: "request_concurrency_limit",
Help: "Shared concurrency limit in the API Priority and Fairness system", Help: "Shared concurrency limit in the API Priority and Fairness system",
StabilityLevel: compbasemetrics.ALPHA,
}, },
[]string{priorityLevel}, []string{priorityLevel},
) )
apiserverCurrentExecutingRequests = compbasemetrics.NewGaugeVec( apiserverCurrentExecutingRequests = compbasemetrics.NewGaugeVec(
&compbasemetrics.GaugeOpts{ &compbasemetrics.GaugeOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "current_executing_requests", Name: "current_executing_requests",
Help: "Number of requests currently executing in the API Priority and Fairness system", Help: "Number of requests currently executing in the API Priority and Fairness system",
StabilityLevel: compbasemetrics.ALPHA,
}, },
[]string{priorityLevel, flowSchema}, []string{priorityLevel, flowSchema},
) )
apiserverRequestWaitingSeconds = compbasemetrics.NewHistogramVec( apiserverRequestWaitingSeconds = compbasemetrics.NewHistogramVec(
&compbasemetrics.HistogramOpts{ &compbasemetrics.HistogramOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "request_wait_duration_seconds", Name: "request_wait_duration_seconds",
Help: "Length of time a request spent waiting in its queue", Help: "Length of time a request spent waiting in its queue",
Buckets: requestDurationSecondsBuckets, Buckets: requestDurationSecondsBuckets,
StabilityLevel: compbasemetrics.ALPHA,
}, },
[]string{priorityLevel, flowSchema, "execute"}, []string{priorityLevel, flowSchema, "execute"},
) )
apiserverRequestExecutionSeconds = compbasemetrics.NewHistogramVec( apiserverRequestExecutionSeconds = compbasemetrics.NewHistogramVec(
&compbasemetrics.HistogramOpts{ &compbasemetrics.HistogramOpts{
Namespace: namespace, Namespace: namespace,
Subsystem: subsystem, Subsystem: subsystem,
Name: "request_execution_seconds", Name: "request_execution_seconds",
Help: "Duration of request execution in the API Priority and Fairness system", Help: "Duration of request execution in the API Priority and Fairness system",
Buckets: requestDurationSecondsBuckets, Buckets: requestDurationSecondsBuckets,
StabilityLevel: compbasemetrics.ALPHA,
}, },
[]string{priorityLevel, flowSchema}, []string{priorityLevel, flowSchema},
) )

5
staging/src/k8s.io/component-base/metrics/testutil/promlint.go
View File

@ -33,11 +33,6 @@ var exceptionMetrics = []string{
// k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server/egressselector // k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server/egressselector
"apiserver_egress_dialer_dial_failure_count", // counter metrics should have "_total" suffix "apiserver_egress_dialer_dial_failure_count", // counter metrics should have "_total" suffix
// k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset
"apiserver_flowcontrol_current_inqueue_requests", // label names should be written in 'snake_case' not 'camelCase',
"apiserver_flowcontrol_current_executing_requests", // label names should be written in 'snake_case' not 'camelCase'
"apiserver_flowcontrol_rejected_requests_total", // label names should be written in 'snake_case' not 'camelCase'
// k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server/healthz // k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server/healthz
"apiserver_request_total", // label names should be written in 'snake_case' not 'camelCase' "apiserver_request_total", // label names should be written in 'snake_case' not 'camelCase'

2
test/integration/apiserver/flowcontrol/concurrency_test.go
View File

@ -45,7 +45,7 @@ const (
sharedConcurrencyMetricsName = "apiserver_flowcontrol_request_concurrency_limit" sharedConcurrencyMetricsName = "apiserver_flowcontrol_request_concurrency_limit"
dispatchedRequestCountMetricsName = "apiserver_flowcontrol_dispatched_requests_total" dispatchedRequestCountMetricsName = "apiserver_flowcontrol_dispatched_requests_total"
rejectedRequestCountMetricsName = "apiserver_flowcontrol_rejected_requests_total" rejectedRequestCountMetricsName = "apiserver_flowcontrol_rejected_requests_total"
labelPriorityLevel = "priorityLevel" labelPriorityLevel = "priority_level"
timeout = time.Second * 10 timeout = time.Second * 10
) )