Skip to content

Commit e918af7

Browse files
knative-automationknative-automation
authored
upgrade to latest dependencies (#959)
bumping google.golang.org/protobuf 7e776d4...0833cf3: > 0833cf3 all: release v1.36.8 > 0af3f0f all: set Go language version to Go 1.23 > 5ccbdec types: regenerate using latest protobuf v32 release > 708d96f all: start v1.36.7-devel bumping knative.dev/pkg e9c8712...8c9c1d3: > 8c9c1d3 [controller] fix depth metrics (# 3253) > 3ec4afe Bump github.com/prometheus/client_golang from 1.23.0 to 1.23.2 (# 3252) > 455d6e9 Bump golang.org/x/sync from 0.16.0 to 0.17.0 in the golang-x group (# 3249) > efb6a4f Add threadiness in log line (# 3247) > eafac73 Bump github.com/prometheus/common from 0.65.0 to 0.66.1 (# 3250) > 528bde3 upgrade to latest dependencies (# 3244) bumping golang.org/x/sync 7fad2c9...04914c2: > 04914c2 all: upgrade go directive to at least 1.24.0 [generated] Signed-off-by: Knative Automation <automation@knative.team>
1 parent 99773f9 commit e918af7

File tree

9 files changed

+36
-24
lines changed

9 files changed

+36
-24
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
k8s.io/code-generator v0.33.4
1212
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
1313
knative.dev/hack v0.0.0-20250902153942-1499de21e119
14-
knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c
14+
knative.dev/pkg v0.0.0-20250909010931-8c9c1d368e4b
1515
)
1616

1717
require (
@@ -48,15 +48,15 @@ require (
4848
golang.org/x/mod v0.27.0 // indirect
4949
golang.org/x/net v0.43.0 // indirect
5050
golang.org/x/oauth2 v0.30.0 // indirect
51-
golang.org/x/sync v0.16.0 // indirect
51+
golang.org/x/sync v0.17.0 // indirect
5252
golang.org/x/sys v0.35.0 // indirect
5353
golang.org/x/term v0.34.0 // indirect
5454
golang.org/x/text v0.28.0 // indirect
5555
golang.org/x/time v0.10.0 // indirect
5656
golang.org/x/tools v0.36.0 // indirect
5757
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
5858
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
59-
google.golang.org/protobuf v1.36.7 // indirect
59+
google.golang.org/protobuf v1.36.8 // indirect
6060
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6161
gopkg.in/inf.v0 v0.9.1 // indirect
6262
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKl
126126
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
127127
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
128128
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
129-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
130-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
129+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
130+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
131131
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
132132
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
133133
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -157,8 +157,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
157157
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
158158
gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
159159
gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
160-
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
161-
google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
160+
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
161+
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
162162
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
163163
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
164164
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -186,8 +186,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
186186
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
187187
knative.dev/hack v0.0.0-20250902153942-1499de21e119 h1:NbQvjnFK1tL489LN0qAybWy0E17Jpziwcv/XIHwfp6M=
188188
knative.dev/hack v0.0.0-20250902153942-1499de21e119/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
189-
knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c h1:l+HQf+byp7MpDz7A4GHyh6U0Yhf/T0A7zbl5EoLGado=
190-
knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c/go.mod h1:sYOVxC0GXfovT2qiExFITWHnk0lm6m3WXrZHTsJvQ5k=
189+
knative.dev/pkg v0.0.0-20250909010931-8c9c1d368e4b h1:Gscoeovr8XvQffYg6l2d7V8M5FuaJg34Hjg8e9sg21Y=
190+
knative.dev/pkg v0.0.0-20250909010931-8c9c1d368e4b/go.mod h1:OLfYBCgDhdEpaC2TEixU3e7byMEQmke/MHP3xsR7Gmo=
191191
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
192192
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
193193
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=

‎vendor/google.golang.org/protobuf/internal/genid/api_gen.go‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/google.golang.org/protobuf/internal/version/version.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/google.golang.org/protobuf/types/descriptorpb/descriptor.pb.go‎

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/knative.dev/pkg/controller/controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ func (c *Impl) RunContext(ctx context.Context, threadiness int) error {
470470
}
471471

472472
// Launch workers to process resources that get enqueued to our workqueue.
473-
c.logger.Info("Starting controller and workers")
473+
c.logger.Infow("Starting controller and workers", zap.Int("threadiness", threadiness))
474474
for range threadiness {
475475
sg.Add(1)
476476
go func() {

‎vendor/knative.dev/pkg/controller/queue_metrics.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,15 @@ func (m *queueMetrics) get(item any) {
8888
m.mu.Lock()
8989
defer m.mu.Unlock()
9090

91-
m.depth.Dec()
92-
m.processingStartTimes[item] = m.clock.Now()
93-
9491
if startTime, exists := m.addTimes[item]; exists {
92+
m.depth.Dec()
9593
m.latency.Observe(m.sinceInSeconds(startTime))
9694
delete(m.addTimes, item)
9795
}
96+
97+
if _, exists := m.processingStartTimes[item]; !exists {
98+
m.processingStartTimes[item] = m.clock.Now()
99+
}
98100
}
99101

100102
func (m *queueMetrics) done(item any) {

‎vendor/knative.dev/pkg/controller/two_lane_queue.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ func (q *twoLaneRateLimitingQueue) slowLane() workqueue.TypedInterface[any] {
223223
// It gets the item from fast lane if it has anything, alternatively
224224
// the slow lane.
225225
func (tlq *twoLaneQueue) Get() (any, bool) {
226-
item, ok := tlq.consumerQueue.Get()
226+
item, shutdown := tlq.consumerQueue.Get()
227227
tlq.metrics.get(item)
228-
return item, ok
228+
return item, shutdown
229229
}
230230

231231
// Len returns the sum of lengths.

‎vendor/modules.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ golang.org/x/net/internal/httpcommon
151151
## explicit; go 1.23.0
152152
golang.org/x/oauth2
153153
golang.org/x/oauth2/internal
154-
# golang.org/x/sync v0.16.0
155-
## explicit; go 1.23.0
154+
# golang.org/x/sync v0.17.0
155+
## explicit; go 1.24.0
156156
golang.org/x/sync/errgroup
157157
# golang.org/x/sys v0.35.0
158158
## explicit; go 1.23.0
@@ -206,8 +206,8 @@ golang.org/x/tools/internal/versions
206206
# gomodules.xyz/jsonpatch/v2 v2.5.0
207207
## explicit; go 1.20
208208
gomodules.xyz/jsonpatch/v2
209-
# google.golang.org/protobuf v1.36.7
210-
## explicit; go 1.22
209+
# google.golang.org/protobuf v1.36.8
210+
## explicit; go 1.23
211211
google.golang.org/protobuf/encoding/prototext
212212
google.golang.org/protobuf/encoding/protowire
213213
google.golang.org/protobuf/internal/descfmt
@@ -721,7 +721,7 @@ k8s.io/utils/trace
721721
# knative.dev/hack v0.0.0-20250902153942-1499de21e119
722722
## explicit; go 1.21
723723
knative.dev/hack
724-
# knative.dev/pkg v0.0.0-20250820014848-e9c87121ec4c
724+
# knative.dev/pkg v0.0.0-20250909010931-8c9c1d368e4b
725725
## explicit; go 1.24.0
726726
knative.dev/pkg/apis
727727
knative.dev/pkg/apis/duck

0 commit comments

Comments
 (0)