mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

fix: http request metrics (#7197)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
This commit is contained in:
Charles-Edouard Brétéché 2023-05-15 21:26:17 +02:00 • committed by GitHub
parent a3f3636bec
commit 03df0f83a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/webhooks/handlers/admission.go
View file

@ -12,7 +12,7 @@ import (
) )
func (inner AdmissionHandler) WithAdmission(logger logr.Logger) HttpHandler { func (inner AdmissionHandler) WithAdmission(logger logr.Logger) HttpHandler {
return inner.withAdmission(logger).WithTrace("ADMISSION") return inner.withAdmission(logger).WithMetrics(logger).WithTrace("ADMISSION")
} }
func (inner AdmissionHandler) withAdmission(logger logr.Logger) HttpHandler { func (inner AdmissionHandler) withAdmission(logger logr.Logger) HttpHandler {

5
pkg/webhooks/handlers/metrics.go
View file

@ -69,11 +69,11 @@ func (inner HttpHandler) WithMetrics(logger logr.Logger, attrs ...attribute.KeyV
func (inner HttpHandler) withMetrics(logger logr.Logger, attrs ...attribute.KeyValue) HttpHandler { func (inner HttpHandler) withMetrics(logger logr.Logger, attrs ...attribute.KeyValue) HttpHandler {
meter := global.MeterProvider().Meter(metrics.MeterName) meter := global.MeterProvider().Meter(metrics.MeterName)
requestsMetric, err := meter.Int64Counter( requestsMetric, err := meter.Int64Counter(
"kyverno_http_requests_total", "kyverno_http_requests",
metric.WithDescription("can be used to track the number of http requests"), metric.WithDescription("can be used to track the number of http requests"),
) )
if err != nil { if err != nil {
logger.Error(err, "Failed to create instrument, kyverno_http_requests_total") logger.Error(err, "Failed to create instrument, kyverno_http_requests")
} }
durationMetric, err := meter.Float64Histogram( durationMetric, err := meter.Float64Histogram(
"kyverno_http_requests_duration_seconds", "kyverno_http_requests_duration_seconds",
@ -85,7 +85,6 @@ func (inner HttpHandler) withMetrics(logger logr.Logger, attrs ...attribute.KeyV
return func(writer http.ResponseWriter, request *http.Request) { return func(writer http.ResponseWriter, request *http.Request) {
startTime := time.Now() startTime := time.Now()
attributes := []attribute.KeyValue{ attributes := []attribute.KeyValue{
semconv.HTTPRequestContentLengthKey.Int64(request.ContentLength),
// semconv.HTTPHostKey.String(request.Host), // semconv.HTTPHostKey.String(request.Host),
semconv.HTTPMethodKey.String(request.Method), semconv.HTTPMethodKey.String(request.Method),
semconv.HTTPURLKey.String(request.RequestURI), semconv.HTTPURLKey.String(request.RequestURI),