Skip to content

Fix linter deprecation warnings #3335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow merged 2 commits into from
Mar 17, 2026
Merged

Fix linter deprecation warnings #3335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b0ca89
change regexp to ignore all uses of SimpleClientset
dprotaso Mar 16, 2026
76e46dd
drop use of deprecated otelhttp.WithMetricAttributesFn
dprotaso Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ linters:
text: corev1.Endpoint.* is deprecated
- linters:
- staticcheck
text: fakek8s.NewSimpleClientset is deprecated
text: .*NewSimpleClientset is deprecated
- linters:
- gosec
- noctx
Expand Down
24 changes: 14 additions & 10 deletions webhook/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import (
"knative.dev/pkg/observability/semconv"

"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/trace"
Expand Down Expand Up @@ -313,19 +312,11 @@ func (wh *Webhook) Run(stop <-chan struct{}) error {
}

otelHandler := otelhttp.NewHandler(
drainer,
&routeLabeler{next: drainer},
wh.Options.ServiceName, // Note this service is k8s service name
otelhttp.WithMeterProvider(wh.Options.MeterProvider),
otelhttp.WithTracerProvider(wh.Options.TracerProvider),
otelhttp.WithPropagators(wh.Options.TextMapPropagator),
otelhttp.WithMetricAttributesFn(func(r *http.Request) []attribute.KeyValue {
if r.URL.Path == "" {
return nil
}
return []attribute.KeyValue{
semconv.HTTPRoute(r.URL.Path),
}
}),
otelhttp.WithFilter(func(r *http.Request) bool {
// Don't trace kubelet probes
return !network.IsKubeletProbe(r)
Expand Down Expand Up @@ -406,3 +397,16 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {

wh.mux.ServeHTTP(w, r)
}

type routeLabeler struct {
next http.Handler
}

func (rl *routeLabeler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if r.URL.Path != "" {
labeler, _ := otelhttp.LabelerFromContext(r.Context())
labeler.Add(semconv.HTTPRoute(r.URL.Path))
}

rl.next.ServeHTTP(w, r)
}
Loading