Skip to content

Commit fa48e22

Browse files
knative-automationknative-automation
authored
upgrade to latest dependencies (#2261)
bumping knative.dev/networking 0055e92...a339c35: > a339c35 upgrade to latest dependencies (# 1123) bumping knative.dev/caching 7c10310...408629a: > 408629a upgrade to latest dependencies (# 994) bumping knative.dev/pkg 5d1c12d...91e1768: > 91e1768 Fix linter deprecation warnings (# 3335) bumping knative.dev/reconciler-test 8b264d2...1e70e7c: > 1e70e7c upgrade to latest dependencies (# 871) bumping knative.dev/serving 10d950c...fe4c325: > fe4c325 Update net-istio nightly (# 16472) > 7831c9f upgrade to latest dependencies (# 16469) Signed-off-by: Knative Automation <automation@knative.team>
1 parent 3cb982d commit fa48e22

File tree

4 files changed

+34
-30
lines changed

4 files changed

+34
-30
lines changed

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ require (
2020
k8s.io/apimachinery v0.35.2
2121
k8s.io/client-go v0.35.2
2222
k8s.io/code-generator v0.35.2
23-
knative.dev/caching v0.0.0-20260316015123-7c1031085c86
23+
knative.dev/caching v0.0.0-20260317014950-408629a8fd29
2424
knative.dev/eventing v0.48.1-0.20260316031422-ce3fe6b62f97
2525
knative.dev/hack v0.0.0-20260310014051-c448fdb867e2
26-
knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335
27-
knative.dev/reconciler-test v0.0.0-20260316022126-8b264d235091
28-
knative.dev/serving v0.48.1-0.20260316224151-10d950c3a0d7
26+
knative.dev/pkg v0.0.0-20260317082650-91e176852006
27+
knative.dev/reconciler-test v0.0.0-20260317021952-1e70e7c280f2
28+
knative.dev/serving v0.48.1-0.20260317123251-fe4c325b7af9
2929
sigs.k8s.io/yaml v1.6.0
3030
)
3131

@@ -162,7 +162,7 @@ require (
162162
k8s.io/klog/v2 v2.130.1 // indirect
163163
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
164164
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
165-
knative.dev/networking v0.0.0-20260313010219-0055e9277729 // indirect
165+
knative.dev/networking v0.0.0-20260316020026-a339c355a2b2 // indirect
166166
sigs.k8s.io/controller-runtime v0.19.0 // indirect
167167
sigs.k8s.io/gateway-api v1.1.0 // indirect
168168
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1714,20 +1714,20 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
17141714
k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
17151715
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
17161716
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1717-
knative.dev/caching v0.0.0-20260316015123-7c1031085c86 h1:1WLHScvWEL9Zp8UQn2In4rjpyqoEnE/OCY1x9cz7Jgw=
1718-
knative.dev/caching v0.0.0-20260316015123-7c1031085c86/go.mod h1:63NRS63llLZwEYOZcOQy6cfdmAQBMcZQA3VFzgRg8og=
1717+
knative.dev/caching v0.0.0-20260317014950-408629a8fd29 h1:uxOxwL84CKl10MflLPV+fErkvVz8LW14ug9u5/SEzl0=
1718+
knative.dev/caching v0.0.0-20260317014950-408629a8fd29/go.mod h1:P61LpKUA6h0IeWjWwGwNimd2teheWbgSGsyNIF/tHK4=
17191719
knative.dev/eventing v0.48.1-0.20260316031422-ce3fe6b62f97 h1:igxNyYW2+LxPspTqGpMH7Z+Qp1TqbYDkyiWtyHJjWK8=
17201720
knative.dev/eventing v0.48.1-0.20260316031422-ce3fe6b62f97/go.mod h1:UR5qyT/4a68s4HJ+ZEourVWJ7pS7um8PCW4COjeOyxE=
17211721
knative.dev/hack v0.0.0-20260310014051-c448fdb867e2 h1:b35SGLEp03D8oGf8mE9HBt3yfNgYpAK0fw46hFXs9w4=
17221722
knative.dev/hack v0.0.0-20260310014051-c448fdb867e2/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=
1723-
knative.dev/networking v0.0.0-20260313010219-0055e9277729 h1:sF6e1RnluIKCiZBPrz7BxIWkAkLU8hiSSK+1NusRmGM=
1724-
knative.dev/networking v0.0.0-20260313010219-0055e9277729/go.mod h1:72PhQ+qnOAwz9FFK8y301eWuiQ6vD9qVUFnDBjNhju8=
1725-
knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335 h1:OpR5LNa0m34T8KOzGLwObjmMkxuuenSFU51oiNcfKRw=
1726-
knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335/go.mod h1:o/XS1E/hYh9IR8deEEiJG4kKtQfqnf9Gwt5bwp2x4AU=
1727-
knative.dev/reconciler-test v0.0.0-20260316022126-8b264d235091 h1:Gw16sPddZ0qAVAvt1nmrbu3P7NBppo1VZqdMTte+0Ys=
1728-
knative.dev/reconciler-test v0.0.0-20260316022126-8b264d235091/go.mod h1:Ry120Z0FCaIn3Mf6JuuzSzWwNHRfqD2bIvzFUpsL0Dg=
1729-
knative.dev/serving v0.48.1-0.20260316224151-10d950c3a0d7 h1:azehTw7pMvOK+Ijq7AwKRX5/0flM6O0khNTpFyUgLoY=
1730-
knative.dev/serving v0.48.1-0.20260316224151-10d950c3a0d7/go.mod h1:BJPmLXiP75SFAMo+xzU8SHcxmTbqYEbZk5xlgopye5g=
1723+
knative.dev/networking v0.0.0-20260316020026-a339c355a2b2 h1:UNzCI424xvyYD0Ii2Qzq4fmeSPFyhd3N3pbB6pTbxec=
1724+
knative.dev/networking v0.0.0-20260316020026-a339c355a2b2/go.mod h1:sNxNqkf3iMyBy0WOlicarFowbxhg14/g+BCmnx9Z6RQ=
1725+
knative.dev/pkg v0.0.0-20260317082650-91e176852006 h1:kigmOSaEWOddCfoyH1+Mx0w1kwnZrl3CbPAN+9/+Kx4=
1726+
knative.dev/pkg v0.0.0-20260317082650-91e176852006/go.mod h1:o/XS1E/hYh9IR8deEEiJG4kKtQfqnf9Gwt5bwp2x4AU=
1727+
knative.dev/reconciler-test v0.0.0-20260317021952-1e70e7c280f2 h1:Dp24gX5whQUMa0GtYuVyG6Kmx2c6Owmru20oymw5Fug=
1728+
knative.dev/reconciler-test v0.0.0-20260317021952-1e70e7c280f2/go.mod h1:kOX2KvO14S/49lqzqBHdw9RMd6PAXviPbRhCFTK9eOo=
1729+
knative.dev/serving v0.48.1-0.20260317123251-fe4c325b7af9 h1:XonUo+HlKKzE0rUL/TgRveDRf0rr5v/NsKJxtn9w724=
1730+
knative.dev/serving v0.48.1-0.20260317123251-fe4c325b7af9/go.mod h1:ZGJ7vuvaxklMnfNPgq0LOwI/zTJDcbdK64KWnZd69Z8=
17311731
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
17321732
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
17331733
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=

‎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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,7 @@ k8s.io/utils/net
15061506
k8s.io/utils/pointer
15071507
k8s.io/utils/ptr
15081508
k8s.io/utils/trace
1509-
# knative.dev/caching v0.0.0-20260316015123-7c1031085c86
1509+
# knative.dev/caching v0.0.0-20260317014950-408629a8fd29
15101510
## explicit; go 1.25.0
15111511
knative.dev/caching/pkg/apis/caching
15121512
knative.dev/caching/pkg/apis/caching/v1alpha1
@@ -1606,7 +1606,7 @@ knative.dev/eventing/test/upgrade/prober/wathola/sender
16061606
# knative.dev/hack v0.0.0-20260310014051-c448fdb867e2
16071607
## explicit; go 1.24
16081608
knative.dev/hack
1609-
# knative.dev/networking v0.0.0-20260313010219-0055e9277729
1609+
# knative.dev/networking v0.0.0-20260316020026-a339c355a2b2
16101610
## explicit; go 1.25.0
16111611
knative.dev/networking/pkg/apis/networking
16121612
knative.dev/networking/pkg/apis/networking/v1alpha1
@@ -1617,7 +1617,7 @@ knative.dev/networking/pkg/client/clientset/versioned/typed/networking/v1alpha1
16171617
knative.dev/networking/pkg/config
16181618
knative.dev/networking/pkg/http/header
16191619
knative.dev/networking/pkg/ingress
1620-
# knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335
1620+
# knative.dev/pkg v0.0.0-20260317082650-91e176852006
16211621
## explicit; go 1.25.0
16221622
knative.dev/pkg/apiextensions/storageversion
16231623
knative.dev/pkg/apiextensions/storageversion/cmd/migrate
@@ -1709,7 +1709,7 @@ knative.dev/pkg/webhook
17091709
knative.dev/pkg/webhook/certificates
17101710
knative.dev/pkg/webhook/certificates/resources
17111711
knative.dev/pkg/webhook/resourcesemantics/conversion
1712-
# knative.dev/reconciler-test v0.0.0-20260316022126-8b264d235091
1712+
# knative.dev/reconciler-test v0.0.0-20260317021952-1e70e7c280f2
17131713
## explicit; go 1.25.0
17141714
knative.dev/reconciler-test/cmd/eventshub
17151715
knative.dev/reconciler-test/pkg/environment
@@ -1738,7 +1738,7 @@ knative.dev/reconciler-test/pkg/resources/service
17381738
knative.dev/reconciler-test/pkg/resources/serviceaccount
17391739
knative.dev/reconciler-test/pkg/state
17401740
knative.dev/reconciler-test/resources/certificate
1741-
# knative.dev/serving v0.48.1-0.20260316224151-10d950c3a0d7
1741+
# knative.dev/serving v0.48.1-0.20260317123251-fe4c325b7af9
17421742
## explicit; go 1.25.0
17431743
knative.dev/serving/pkg/apis/autoscaling
17441744
knative.dev/serving/pkg/apis/autoscaling/v1alpha1

0 commit comments

Comments
 (0)