diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go b/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go index 1cdb006a44..2a903011b2 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/metrics.go @@ -31,7 +31,7 @@ var ( TransformerOperationalLatencies = prometheus.NewSummaryVec( prometheus.SummaryOpts{ Subsystem: valueSubsystem, - Name: "storage_transformation_latency_microseconds", + Name: "apiserver_storage_transformation_latency_microseconds", Help: "Latency in microseconds of value transformation operations.", }, []string{"transformation_type"}, @@ -47,9 +47,9 @@ func RegisterMetrics() { } func RecordTransformation(transformationType string, start time.Time) { - TransformerOperationalLatencies.WithLabelValues(transformationType).Observe(sinceInMicroseconds(start)) + TransformerOperationalLatencies.WithLabelValues(transformationType).Observe(float64(sinceInMicroseconds(start))) } -func sinceInMicroseconds(start time.Time) float64 { - return float64(time.Since(start).Nanoseconds() / time.Microsecond.Nanoseconds()) +func sinceInMicroseconds(start time.Time) time.Duration { + return time.Since(start) / time.Microsecond } diff --git a/test/integration/master/transformation_testcase.go b/test/integration/master/transformation_testcase.go index 7a88c1a0a9..5e6f4c8dbb 100644 --- a/test/integration/master/transformation_testcase.go +++ b/test/integration/master/transformation_testcase.go @@ -48,7 +48,7 @@ const ( encryptionConfigFileName = "encryption.conf" testNamespace = "secret-encryption-test" testSecret = "test-secret" - latencySummaryMetricsFamily = "value_storage_transformation_latency_microseconds" + latencySummaryMetricsFamily = "value_apiserver_storage_transformation_latency_microseconds" ) type unSealSecret func(cipherText []byte, ctx value.Context, config encryptionconfig.ProviderConfig) ([]byte, error) @@ -241,6 +241,7 @@ func (e *transformTest) readRawRecordFromETCD(path string) (*clientv3.GetRespons } func (e *transformTest) printMetrics() error { + e.logger.Logf("Transformation Metrics:") metrics, err := prometheus.DefaultGatherer.Gather() if err != nil { return fmt.Errorf("failed to gather metrics: %s", err)