Skip to content

Commit a8f2fea

Browse files
committed
remove deprecated metrics of proxy
1 parent 8ae3f80 commit a8f2fea

File tree

5 files changed

+0
-28
lines changed

5 files changed

+0
-28
lines changed

pkg/proxy/iptables/proxier.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,6 @@ func (proxier *Proxier) syncProxyRules() {
793793
start := time.Now()
794794
defer func() {
795795
metrics.SyncProxyRulesLatency.Observe(metrics.SinceInSeconds(start))
796-
metrics.DeprecatedSyncProxyRulesLatency.Observe(metrics.SinceInMicroseconds(start))
797796
klog.V(4).Infof("syncProxyRules took %v", time.Since(start))
798797
}()
799798

pkg/proxy/ipvs/proxier.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,6 @@ func (proxier *Proxier) syncProxyRules() {
10201020
start := time.Now()
10211021
defer func() {
10221022
metrics.SyncProxyRulesLatency.Observe(metrics.SinceInSeconds(start))
1023-
metrics.DeprecatedSyncProxyRulesLatency.Observe(metrics.SinceInMicroseconds(start))
10241023
klog.V(4).Infof("syncProxyRules took %v", time.Since(start))
10251024
}()
10261025

pkg/proxy/metrics/metrics.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,6 @@ var (
3838
},
3939
)
4040

41-
// DeprecatedSyncProxyRulesLatency is the latency of one round of kube-proxy syncing proxy rules.
42-
DeprecatedSyncProxyRulesLatency = metrics.NewHistogram(
43-
&metrics.HistogramOpts{
44-
Subsystem: kubeProxySubsystem,
45-
Name: "sync_proxy_rules_latency_microseconds",
46-
Help: "SyncProxyRules latency in microseconds",
47-
Buckets: metrics.ExponentialBuckets(1000, 2, 15),
48-
StabilityLevel: metrics.ALPHA,
49-
DeprecatedVersion: "1.14.0",
50-
},
51-
)
52-
5341
// SyncProxyRulesLastTimestamp is the timestamp proxy rules were last
5442
// successfully synced.
5543
SyncProxyRulesLastTimestamp = metrics.NewGauge(
@@ -145,7 +133,6 @@ var registerMetricsOnce sync.Once
145133
func RegisterMetrics() {
146134
registerMetricsOnce.Do(func() {
147135
legacyregistry.MustRegister(SyncProxyRulesLatency)
148-
legacyregistry.MustRegister(DeprecatedSyncProxyRulesLatency)
149136
legacyregistry.MustRegister(SyncProxyRulesLastTimestamp)
150137
legacyregistry.MustRegister(NetworkProgrammingLatency)
151138
legacyregistry.MustRegister(EndpointChangesPending)

pkg/proxy/winkernel/metrics.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,6 @@ var (
3636
},
3737
)
3838

39-
DeprecatedSyncProxyRulesLatency = metrics.NewHistogram(
40-
&metrics.HistogramOpts{
41-
Subsystem: kubeProxySubsystem,
42-
Name: "sync_proxy_rules_latency_microseconds",
43-
Help: "SyncProxyRules latency in microseconds",
44-
Buckets: metrics.ExponentialBuckets(1000, 2, 15),
45-
StabilityLevel: metrics.ALPHA,
46-
DeprecatedVersion: "1.14.0",
47-
},
48-
)
49-
5039
// SyncProxyRulesLastTimestamp is the timestamp proxy rules were last
5140
// successfully synced.
5241
SyncProxyRulesLastTimestamp = metrics.NewGauge(
@@ -64,7 +53,6 @@ var registerMetricsOnce sync.Once
6453
func RegisterMetrics() {
6554
registerMetricsOnce.Do(func() {
6655
legacyregistry.MustRegister(SyncProxyRulesLatency)
67-
legacyregistry.MustRegister(DeprecatedSyncProxyRulesLatency)
6856
legacyregistry.MustRegister(SyncProxyRulesLastTimestamp)
6957
})
7058
}

pkg/proxy/winkernel/proxier.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,6 @@ func (proxier *Proxier) syncProxyRules() {
10021002
start := time.Now()
10031003
defer func() {
10041004
SyncProxyRulesLatency.Observe(metrics.SinceInSeconds(start))
1005-
DeprecatedSyncProxyRulesLatency.Observe(metrics.SinceInMicroseconds(start))
10061005
klog.V(4).Infof("syncProxyRules took %v", time.Since(start))
10071006
}()
10081007
// don't sync rules till we've received services and endpoints

0 commit comments

Comments
 (0)