mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
remove last part of deprecated metrics
This commit is contained in:
parent
2c2e1c5443
commit
606e4503cf
@ -65,18 +65,6 @@ var (
|
||||
[]string{"transformation_type", "transformer_prefix", "status"},
|
||||
)
|
||||
|
||||
deprecatedTransformerFailuresTotal = metrics.NewCounterVec(
|
||||
&metrics.CounterOpts{
|
||||
Namespace: namespace,
|
||||
Subsystem: subsystem,
|
||||
Name: "transformation_failures_total",
|
||||
Help: "Total number of failed transformation operations.",
|
||||
StabilityLevel: metrics.ALPHA,
|
||||
DeprecatedVersion: "1.15.0",
|
||||
},
|
||||
[]string{"transformation_type"},
|
||||
)
|
||||
|
||||
envelopeTransformationCacheMissTotal = metrics.NewCounter(
|
||||
&metrics.CounterOpts{
|
||||
Namespace: namespace,
|
||||
@ -115,7 +103,6 @@ func RegisterMetrics() {
|
||||
registerMetrics.Do(func() {
|
||||
legacyregistry.MustRegister(transformerLatencies)
|
||||
legacyregistry.MustRegister(transformerOperationsTotal)
|
||||
legacyregistry.MustRegister(deprecatedTransformerFailuresTotal)
|
||||
legacyregistry.MustRegister(envelopeTransformationCacheMissTotal)
|
||||
legacyregistry.MustRegister(dataKeyGenerationLatencies)
|
||||
legacyregistry.MustRegister(dataKeyGenerationFailuresTotal)
|
||||
@ -130,8 +117,6 @@ func RecordTransformation(transformationType, transformerPrefix string, start ti
|
||||
switch {
|
||||
case err == nil:
|
||||
transformerLatencies.WithLabelValues(transformationType).Observe(sinceInSeconds(start))
|
||||
default:
|
||||
deprecatedTransformerFailuresTotal.WithLabelValues(transformationType).Inc()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -105,7 +105,6 @@ func TestTotals(t *testing.T) {
|
||||
tt.prefix.TransformToStorage([]byte("value"), nil)
|
||||
tt.prefix.TransformFromStorage([]byte("k8s:enc:kms:v1:value"), nil)
|
||||
defer transformerOperationsTotal.Reset()
|
||||
defer deprecatedTransformerFailuresTotal.Reset()
|
||||
if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(tt.want), tt.metrics...); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
@ -38,17 +38,6 @@ var (
|
||||
[]string{"verb", "url"},
|
||||
)
|
||||
|
||||
// deprecatedRequestLatency is deprecated, please use requestLatency.
|
||||
deprecatedRequestLatency = k8smetrics.NewHistogramVec(
|
||||
&k8smetrics.HistogramOpts{
|
||||
Name: "rest_client_request_latency_seconds",
|
||||
Help: "Request latency in seconds. Broken down by verb and URL.",
|
||||
Buckets: k8smetrics.ExponentialBuckets(0.001, 2, 10),
|
||||
DeprecatedVersion: "1.14.0",
|
||||
},
|
||||
[]string{"verb", "url"},
|
||||
)
|
||||
|
||||
requestResult = k8smetrics.NewCounterVec(
|
||||
&k8smetrics.CounterOpts{
|
||||
Name: "rest_client_requests_total",
|
||||
@ -110,26 +99,23 @@ var (
|
||||
func init() {
|
||||
|
||||
legacyregistry.MustRegister(requestLatency)
|
||||
legacyregistry.MustRegister(deprecatedRequestLatency)
|
||||
legacyregistry.MustRegister(requestResult)
|
||||
legacyregistry.RawMustRegister(execPluginCertTTL)
|
||||
legacyregistry.MustRegister(execPluginCertRotation)
|
||||
metrics.Register(metrics.RegisterOpts{
|
||||
ClientCertExpiry: execPluginCertTTLAdapter,
|
||||
ClientCertRotationAge: &rotationAdapter{m: execPluginCertRotation},
|
||||
RequestLatency: &latencyAdapter{m: requestLatency, dm: deprecatedRequestLatency},
|
||||
RequestLatency: &latencyAdapter{m: requestLatency},
|
||||
RequestResult: &resultAdapter{requestResult},
|
||||
})
|
||||
}
|
||||
|
||||
type latencyAdapter struct {
|
||||
m *k8smetrics.HistogramVec
|
||||
dm *k8smetrics.HistogramVec
|
||||
m *k8smetrics.HistogramVec
|
||||
}
|
||||
|
||||
func (l *latencyAdapter) Observe(verb string, u url.URL, latency time.Duration) {
|
||||
l.m.WithLabelValues(verb, u.String()).Observe(latency.Seconds())
|
||||
l.dm.WithLabelValues(verb, u.String()).Observe(latency.Seconds())
|
||||
}
|
||||
|
||||
type resultAdapter struct {
|
||||
|
Loading…
Reference in New Issue
Block a user