Skip to content

Commit c7d84ac

Browse files
authored
Merge pull request kubernetes#82745 from RainbowMango/pr_migrate_prom_bucket_for_stability
Migrate prometheus bucket functionality for metrics stability framework
2 parents 1d72455 + 65a57d8 commit c7d84ac

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

staging/src/k8s.io/component-base/metrics/prometheus/restclient/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ go_library(
1414
"//staging/src/k8s.io/client-go/tools/metrics:go_default_library",
1515
"//staging/src/k8s.io/component-base/metrics:go_default_library",
1616
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
17-
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
1817
],
1918
)
2019

staging/src/k8s.io/component-base/metrics/prometheus/restclient/metrics.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import (
2020
"net/url"
2121
"time"
2222

23-
"github.com/prometheus/client_golang/prometheus"
24-
2523
"k8s.io/client-go/tools/metrics"
2624
k8smetrics "k8s.io/component-base/metrics"
2725
"k8s.io/component-base/metrics/legacyregistry"
@@ -34,7 +32,7 @@ var (
3432
&k8smetrics.HistogramOpts{
3533
Name: "rest_client_request_duration_seconds",
3634
Help: "Request latency in seconds. Broken down by verb and URL.",
37-
Buckets: prometheus.ExponentialBuckets(0.001, 2, 10),
35+
Buckets: k8smetrics.ExponentialBuckets(0.001, 2, 10),
3836
},
3937
[]string{"verb", "url"},
4038
)
@@ -44,7 +42,7 @@ var (
4442
&k8smetrics.HistogramOpts{
4543
Name: "rest_client_request_latency_seconds",
4644
Help: "(Deprecated) Request latency in seconds. Broken down by verb and URL.",
47-
Buckets: prometheus.ExponentialBuckets(0.001, 2, 10),
45+
Buckets: k8smetrics.ExponentialBuckets(0.001, 2, 10),
4846
},
4947
[]string{"verb", "url"},
5048
)

staging/src/k8s.io/component-base/metrics/prometheus/workqueue/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ go_library(
1010
"//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
1111
"//staging/src/k8s.io/component-base/metrics:go_default_library",
1212
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
13-
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
1413
],
1514
)
1615

staging/src/k8s.io/component-base/metrics/prometheus/workqueue/metrics.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ limitations under the License.
1717
package workqueue
1818

1919
import (
20-
"github.com/prometheus/client_golang/prometheus"
21-
2220
"k8s.io/client-go/util/workqueue"
2321
k8smetrics "k8s.io/component-base/metrics"
2422
"k8s.io/component-base/metrics/legacyregistry"
@@ -56,14 +54,14 @@ var (
5654
Subsystem: WorkQueueSubsystem,
5755
Name: QueueLatencyKey,
5856
Help: "How long in seconds an item stays in workqueue before being requested.",
59-
Buckets: prometheus.ExponentialBuckets(10e-9, 10, 10),
57+
Buckets: k8smetrics.ExponentialBuckets(10e-9, 10, 10),
6058
}, []string{"name"})
6159

6260
workDuration = k8smetrics.NewHistogramVec(&k8smetrics.HistogramOpts{
6361
Subsystem: WorkQueueSubsystem,
6462
Name: WorkDurationKey,
6563
Help: "How long in seconds processing an item from workqueue takes.",
66-
Buckets: prometheus.ExponentialBuckets(10e-9, 10, 10),
64+
Buckets: k8smetrics.ExponentialBuckets(10e-9, 10, 10),
6765
}, []string{"name"})
6866

6967
unfinished = k8smetrics.NewGaugeVec(&k8smetrics.GaugeOpts{

0 commit comments

Comments
 (0)