Skip to content

Commit 80e9e60

Browse files
upgrade to latest dependencies (#16474)
bumping knative.dev/pkg 5d1c12d...91e1768: > 91e1768 Fix linter deprecation warnings (# 3335) bumping knative.dev/networking a339c35...91b576b: > 91b576b upgrade to latest dependencies (# 1124) bumping knative.dev/caching 7c10310...408629a: > 408629a upgrade to latest dependencies (# 994) Signed-off-by: Knative Automation <automation@knative.team>
1 parent 8c073ea commit 80e9e60

File tree

4 files changed

+26
-22
lines changed

4 files changed

+26
-22
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ require (
3636
k8s.io/code-generator v0.35.2
3737
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
3838
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
39-
knative.dev/caching v0.0.0-20260316015123-7c1031085c86
39+
knative.dev/caching v0.0.0-20260317014950-408629a8fd29
4040
knative.dev/hack v0.0.0-20260310014051-c448fdb867e2
41-
knative.dev/networking v0.0.0-20260316020026-a339c355a2b2
42-
knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335
41+
knative.dev/networking v0.0.0-20260317015751-91b576b3d619
42+
knative.dev/pkg v0.0.0-20260317082650-91e176852006
4343
sigs.k8s.io/randfill v1.0.0
4444
sigs.k8s.io/yaml v1.6.0
4545
)

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -546,14 +546,14 @@ k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZ
546546
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
547547
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
548548
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
549-
knative.dev/caching v0.0.0-20260316015123-7c1031085c86 h1:1WLHScvWEL9Zp8UQn2In4rjpyqoEnE/OCY1x9cz7Jgw=
550-
knative.dev/caching v0.0.0-20260316015123-7c1031085c86/go.mod h1:63NRS63llLZwEYOZcOQy6cfdmAQBMcZQA3VFzgRg8og=
549+
knative.dev/caching v0.0.0-20260317014950-408629a8fd29 h1:uxOxwL84CKl10MflLPV+fErkvVz8LW14ug9u5/SEzl0=
550+
knative.dev/caching v0.0.0-20260317014950-408629a8fd29/go.mod h1:P61LpKUA6h0IeWjWwGwNimd2teheWbgSGsyNIF/tHK4=
551551
knative.dev/hack v0.0.0-20260310014051-c448fdb867e2 h1:b35SGLEp03D8oGf8mE9HBt3yfNgYpAK0fw46hFXs9w4=
552552
knative.dev/hack v0.0.0-20260310014051-c448fdb867e2/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=
553-
knative.dev/networking v0.0.0-20260316020026-a339c355a2b2 h1:UNzCI424xvyYD0Ii2Qzq4fmeSPFyhd3N3pbB6pTbxec=
554-
knative.dev/networking v0.0.0-20260316020026-a339c355a2b2/go.mod h1:sNxNqkf3iMyBy0WOlicarFowbxhg14/g+BCmnx9Z6RQ=
555-
knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335 h1:OpR5LNa0m34T8KOzGLwObjmMkxuuenSFU51oiNcfKRw=
556-
knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335/go.mod h1:o/XS1E/hYh9IR8deEEiJG4kKtQfqnf9Gwt5bwp2x4AU=
553+
knative.dev/networking v0.0.0-20260317015751-91b576b3d619 h1:Ff71TIn4yIVTWLrDF/SyN0KEJ1LNconyeptgkzZEzAY=
554+
knative.dev/networking v0.0.0-20260317015751-91b576b3d619/go.mod h1:0UAbiLzpmMyhpjWVwRo9vYEWPKGyY6PM2VCKQkBpXE4=
555+
knative.dev/pkg v0.0.0-20260317082650-91e176852006 h1:kigmOSaEWOddCfoyH1+Mx0w1kwnZrl3CbPAN+9/+Kx4=
556+
knative.dev/pkg v0.0.0-20260317082650-91e176852006/go.mod h1:o/XS1E/hYh9IR8deEEiJG4kKtQfqnf9Gwt5bwp2x4AU=
557557
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
558558
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
559559
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=

vendor/knative.dev/pkg/webhook/webhook.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
"knative.dev/pkg/observability/semconv"
3838

3939
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
40-
"go.opentelemetry.io/otel/attribute"
4140
"go.opentelemetry.io/otel/metric"
4241
"go.opentelemetry.io/otel/propagation"
4342
"go.opentelemetry.io/otel/trace"
@@ -313,19 +312,11 @@ func (wh *Webhook) Run(stop <-chan struct{}) error {
313312
}
314313

315314
otelHandler := otelhttp.NewHandler(
316-
drainer,
315+
&routeLabeler{next: drainer},
317316
wh.Options.ServiceName, // Note this service is k8s service name
318317
otelhttp.WithMeterProvider(wh.Options.MeterProvider),
319318
otelhttp.WithTracerProvider(wh.Options.TracerProvider),
320319
otelhttp.WithPropagators(wh.Options.TextMapPropagator),
321-
otelhttp.WithMetricAttributesFn(func(r *http.Request) []attribute.KeyValue {
322-
if r.URL.Path == "" {
323-
return nil
324-
}
325-
return []attribute.KeyValue{
326-
semconv.HTTPRoute(r.URL.Path),
327-
}
328-
}),
329320
otelhttp.WithFilter(func(r *http.Request) bool {
330321
// Don't trace kubelet probes
331322
return !network.IsKubeletProbe(r)
@@ -406,3 +397,16 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
406397

407398
wh.mux.ServeHTTP(w, r)
408399
}
400+
401+
type routeLabeler struct {
402+
next http.Handler
403+
}
404+
405+
func (rl *routeLabeler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
406+
if r.URL.Path != "" {
407+
labeler, _ := otelhttp.LabelerFromContext(r.Context())
408+
labeler.Add(semconv.HTTPRoute(r.URL.Path))
409+
}
410+
411+
rl.next.ServeHTTP(w, r)
412+
}

vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,7 @@ k8s.io/utils/lru
14801480
k8s.io/utils/net
14811481
k8s.io/utils/ptr
14821482
k8s.io/utils/trace
1483-
# knative.dev/caching v0.0.0-20260316015123-7c1031085c86
1483+
# knative.dev/caching v0.0.0-20260317014950-408629a8fd29
14841484
## explicit; go 1.25.0
14851485
knative.dev/caching/config
14861486
knative.dev/caching/pkg/apis/caching
@@ -1504,7 +1504,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1
15041504
# knative.dev/hack v0.0.0-20260310014051-c448fdb867e2
15051505
## explicit; go 1.24
15061506
knative.dev/hack
1507-
# knative.dev/networking v0.0.0-20260316020026-a339c355a2b2
1507+
# knative.dev/networking v0.0.0-20260317015751-91b576b3d619
15081508
## explicit; go 1.25.0
15091509
knative.dev/networking/config
15101510
knative.dev/networking/pkg/apis/networking
@@ -1541,7 +1541,7 @@ knative.dev/networking/pkg/http/proxy
15411541
knative.dev/networking/pkg/http/stats
15421542
knative.dev/networking/pkg/ingress
15431543
knative.dev/networking/pkg/prober
1544-
# knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335
1544+
# knative.dev/pkg v0.0.0-20260317082650-91e176852006
15451545
## explicit; go 1.25.0
15461546
knative.dev/pkg/apiextensions/storageversion
15471547
knative.dev/pkg/apiextensions/storageversion/cmd/migrate

0 commit comments

Comments
 (0)