Skip to content

Commit ace7258

Browse files
[release-1.19] Fix queue proxy user metrics port (#16021)
* 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 <[email protected]>
1 parent b828280 commit ace7258

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

pkg/queue/sharedmain/otel.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package sharedmain
1919
import (
2020
"cmp"
2121
"context"
22+
"fmt"
2223
"os"
2324

2425
"go.opentelemetry.io/contrib/instrumentation/runtime"
@@ -35,6 +36,7 @@ import (
3536
"knative.dev/pkg/observability/tracing"
3637
"knative.dev/pkg/system"
3738
servingmetrics "knative.dev/serving/pkg/metrics"
39+
"knative.dev/serving/pkg/networking"
3840
)
3941

4042
func SetupObservabilityOrDie(
@@ -44,6 +46,13 @@ func SetupObservabilityOrDie(
4446
) (*metrics.MeterProvider, *tracing.TracerProvider) {
4547
r := res(logger, cfg)
4648

49+
// Force the port to be the default queue user metrics port if it's not overridden
50+
// by the operator
51+
if cfg.Observability.RequestMetrics.Protocol == metrics.ProtocolPrometheus &&
52+
cfg.Observability.RequestMetrics.Endpoint == "" {
53+
cfg.Observability.RequestMetrics.Endpoint = fmt.Sprintf(":%d", networking.UserQueueMetricsPort)
54+
}
55+
4756
meterProvider, err := metrics.NewMeterProvider(
4857
ctx,
4958
cfg.Observability.RequestMetrics,

0 commit comments

Comments
 (0)