Skip to content

Commit 5774096

Browse files
jefferbrechtjefferbrecht
committed
Update dependencies
1 parent 522fcab commit 5774096

4 files changed

Lines changed: 199 additions & 178 deletions

File tree

‎cmd/prometheus/main.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ import (
5454
"go.uber.org/atomic"
5555
"go.uber.org/automaxprocs/maxprocs"
5656
"k8s.io/klog"
57-
klogv2 "k8s.io/klog/v2"
5857

5958
"github.com/prometheus/prometheus/config"
6059
"github.com/prometheus/prometheus/discovery"
@@ -632,8 +631,6 @@ func main() {
632631
// Above level 6, the k8s client would log bearer tokens in clear-text.
633632
klog.ClampLevel(6)
634633
klog.SetLogger(log.With(logger, "component", "k8s_client_runtime"))
635-
klogv2.ClampLevel(6)
636-
klogv2.SetLogger(log.With(logger, "component", "k8s_client_runtime"))
637634

638635
modeAppName := "Prometheus Server"
639636
mode := "server"

‎discovery/kubernetes/kubernetes.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ func (d *Discovery) newEndpointSlicesByNodeInformer(plw *cache.ListWatch, object
859859

860860
func (d *Discovery) informerWatchErrorHandler(r *cache.Reflector, err error) {
861861
d.metrics.failuresCount.Inc()
862-
cache.DefaultWatchErrorHandler(r, err)
862+
cache.DefaultWatchErrorHandler(context.Background(), r, err)
863863
}
864864

865865
func (d *Discovery) mustNewSharedInformer(lw cache.ListerWatcher, exampleObject runtime.Object, defaultEventHandlerResyncPeriod time.Duration) cache.SharedInformer {

‎go.mod‎

Lines changed: 62 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/prometheus/prometheus
22

3-
go 1.21.0
4-
5-
toolchain go1.22.5
3+
go 1.25.0
64

75
require (
86
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0
@@ -20,8 +18,8 @@ require (
2018
github.com/digitalocean/godo v1.118.0
2119
github.com/docker/docker v27.0.3+incompatible
2220
github.com/edsrzf/mmap-go v1.1.0
23-
github.com/envoyproxy/go-control-plane v0.12.0
24-
github.com/envoyproxy/protoc-gen-validate v1.0.4
21+
github.com/envoyproxy/go-control-plane/envoy v1.36.0
22+
github.com/envoyproxy/protoc-gen-validate v1.3.0
2523
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
2624
github.com/fsnotify/fsnotify v1.7.0
2725
github.com/go-kit/log v0.2.1
@@ -30,8 +28,8 @@ require (
3028
github.com/go-zookeeper/zk v1.0.3
3129
github.com/gogo/protobuf v1.3.2
3230
github.com/golang/snappy v0.0.4
33-
github.com/google/go-cmp v0.6.0
34-
github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da
31+
github.com/google/go-cmp v0.7.0
32+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6
3533
github.com/google/uuid v1.6.0
3634
github.com/gophercloud/gophercloud v1.13.0
3735
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
@@ -53,98 +51,96 @@ require (
5351
github.com/ovh/go-ovh v1.6.0
5452
github.com/prometheus/alertmanager v0.27.0
5553
github.com/prometheus/client_golang v1.19.1
56-
github.com/prometheus/client_model v0.6.1
54+
github.com/prometheus/client_model v0.6.2
5755
github.com/prometheus/common v0.55.0
5856
github.com/prometheus/common/assets v0.2.0
5957
github.com/prometheus/common/sigv4 v0.1.0
6058
github.com/prometheus/exporter-toolkit v0.11.0
6159
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29
6260
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c
63-
github.com/stretchr/testify v1.9.0
61+
github.com/stretchr/testify v1.11.1
6462
github.com/vultr/govultr/v2 v2.17.2
6563
go.opentelemetry.io/collector/pdata v1.12.0
6664
go.opentelemetry.io/collector/semconv v0.105.0
6765
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
68-
go.opentelemetry.io/otel v1.28.0
69-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0
70-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0
71-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0
72-
go.opentelemetry.io/otel/sdk v1.28.0
73-
go.opentelemetry.io/otel/trace v1.28.0
66+
go.opentelemetry.io/otel v1.42.0
67+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0
68+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0
69+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.42.0
70+
go.opentelemetry.io/otel/sdk v1.42.0
71+
go.opentelemetry.io/otel/trace v1.42.0
7472
go.uber.org/atomic v1.11.0
7573
go.uber.org/automaxprocs v1.5.3
7674
go.uber.org/goleak v1.3.0
7775
go.uber.org/multierr v1.11.0
78-
golang.org/x/net v0.27.0
79-
golang.org/x/oauth2 v0.21.0
80-
golang.org/x/sync v0.7.0
81-
golang.org/x/sys v0.22.0
82-
golang.org/x/text v0.16.0
83-
golang.org/x/time v0.5.0
84-
golang.org/x/tools v0.23.0
76+
golang.org/x/net v0.51.0
77+
golang.org/x/oauth2 v0.35.0
78+
golang.org/x/sync v0.19.0
79+
golang.org/x/sys v0.41.0
80+
golang.org/x/text v0.34.0
81+
golang.org/x/time v0.9.0
82+
golang.org/x/tools v0.41.0
8583
google.golang.org/api v0.188.0
86-
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d
87-
google.golang.org/grpc v1.65.0
88-
google.golang.org/protobuf v1.34.2
84+
google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57
85+
google.golang.org/grpc v1.79.2
86+
google.golang.org/protobuf v1.36.11
8987
gopkg.in/yaml.v2 v2.4.0
9088
gopkg.in/yaml.v3 v3.0.1
91-
k8s.io/api v0.29.3
92-
k8s.io/apimachinery v0.29.3
93-
k8s.io/client-go v0.29.3
89+
k8s.io/api v0.35.2
90+
k8s.io/apimachinery v0.35.2
91+
k8s.io/client-go v0.35.2
9492
k8s.io/klog v1.0.0
95-
k8s.io/klog/v2 v2.130.1
9693
)
9794

9895
require (
9996
cloud.google.com/go/auth v0.7.0 // indirect
10097
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
101-
cloud.google.com/go/compute/metadata v0.4.0 // indirect
98+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
10299
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
103100
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
104101
github.com/Microsoft/go-winio v0.6.1 // indirect
105102
github.com/armon/go-metrics v0.4.1 // indirect
106103
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
107104
github.com/beorn7/perks v1.0.1 // indirect
108-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
105+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
109106
github.com/cilium/ebpf v0.11.0 // indirect
110-
github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b // indirect
107+
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
111108
github.com/containerd/cgroups/v3 v3.0.3 // indirect
112109
github.com/containerd/log v0.1.0 // indirect
113110
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
114111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
115112
github.com/distribution/reference v0.5.0 // indirect
116113
github.com/docker/go-connections v0.4.0 // indirect
117114
github.com/docker/go-units v0.5.0 // indirect
118-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
119-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
115+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
120116
github.com/fatih/color v1.16.0 // indirect
121117
github.com/felixge/httpsnoop v1.0.4 // indirect
118+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
122119
github.com/ghodss/yaml v1.0.0 // indirect
123120
github.com/go-kit/kit v0.12.0 // indirect
124-
github.com/go-logr/logr v1.4.2 // indirect
121+
github.com/go-logr/logr v1.4.3 // indirect
125122
github.com/go-logr/stdr v1.2.2 // indirect
126123
github.com/go-openapi/analysis v0.22.2 // indirect
127124
github.com/go-openapi/errors v0.22.0 // indirect
128-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
125+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
129126
github.com/go-openapi/jsonreference v0.20.4 // indirect
130127
github.com/go-openapi/loads v0.21.5 // indirect
131128
github.com/go-openapi/spec v0.20.14 // indirect
132-
github.com/go-openapi/swag v0.22.9 // indirect
129+
github.com/go-openapi/swag v0.23.0 // indirect
133130
github.com/go-openapi/validate v0.23.0 // indirect
134131
github.com/go-resty/resty/v2 v2.13.1 // indirect
135132
github.com/godbus/dbus/v5 v5.0.4 // indirect
136133
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
137-
github.com/golang/glog v1.2.1 // indirect
134+
github.com/golang/glog v1.2.5 // indirect
138135
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
139136
github.com/golang/protobuf v1.5.4 // indirect
140-
github.com/google/gnostic-models v0.6.8 // indirect
137+
github.com/google/gnostic-models v0.7.0 // indirect
141138
github.com/google/go-querystring v1.1.0 // indirect
142-
github.com/google/gofuzz v1.2.0 // indirect
143139
github.com/google/s2a-go v0.1.7 // indirect
144140
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
145141
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
146-
github.com/gorilla/websocket v1.5.0 // indirect
147-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
142+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
143+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
148144
github.com/hashicorp/cronexpr v1.1.2 // indirect
149145
github.com/hashicorp/errwrap v1.1.0 // indirect
150146
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -155,7 +151,6 @@ require (
155151
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
156152
github.com/hashicorp/golang-lru v0.6.0 // indirect
157153
github.com/hashicorp/serf v0.10.1 // indirect
158-
github.com/imdario/mergo v0.3.16 // indirect
159154
github.com/jmespath/go-jmespath v0.4.0 // indirect
160155
github.com/josharian/intern v1.0.0 // indirect
161156
github.com/jpillora/backoff v1.0.0 // indirect
@@ -169,43 +164,50 @@ require (
169164
github.com/moby/docker-image-spec v1.3.1 // indirect
170165
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
171166
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
172-
github.com/modern-go/reflect2 v1.0.2 // indirect
167+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
173168
github.com/morikuni/aec v1.0.0 // indirect
174169
github.com/opencontainers/go-digest v1.0.0 // indirect
175170
github.com/opencontainers/image-spec v1.0.2 // indirect
176171
github.com/opencontainers/runtime-spec v1.0.2 // indirect
177172
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
178173
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
179174
github.com/pkg/errors v0.9.1 // indirect
175+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
180176
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
181177
github.com/prometheus/procfs v0.15.1 // indirect
182178
github.com/sirupsen/logrus v1.9.3 // indirect
183-
github.com/spf13/pflag v1.0.5 // indirect
179+
github.com/spf13/pflag v1.0.9 // indirect
184180
github.com/stretchr/objx v0.5.2 // indirect
181+
github.com/x448/float16 v0.8.4 // indirect
185182
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
186183
go.mongodb.org/mongo-driver v1.14.0 // indirect
187184
go.opencensus.io v0.24.0 // indirect
188-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
189-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
190-
golang.org/x/crypto v0.25.0 // indirect
185+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
186+
go.opentelemetry.io/otel/metric v1.42.0 // indirect
187+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
188+
go.yaml.in/yaml/v2 v2.4.3 // indirect
189+
go.yaml.in/yaml/v3 v3.0.4 // indirect
190+
golang.org/x/crypto v0.48.0 // indirect
191191
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
192-
golang.org/x/mod v0.19.0 // indirect
193-
golang.org/x/term v0.22.0 // indirect
194-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
192+
golang.org/x/mod v0.32.0 // indirect
193+
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
194+
golang.org/x/term v0.40.0 // indirect
195+
golang.org/x/tools/godoc v0.1.0-deprecated // indirect
196+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect
197+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
195198
gopkg.in/inf.v0 v0.9.1 // indirect
196199
gopkg.in/ini.v1 v1.67.0 // indirect
197200
gotest.tools/v3 v3.0.3 // indirect
198-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
199-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
200-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
201-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
202-
sigs.k8s.io/yaml v1.3.0 // indirect
201+
k8s.io/klog/v2 v2.130.1 // indirect
202+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
203+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
204+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
205+
sigs.k8s.io/randfill v1.0.0 // indirect
206+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
207+
sigs.k8s.io/yaml v1.6.0 // indirect
203208
)
204209

205-
replace (
206-
k8s.io/klog => github.com/simonpasquier/klog-gokit v0.3.0
207-
k8s.io/klog/v2 => github.com/simonpasquier/klog-gokit/v3 v3.3.0
208-
)
210+
replace k8s.io/klog => github.com/simonpasquier/klog-gokit v0.3.0
209211

210212
// Exclude linodego v1.0.0 as it is no longer published on github.
211213
exclude github.com/linode/linodego v1.0.0

0 commit comments

Comments
 (0)