From 9af7e5e2c3cc16b57f5121109bd5464017535bb2 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Fri, 12 Sep 2025 16:46:28 +0000 Subject: [PATCH] upgrade to latest dependencies 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 --- go.mod | 4 ++-- go.sum | 8 ++++---- vendor/knative.dev/pkg/controller/queue_metrics.go | 8 +++++--- vendor/knative.dev/pkg/controller/two_lane_queue.go | 4 ++-- vendor/modules.txt | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 212f0949e..ce04587e4 100644 --- a/go.mod +++ b/go.mod @@ -13,8 +13,8 @@ require ( k8s.io/code-generator v0.33.4 k8s.io/utils v0.0.0-20241210054802-24370beab758 knative.dev/hack v0.0.0-20250902154142-af735b2738d6 - knative.dev/networking v0.0.0-20250902160145-7dad473f6351 - knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68 + knative.dev/networking v0.0.0-20250912164322-3fcdea3327b7 + knative.dev/pkg v0.0.0-20250909011231-077dcf0d00e8 sigs.k8s.io/gateway-api v1.2.1 sigs.k8s.io/yaml v1.6.0 ) diff --git a/go.sum b/go.sum index 95d444244..f981bee22 100644 --- a/go.sum +++ b/go.sum @@ -259,10 +259,10 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/hack v0.0.0-20250902154142-af735b2738d6 h1:JYZgO9bni32T+BB5v6WpeRFm1hjj+EypBLZCk6HZBt0= knative.dev/hack v0.0.0-20250902154142-af735b2738d6/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/networking v0.0.0-20250902160145-7dad473f6351 h1:Gv/UqbN0AK+ORoT5e2Kg+3+uMW/y9CCdhpXKxYaVV6k= -knative.dev/networking v0.0.0-20250902160145-7dad473f6351/go.mod h1:P/fAhhVDgmLt1ugFX8vBvdSDiUOw2P4SGcjbzoZ02Xw= -knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68 h1:QlgJtxC1LtNf9k1OMSHdr3dq+HjtOOmB/SV/SklVt2k= -knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68/go.mod h1:a1amDzo4YIUNuGeDgEz/uDHs5MQVYI1DXnRnEpWCAts= +knative.dev/networking v0.0.0-20250912164322-3fcdea3327b7 h1:znAKzAIZRONj/3/sj29h3LymPvXc58nsF6P/8yDqEwc= +knative.dev/networking v0.0.0-20250912164322-3fcdea3327b7/go.mod h1:+yUXx0sIKx5tzyW10GFcUSTfhuxNJhaGgvpXcv6PeHI= +knative.dev/pkg v0.0.0-20250909011231-077dcf0d00e8 h1:n0BMHXIem9MyDkK4vfA4Vzdxaf1e+EeLJ6k+8exCjjI= +knative.dev/pkg v0.0.0-20250909011231-077dcf0d00e8/go.mod h1:a1amDzo4YIUNuGeDgEz/uDHs5MQVYI1DXnRnEpWCAts= sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM= sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= diff --git a/vendor/knative.dev/pkg/controller/queue_metrics.go b/vendor/knative.dev/pkg/controller/queue_metrics.go index dcd588998..2e61e330e 100644 --- a/vendor/knative.dev/pkg/controller/queue_metrics.go +++ b/vendor/knative.dev/pkg/controller/queue_metrics.go @@ -88,13 +88,15 @@ func (m *queueMetrics) get(item any) { m.mu.Lock() defer m.mu.Unlock() - m.depth.Dec() - m.processingStartTimes[item] = m.clock.Now() - if startTime, exists := m.addTimes[item]; exists { + m.depth.Dec() m.latency.Observe(m.sinceInSeconds(startTime)) delete(m.addTimes, item) } + + if _, exists := m.processingStartTimes[item]; !exists { + m.processingStartTimes[item] = m.clock.Now() + } } func (m *queueMetrics) done(item any) { diff --git a/vendor/knative.dev/pkg/controller/two_lane_queue.go b/vendor/knative.dev/pkg/controller/two_lane_queue.go index 294255131..0c1879ded 100644 --- a/vendor/knative.dev/pkg/controller/two_lane_queue.go +++ b/vendor/knative.dev/pkg/controller/two_lane_queue.go @@ -223,9 +223,9 @@ func (q *twoLaneRateLimitingQueue) slowLane() workqueue.TypedInterface[any] { // It gets the item from fast lane if it has anything, alternatively // the slow lane. func (tlq *twoLaneQueue) Get() (any, bool) { - item, ok := tlq.consumerQueue.Get() + item, shutdown := tlq.consumerQueue.Get() tlq.metrics.get(item) - return item, ok + return item, shutdown } // Len returns the sum of lengths. diff --git a/vendor/modules.txt b/vendor/modules.txt index b39bf6bd4..8cad8fd20 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1014,7 +1014,7 @@ k8s.io/utils/trace # knative.dev/hack v0.0.0-20250902154142-af735b2738d6 ## explicit; go 1.21 knative.dev/hack -# knative.dev/networking v0.0.0-20250902160145-7dad473f6351 +# knative.dev/networking v0.0.0-20250912164322-3fcdea3327b7 ## explicit; go 1.24.0 knative.dev/networking/config knative.dev/networking/pkg @@ -1058,7 +1058,7 @@ knative.dev/networking/test/test_images/runtime/handlers knative.dev/networking/test/test_images/timeout knative.dev/networking/test/test_images/wsserver knative.dev/networking/test/types -# knative.dev/pkg v0.0.0-20250902154944-9aa11443ba68 +# knative.dev/pkg v0.0.0-20250909011231-077dcf0d00e8 ## explicit; go 1.24.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck