Skip to content

Commit 10832db

Browse files
committed
Run go mod tidy and adapt to prometheus/common v0.67 API
1 parent a09305b commit 10832db

1,806 files changed

Lines changed: 80833 additions & 104948 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

go.mod

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ module k8s.io/node-problem-detector
33
go 1.25.8
44

55
require (
6-
cloud.google.com/go/compute/metadata v0.8.0
6+
cloud.google.com/go/compute/metadata v0.9.0
77
contrib.go.opencensus.io/exporter/prometheus v0.4.2
88
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
99
github.com/acobaugh/osrelease v0.1.0
1010
github.com/avast/retry-go/v4 v4.6.1
11-
github.com/coreos/go-systemd/v22 v22.5.0
11+
github.com/coreos/go-systemd/v22 v22.6.0
1212
github.com/euank/go-kmsg-parser v2.0.0+incompatible
1313
github.com/hpcloud/tail v1.0.0
1414
github.com/prometheus/client_model v0.6.2
@@ -37,7 +37,7 @@ require (
3737
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
3838
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3939
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
40-
github.com/ebitengine/purego v0.8.4 // indirect
40+
github.com/ebitengine/purego v0.9.1 // indirect
4141
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
4242
github.com/felixge/httpsnoop v1.0.4 // indirect
4343
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
@@ -69,22 +69,20 @@ require (
6969
github.com/googleapis/gax-go/v2 v2.18.0 // indirect
7070
github.com/jmespath/go-jmespath v0.4.0 // indirect
7171
github.com/json-iterator/go v1.1.12 // indirect
72-
github.com/klauspost/compress v1.17.9 // indirect
7372
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
7473
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7574
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7675
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
77-
github.com/pkg/errors v0.9.1 // indirect
7876
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7977
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
8078
github.com/prometheus/client_golang v1.23.2 // indirect
8179
github.com/prometheus/prometheus v0.311.3 // indirect
8280
github.com/prometheus/statsd_exporter v0.22.7 // indirect
83-
github.com/tklauser/go-sysconf v0.3.15 // indirect
84-
github.com/tklauser/numcpus v0.10.0 // indirect
81+
github.com/tklauser/go-sysconf v0.3.16 // indirect
82+
github.com/tklauser/numcpus v0.11.0 // indirect
8583
github.com/x448/float16 v0.8.4 // indirect
8684
github.com/yusufpapurcu/wmi v1.2.4 // indirect
87-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
85+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
8886
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
8987
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
9088
go.opentelemetry.io/otel v1.42.0 // indirect
@@ -110,8 +108,8 @@ require (
110108
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
111109
gopkg.in/yaml.v2 v2.4.0 // indirect
112110
gopkg.in/yaml.v3 v3.0.1 // indirect
113-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
114-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
111+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
112+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
115113
sigs.k8s.io/randfill v1.0.0 // indirect
116114
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
117115
sigs.k8s.io/yaml v1.6.0 // indirect

go.sum

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
5757
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
5858
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
5959
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
60-
github.com/avast/retry-go/v4 v4.7.0 h1:yjDs35SlGvKwRNSykujfjdMxMhMQQM0TnIjJaHB+Zio=
61-
github.com/avast/retry-go/v4 v4.7.0/go.mod h1:ZMPDa3sY2bKgpLtap9JRUgk2yTAba7cgiFhqxY2Sg6Q=
60+
github.com/avast/retry-go/v4 v4.6.1 h1:VkOLRubHdisGrHnTu89g08aQEWEgRU7LVEop3GbIcMk=
61+
github.com/avast/retry-go/v4 v4.6.1/go.mod h1:V6oF8njAwxJ5gRo1Q7Cxab24xs5NCWZBeaHHBklR8mA=
6262
github.com/aws/aws-sdk-go v1.44.72 h1:i7J5XT7pjBjtl1OrdIhiQHzsG89wkZCcM1HhyK++3DI=
6363
github.com/aws/aws-sdk-go v1.44.72/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
6464
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -293,7 +293,6 @@ github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
293293
github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
294294
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
295295
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
296-
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
297296
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
298297
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
299298
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
@@ -707,8 +706,8 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
707706
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
708707
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
709708
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
710-
gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
711-
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
709+
gopkg.in/evanphx/json-patch.v4 v4.13.0 h1:czT3CmqEaQ1aanPc5SdlgQrrEIb8w/wwCvWWnfEbYzo=
710+
gopkg.in/evanphx/json-patch.v4 v4.13.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
712711
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
713712
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
714713
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=

pkg/util/metrics/helpers.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
pcm "github.com/prometheus/client_model/go"
2424
"github.com/prometheus/common/expfmt"
25+
"github.com/prometheus/common/model"
2526
"go.opencensus.io/tag"
2627
)
2728

@@ -72,7 +73,7 @@ func getTagKeysFromNames(tagNames []string) ([]tag.Key, error) {
7273
func ParsePrometheusMetrics(metricsText string) ([]Float64MetricRepresentation, error) {
7374
var metrics []Float64MetricRepresentation
7475

75-
var textParser expfmt.TextParser
76+
textParser := expfmt.NewTextParser(model.UTF8Validation)
7677
metricsText = strings.ReplaceAll(metricsText, "\r", "")
7778
metricFamilies, err := textParser.TextToMetricFamilies(strings.NewReader(metricsText))
7879
if err != nil {

test/go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace k8s.io/node-problem-detector => ../.
77
require (
88
github.com/avast/retry-go/v4 v4.6.1
99
github.com/onsi/ginkgo v1.16.5
10-
github.com/onsi/gomega v1.37.0
10+
github.com/onsi/gomega v1.38.2
1111
github.com/pborman/uuid v1.2.1
1212
github.com/spf13/pflag v1.0.10
1313
golang.org/x/crypto v0.49.0
@@ -23,7 +23,7 @@ require (
2323
require (
2424
cloud.google.com/go/auth v0.18.2 // indirect
2525
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
26-
cloud.google.com/go/compute/metadata v0.8.0 // indirect
26+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
2727
github.com/beorn7/perks v1.0.1 // indirect
2828
github.com/blang/semver/v4 v4.0.0 // indirect
2929
github.com/bombsimon/logrusr/v4 v4.1.0 // indirect
@@ -46,7 +46,7 @@ require (
4646
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4747
github.com/nxadm/tail v1.4.8 // indirect
4848
github.com/pelletier/go-toml v1.9.3 // indirect
49-
github.com/prometheus/client_golang v1.22.0 // indirect
49+
github.com/prometheus/client_golang v1.23.2 // indirect
5050
github.com/prometheus/client_model v0.6.2 // indirect
5151
github.com/prometheus/common v0.67.5 // indirect
5252
github.com/prometheus/procfs v0.19.2 // indirect
@@ -75,8 +75,7 @@ require (
7575
gopkg.in/ini.v1 v1.62.0 // indirect
7676
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
7777
gopkg.in/yaml.v2 v2.4.0 // indirect
78-
gopkg.in/yaml.v3 v3.0.1 // indirect
79-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
78+
k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2 // indirect
8079
sigs.k8s.io/controller-runtime v0.16.5 // indirect
8180
sigs.k8s.io/prow v0.0.0-20240619181241-cfb8754e0459 // indirect
8281
sigs.k8s.io/yaml v1.6.0 // indirect

0 commit comments

Comments
 (0)