Skip to content

Commit 2fe8547

Browse files
upgrade to latest dependencies (#873)
bumping knative.dev/networking 7dad473...3fcdea3: > 3fcdea3 upgrade to latest dependencies (# 1083) bumping knative.dev/pkg 9aa1144...077dcf0: > 077dcf0 [release-1.19] [controller] fix depth metrics (# 3254) Signed-off-by: Knative Automation <[email protected]>
1 parent 5c62c6c commit 2fe8547

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ require (
1313
k8s.io/code-generator v0.33.4
1414
k8s.io/utils v0.0.0-20241210054802-24370beab758
1515
knative.dev/hack v0.0.0-20250902154142-af735b2738d6
16-
knative.dev/networking v0.0.0-20250902160145-7dad473f6351
17-
knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68
16+
knative.dev/networking v0.0.0-20250912164322-3fcdea3327b7
17+
knative.dev/pkg v0.0.0-20250909011231-077dcf0d00e8
1818
sigs.k8s.io/gateway-api v1.2.1
1919
sigs.k8s.io/yaml v1.6.0
2020
)

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,10 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
259259
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
260260
knative.dev/hack v0.0.0-20250902154142-af735b2738d6 h1:JYZgO9bni32T+BB5v6WpeRFm1hjj+EypBLZCk6HZBt0=
261261
knative.dev/hack v0.0.0-20250902154142-af735b2738d6/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
262-
knative.dev/networking v0.0.0-20250902160145-7dad473f6351 h1:Gv/UqbN0AK+ORoT5e2Kg+3+uMW/y9CCdhpXKxYaVV6k=
263-
knative.dev/networking v0.0.0-20250902160145-7dad473f6351/go.mod h1:P/fAhhVDgmLt1ugFX8vBvdSDiUOw2P4SGcjbzoZ02Xw=
264-
knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68 h1:QlgJtxC1LtNf9k1OMSHdr3dq+HjtOOmB/SV/SklVt2k=
265-
knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68/go.mod h1:a1amDzo4YIUNuGeDgEz/uDHs5MQVYI1DXnRnEpWCAts=
262+
knative.dev/networking v0.0.0-20250912164322-3fcdea3327b7 h1:znAKzAIZRONj/3/sj29h3LymPvXc58nsF6P/8yDqEwc=
263+
knative.dev/networking v0.0.0-20250912164322-3fcdea3327b7/go.mod h1:+yUXx0sIKx5tzyW10GFcUSTfhuxNJhaGgvpXcv6PeHI=
264+
knative.dev/pkg v0.0.0-20250909011231-077dcf0d00e8 h1:n0BMHXIem9MyDkK4vfA4Vzdxaf1e+EeLJ6k+8exCjjI=
265+
knative.dev/pkg v0.0.0-20250909011231-077dcf0d00e8/go.mod h1:a1amDzo4YIUNuGeDgEz/uDHs5MQVYI1DXnRnEpWCAts=
266266
sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM=
267267
sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
268268
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@ k8s.io/utils/trace
10141014
# knative.dev/hack v0.0.0-20250902154142-af735b2738d6
10151015
## explicit; go 1.21
10161016
knative.dev/hack
1017-
# knative.dev/networking v0.0.0-20250902160145-7dad473f6351
1017+
# knative.dev/networking v0.0.0-20250912164322-3fcdea3327b7
10181018
## explicit; go 1.24.0
10191019
knative.dev/networking/config
10201020
knative.dev/networking/pkg
@@ -1058,7 +1058,7 @@ knative.dev/networking/test/test_images/runtime/handlers
10581058
knative.dev/networking/test/test_images/timeout
10591059
knative.dev/networking/test/test_images/wsserver
10601060
knative.dev/networking/test/types
1061-
# knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68
1061+
# knative.dev/pkg v0.0.0-20250909011231-077dcf0d00e8
10621062
## explicit; go 1.24.0
10631063
knative.dev/pkg/apis
10641064
knative.dev/pkg/apis/duck

0 commit comments

Comments
 (0)