diff --git a/go.mod b/go.mod index f2fb88b6d0..242675a690 100644 --- a/go.mod +++ b/go.mod @@ -21,11 +21,11 @@ require ( k8s.io/client-go v0.33.4 k8s.io/code-generator v0.33.4 knative.dev/caching v0.0.0-20250814140644-ebb5f4cb6992 - knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04 + knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e knative.dev/reconciler-test v0.0.0-20250818021647-3bf376b1f1ce - knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b + knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a sigs.k8s.io/yaml v1.6.0 ) diff --git a/go.sum b/go.sum index ceae5679b5..b8cb49a93d 100644 --- a/go.sum +++ b/go.sum @@ -1705,8 +1705,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/caching v0.0.0-20250814140644-ebb5f4cb6992 h1:L5lys4PWDE6FH9itOndyAj9bu4ZKfn0UOuLwY2UgxiM= knative.dev/caching v0.0.0-20250814140644-ebb5f4cb6992/go.mod h1:eZzEshkV7+sfcLjLlULdJlXV+1IFf/23Tqecyz07drY= -knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04 h1:3IiyVZfZsSNltuR6OzuA1QRVS8efE+juGHPD89q4Thg= -knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04/go.mod h1:pA2CWkd3Pl4E0Y81ochzLtZbL8b23+BzpkYSgAUTNqg= +knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e h1:cpJitv7xBjLVxPrNNrEtoRuvKQQOKABfxO9sLEyoFDc= +knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e/go.mod h1:pA2CWkd3Pl4E0Y81ochzLtZbL8b23+BzpkYSgAUTNqg= knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba h1:PkOTBI8DRfvUKD8HTvYYT94NJ49J++llrDo3y0/ZAwc= knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= knative.dev/networking v0.0.0-20250814015442-a7d77604fab6 h1:fAtX+2BMMGUR2qajytXxGaOlUqjNghhUzM5Eis4zkZE= @@ -1715,8 +1715,8 @@ knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e h1:MQvV6He65+DIYxcHWahAij/JSw knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e/go.mod h1:D3Q1EurZkGaiPNEvPpErGmUU7Ny0WgqGVktfIyH2vYM= knative.dev/reconciler-test v0.0.0-20250818021647-3bf376b1f1ce h1:IOhYsvpX1mIo+UZei1/dBukpGGlgt5PFWopnS7KZPtE= knative.dev/reconciler-test v0.0.0-20250818021647-3bf376b1f1ce/go.mod h1:10PmVxyoupuQCJOGhH9SYhbiwo4Ta2zX/PQ0oGFIqQ0= -knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b h1:SZFzv72D0ZpSkQ2VkSPxljqlOV63BVwA29DKNyJPoog= -knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b/go.mod h1:BiPDjH+2WedExrayB4IT1qTQJQ92qzussfhSY/R2gLM= +knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a h1:eeiDiB+EzpN2Q8QsNEAKkdfWzWNTtwkkwOFpqqWWL/g= +knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a/go.mod h1:BiPDjH+2WedExrayB4IT1qTQJQ92qzussfhSY/R2gLM= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= diff --git a/vendor/knative.dev/eventing/pkg/observability/config.go b/vendor/knative.dev/eventing/pkg/observability/config.go index 6988bea58e..9f0673caf0 100644 --- a/vendor/knative.dev/eventing/pkg/observability/config.go +++ b/vendor/knative.dev/eventing/pkg/observability/config.go @@ -22,6 +22,7 @@ import ( configmap "knative.dev/pkg/configmap/parser" pkgo11y "knative.dev/pkg/observability" + "knative.dev/pkg/observability/metrics" ) const ( @@ -30,6 +31,9 @@ const ( // DefaultEnableSinkEventErrorReporting is used to set the default sink event error reporting value DefaultEnableSinkEventErrorReporting = false + + // DefaultMetricsPort is the default port used for prometheus metrics if the prometheus protocol is used + DefaultMetricsPort = 9092 ) type ( @@ -65,6 +69,11 @@ func NewFromMap(m map[string]string) (*Config, error) { c.BaseConfig = *cfg } + // Force the port to the default queue user metrics port if it's not overridden + if c.BaseConfig.Metrics.Protocol == metrics.ProtocolPrometheus && c.BaseConfig.Metrics.Endpoint == "" { + c.BaseConfig.Metrics.Endpoint = fmt.Sprintf(":%d", DefaultMetricsPort) + } + err := configmap.Parse(m, configmap.As(EnableSinkEventErrorReportingKey, &c.EnableSinkEventErrorReporting)) if err != nil { fmt.Printf("failed to parse enable-sink-error-reporting: %s\n", err.Error()) @@ -99,6 +108,11 @@ func MergeWithDefaults(cfg *Config) *Config { cfg.Metrics = d.Metrics } + // Force the port to the default queue user metrics port if it's not overridden + if cfg.BaseConfig.Metrics.Protocol == metrics.ProtocolPrometheus && cfg.BaseConfig.Metrics.Endpoint == "" { + cfg.BaseConfig.Metrics.Endpoint = fmt.Sprintf(":%d", DefaultMetricsPort) + } + var emptyRuntime RuntimeConfig if cfg.Runtime == emptyRuntime { cfg.Runtime = d.Runtime diff --git a/vendor/modules.txt b/vendor/modules.txt index 609c0f4d1a..95aa8b620d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1483,7 +1483,7 @@ k8s.io/utils/trace ## explicit; go 1.24.0 knative.dev/caching/pkg/apis/caching knative.dev/caching/pkg/apis/caching/v1alpha1 -# knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04 +# knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e ## explicit; go 1.24.0 knative.dev/eventing/cmd/heartbeats knative.dev/eventing/pkg/apis @@ -1714,7 +1714,7 @@ knative.dev/reconciler-test/pkg/resources/service knative.dev/reconciler-test/pkg/resources/serviceaccount knative.dev/reconciler-test/pkg/state knative.dev/reconciler-test/resources/certificate -# knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b +# knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a ## explicit; go 1.24.0 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1