[release-1.19] Fix queue proxy user metrics port (#16021)

knative-prow-robot · dprotaso · web-flow · commit ace7258ab1a8 · 2025-08-15T14:01:44.000Z
* fix queue proxy user metrics porpt

* only set the port if it's not set by the operator

* fix spelling typo

---------

Co-authored-by: Dave Protasowski &lt;dprotaso@gmail.com&gt;
diff --git a/pkg/queue/sharedmain/otel.go b/pkg/queue/sharedmain/otel.go
@@ -19,6 +19,7 @@ package sharedmain
 import (
 	"cmp"
 	"context"
+	"fmt"
 	"os"
 
 	"go.opentelemetry.io/contrib/instrumentation/runtime"
@@ -35,6 +36,7 @@ import (
 	"knative.dev/pkg/observability/tracing"
 	"knative.dev/pkg/system"
 	servingmetrics "knative.dev/serving/pkg/metrics"
+	"knative.dev/serving/pkg/networking"
 )
 
 func SetupObservabilityOrDie(
@@ -44,6 +46,13 @@ func SetupObservabilityOrDie(
 ) (*metrics.MeterProvider, *tracing.TracerProvider) {
 	r := res(logger, cfg)
 
+	// Force the port to be the default queue user metrics port if it's not overridden
+	// by the operator
+	if cfg.Observability.RequestMetrics.Protocol == metrics.ProtocolPrometheus &&
+		cfg.Observability.RequestMetrics.Endpoint == "" {
+		cfg.Observability.RequestMetrics.Endpoint = fmt.Sprintf(":%d", networking.UserQueueMetricsPort)
+	}
+
 	meterProvider, err := metrics.NewMeterProvider(
 		ctx,
 		cfg.Observability.RequestMetrics,
