diff --git a/pkg/webhooks/handlers/admission.go b/pkg/webhooks/handlers/admission.go index 397fef2bc6..1b23812e30 100644 --- a/pkg/webhooks/handlers/admission.go +++ b/pkg/webhooks/handlers/admission.go @@ -12,7 +12,7 @@ import ( ) 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 { diff --git a/pkg/webhooks/handlers/metrics.go b/pkg/webhooks/handlers/metrics.go index b2d6b1d2b4..481df9cb5d 100644 --- a/pkg/webhooks/handlers/metrics.go +++ b/pkg/webhooks/handlers/metrics.go @@ -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 { meter := global.MeterProvider().Meter(metrics.MeterName) requestsMetric, err := meter.Int64Counter( - "kyverno_http_requests_total", + "kyverno_http_requests", metric.WithDescription("can be used to track the number of http requests"), ) 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( "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) { startTime := time.Now() attributes := []attribute.KeyValue{ - semconv.HTTPRequestContentLengthKey.Int64(request.ContentLength), // semconv.HTTPHostKey.String(request.Host), semconv.HTTPMethodKey.String(request.Method), semconv.HTTPURLKey.String(request.RequestURI),