tidy up, address feedback

Author: sean-breen

Makefile

@@ -296,14 +296,16 @@ generate-pgo-profile: build-mock-management-plane-grpc run-load-test-with-cpu-pr
 	IMAGE_PATH=$(IMAGE_PATH) TAG=${IMAGE_TAG} CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} \
 	scripts/performance/profiling.sh
 
-	@$(GOTOOL) pprof -proto -output=default.pgo build/test/profiles/merged.pprof build/test/load-cpu-profiling/load/metrics_load_cpu.pprof \
-		|| { echo "Failed to generate PGO profile"; exit 1; }
+	@$(GOTOOL) pprof -proto -output=default.pgo \
+		build/test/profiles/merged.pprof \
+		build/test/load-cpu-profiling/load/metrics_load_cpu.pprof \
+		|| { echo "Failed to merge profiles"; exit 1; }
 
 # run under sudo locally
 load-test-image: ## Build performance load testing image
 	@echo "🚚  Building load test image"
-# add 		--no-cache to the command below to avoid using cache
 	$(CONTAINER_BUILDENV) $(CONTAINER_CLITOOL) build \
+		--no-cache \
 		-t $(IMAGE_TAG)_load_test:1.0.0 . \
 		-f ./test/docker/load/Dockerfile \
 		--secret id=nginx-crt,src=$(CERTS_DIR)/nginx-repo.crt \

scripts/performance/profiling.sh

@@ -2,9 +2,8 @@
 
 # This script runs Go tests with CPU profiling enabled for all test packages found under the directories:
 #   - internal/watcher
-#   - test/integration
 # It saves the CPU profiles in the $PROFILES_DIR directory with the format <package-name>_<test_type>.pprof
-#   e.g. <package-name>_watcher_cpu.pprof or <package-name>_integration_cpu.pprof
+#   e.g. <package-name>_watcher_cpu.pprof
 
 # The variables below can be set to customize the environment for the integration tests:
 # Example using variables defined in our Makefile:
@@ -33,20 +32,6 @@ for pkg in $packages; do
     echo "Profile saved to: ${PROFILES_DIR}/$(basename $pkg)_watcher_cpu.pprof"
 done
 
-### Run integration tests with CPU profiling for each package
-#echo "Starting integration tests cpu profiling tests..."
-#packages=$(find test/integration -type f -name '*_test.go' -exec dirname {} \; | sort -u)
-#echo "Found packages:"
-#echo "$packages"
-#for pkg in $packages; do
-#    echo "Running tests in package: ${pkg}"
-#    go test \
-#      -count 3 -timeout 3m \
-#      -cpuprofile "${PROFILES_DIR}/$(basename $pkg)_integration_cpu.pprof" \
-#      "./${pkg}" || { echo "Tests failed in package: ${pkg}, but continuing..."; continue; }
-#    echo "Profile saved to: ${PROFILES_DIR}/$(basename $pkg)_integration_cpu.pprof"
-#done
-
 ## Merge all CPU profiles
 files=$(ls ${PROFILES_DIR}/*.pprof)
 echo "Merging CPU profiles: $files"