Merge upstream/main and address PR review comments

Author: malpou

.github/workflows/linkinator.yaml

@@ -21,5 +21,6 @@ jobs:
         with:
           paths: "**/*.md"
           markdown: true
+          concurrency: 1
           retry: true
           linksToSkip: "https://github.com/kedacore/http-add-on/pkgs/container/http-add-on-interceptor, https://github.com/kedacore/http-add-on/pkgs/container/http-add-on-operator, https://github.com/kedacore/http-add-on/pkgs/container/http-add-on-scaler,http://opentelemetry-collector.open-telemetry-system:4318,http://opentelemetry-collector.open-telemetry-system:4318/v1/traces, https://www.gnu.org/software/make/"

.golangci.yml

@@ -26,7 +26,7 @@ linters:
     - unconvert
     - ineffassign
     - staticcheck
-    - exportloopref
+    - copyloopvar
     #- depguard #https://github.com/kedacore/keda/issues/4980
     - dogsled
     - errcheck

CHANGELOG.md

@@ -28,6 +28,7 @@ This changelog keeps track of work items that have been completed and are ready
 - **General**: Add configurable tracing support to the interceptor proxy ([#1021](https://github.com/kedacore/http-add-on/pull/1021))
 - **General**: Allow using HSO and SO with different names ([#1293](https://github.com/kedacore/http-add-on/issues/1293))
 - **General**: Add custom placeholder pages for scale-from-zero scenarios ([#874](https://github.com/kedacore/http-add-on/issues/874))
+- **General**: Support profiling for KEDA components ([#4789](https://github.com/kedacore/keda/issues/4789))
 
 ### Improvements
 

interceptor/config/serving.go

@@ -45,6 +45,8 @@ type Serving struct {
 	TLSCertStorePaths string `envconfig:"KEDA_HTTP_PROXY_TLS_CERT_STORE_PATHS" default:""`
 	// TLSPort is the port that the server should serve on if TLS is enabled
 	TLSPort int `envconfig:"KEDA_HTTP_PROXY_TLS_PORT" default:"8443"`
+	// ProfilingAddr if not empty, pprof will be available on this address, assuming host:port here
+	ProfilingAddr string `envconfig:"PROFILING_BIND_ADDRESS" default:""`
 }
 
 // Parse parses standard configs using envconfig and returns a pointer to the

interceptor/handler/placeholder.go

@@ -145,6 +145,12 @@ func NewPlaceholderHandler(k8sClient kubernetes.Interface, routingTable routing.
 
 // injectPlaceholderScript injects the placeholder refresh script into a template
 func injectPlaceholderScript(templateContent string) string {
+	// Check if the placeholder script is already present
+	if strings.Contains(templateContent, placeholderScript) {
+		// Return the original content if the script is already present
+		return templateContent
+	}
+	
 	lowerContent := strings.ToLower(templateContent)
 
 	// Look for </body> tag (case-insensitive)
@@ -247,13 +253,13 @@ func (h *PlaceholderHandler) getTemplate(ctx context.Context, hso *v1alpha1.HTTP
 		}
 		h.cacheMutex.RUnlock()
 
+		h.cacheMutex.Lock()
 		injectedContent := injectPlaceholderScript(config.Content)
 		tmpl, err := template.New("inline").Parse(injectedContent)
 		if err != nil {
+			h.cacheMutex.Unlock()
 			return nil, err
 		}
-
-		h.cacheMutex.Lock()
 		h.templateCache[cacheKey] = &cacheEntry{
 			template:      tmpl,
 			hsoGeneration: hso.Generation,
@@ -278,23 +284,24 @@ func (h *PlaceholderHandler) getTemplate(ctx context.Context, hso *v1alpha1.HTTP
 		}
 		h.cacheMutex.RUnlock()
 
+		h.cacheMutex.Lock()
 		key := config.ContentConfigMapKey
 		if key == "" {
 			key = "template.html"
 		}
 
 		content, ok := cm.Data[key]
 		if !ok {
+			h.cacheMutex.Unlock()
 			return nil, fmt.Errorf("key %s not found in ConfigMap %s", key, config.ContentConfigMap)
 		}
 
 		injectedContent := injectPlaceholderScript(content)
 		tmpl, err := template.New("configmap").Parse(injectedContent)
 		if err != nil {
+			h.cacheMutex.Unlock()
 			return nil, err
 		}
-
-		h.cacheMutex.Lock()
 		h.templateCache[cacheKey] = &cacheEntry{
 			template:         tmpl,
 			hsoGeneration:    hso.Generation,

interceptor/main.go

@@ -8,6 +8,7 @@ import (
 	"flag"
 	"fmt"
 	"net/http"
+	_ "net/http/pprof"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -81,6 +82,7 @@ func main() {
 	proxyPort := servingCfg.ProxyPort
 	adminPort := servingCfg.AdminPort
 	proxyTLSEnabled := servingCfg.ProxyTLSEnabled
+	profilingAddr := servingCfg.ProfilingAddr
 
 	// setup the configured metrics collectors
 	metrics.NewMetricsCollectors(metricsCfg)
@@ -218,6 +220,13 @@ func main() {
 		return nil
 	})
 
+	if len(profilingAddr) > 0 {
+		eg.Go(func() error {
+			setupLog.Info("enabling pprof for profiling", "address", profilingAddr)
+			return http.ListenAndServe(profilingAddr, nil)
+		})
+	}
+
 	build.PrintComponentInfo(ctrl.Log, "Interceptor")
 
 	if err := eg.Wait(); err != nil && !errors.Is(err, context.Canceled) {

operator/main.go

@@ -57,11 +57,13 @@ func main() {
 	var metricsAddr string
 	var enableLeaderElection bool
 	var probeAddr string
+	var profilingAddr string
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
+	flag.StringVar(&profilingAddr, "profiling-bind-address", "", "The address the profiling would be exposed on.")
 	opts := zap.Options{
 		Development: true,
 	}
@@ -96,6 +98,7 @@ func main() {
 		Metrics: server.Options{
 			BindAddress: metricsAddr,
 		},
+		PprofBindAddress:              profilingAddr,
 		HealthProbeBindAddress:        probeAddr,
 		LeaderElection:                enableLeaderElection,
 		LeaderElectionID:              "http-add-on.keda.sh",

pkg/k8s/endpoints_test.go

@@ -57,7 +57,6 @@ func TestGetEndpoints(t *testing.T) {
 	addrLookup := map[string]*v1.EndpointAddress{}
 	for _, subset := range endpoints.Subsets {
 		for _, addr := range subset.Addresses {
-			addr := addr
 			key := fmt.Sprintf("http://%s:%s", addr.IP, svcPort)
 			addrLookup[key] = &addr
 		}

pkg/routing/table_test.go

@@ -190,8 +190,6 @@ var _ = Describe("Table", func() {
 			defer cancel()
 
 			for _, httpso := range httpsoList.Items {
-				httpso := httpso
-
 				key := *k8s.NamespacedNameFromObject(&httpso)
 				t.httpScaledObjects[key] = &httpso
 			}
@@ -216,8 +214,6 @@ var _ = Describe("Table", func() {
 			defer cancel()
 
 			for _, httpso := range httpsoList.Items {
-				httpso := httpso
-
 				key := *k8s.NamespacedNameFromObject(&httpso)
 				t.httpScaledObjects[key] = &httpso
 			}
@@ -285,8 +281,6 @@ var _ = Describe("Table", func() {
 
 		It("returns new memory based on HTTPSOs", func() {
 			for _, httpso := range httpsoList.Items {
-				httpso := httpso
-
 				key := *k8s.NamespacedNameFromObject(&httpso)
 				t.httpScaledObjects[key] = &httpso
 			}

pkg/routing/tablememory_test.go

@@ -484,8 +484,6 @@ var _ = Describe("TableMemory", func() {
 				store: iradix.New[*httpv1alpha1.HTTPScaledObject](),
 			}
 			for _, httpso := range httpsoList.Items {
-				httpso := httpso
-
 				tm = insertTrees(tm, &httpso)
 			}