use correct paths, simplify extraction

Author: sean-breen

.github/workflows/ci.yml

@@ -70,6 +70,7 @@ jobs:
           make generate-pgo-profile
 
       - name: Archive Load Test CPU profile
+        id: artifact-upload-step
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
           name: cpu-profile
@@ -80,8 +81,8 @@ jobs:
         run: |
           git config --global user.name 'github-actions'
           git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com'
-          git commit -m "CI Autogenerated" -- profile.pgo || echo "No changes to commit"
-#          git push
+          git commit -m "CI Autogenerated" -- ${{ steps.artifact-upload-step.outputs.artifact-id }} || echo "No changes to commit"
+          git log -1
 
   proxy-sanity-check:
     name: Proxy Sanity Check

Makefile

@@ -47,7 +47,6 @@ PROJECT_FILE	= main.go
 COLLECTOR_PATH  ?= /etc/nginx-agent/opentelemetry-collector-agent.yaml
 MANIFEST_DIR	?= /var/lib/nginx-agent
 DIRS            = $(BUILD_DIR) $(TEST_BUILD_DIR) $(BUILD_DIR)/$(DOCS_DIR) $(BUILD_DIR)/$(DOCS_DIR)/$(PROTO_DIR)
-TIME_NOW		:= $(shell date +%s)
 $(shell mkdir -p $(DIRS))
 
 VERSION ?= $(shell git describe --match "v[0-9]*" --abbrev=0 --tags)
@@ -294,9 +293,9 @@ generate-pgo-profile: build-mock-management-plane-grpc ## Generate PGO profile
 # 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 \
 		-t $(IMAGE_TAG)_load_test:1.0.0 . \
-		--no-cache \
 		-f ./test/docker/load/Dockerfile \
 		--secret id=nginx-crt,src=$(CERTS_DIR)/nginx-repo.crt \
 		--secret id=nginx-key,src=$(CERTS_DIR)/nginx-repo.key \
@@ -316,30 +315,17 @@ run-load-test-image: ## Run performance load testing image
 # Copy the files generated by the load tests
 	@$(CONTAINER_CLITOOL) cp \
 		agent-load-test:/agent/performance/load \
-		$(TEST_BUILD_DIR)/load
+		$(TEST_BUILD_DIR)
 	@echo "Results saved to $(TEST_BUILD_DIR)/load"
 	@find $(TEST_BUILD_DIR)/load -type f -exec ls -lh {} \;
 
-# Copy the benchmark json to the $(TEST_BUILD_DIR)/load directory for easier access
-	@$(CONTAINER_CLITOOL) cp \
-		agent-load-test:/agent/test/load \
-		$(TEST_BUILD_DIR)/load
-	@echo "Benchmark results saved to $(TEST_BUILD_DIR)/load/benchmarks.json"
-
-# Copy the results to the $(TEST_BUILD_DIR)/load directory for easier access
-	@$(CONTAINER_CLITOOL) cp \
-		agent-load-test:/agent/test/load/results \
-		$(TEST_BUILD_DIR)/load/
-	@echo "Benchmark results saved to $(TEST_BUILD_DIR)/load/results"
-
 # Stop and remove the container
 	@$(CONTAINER_CLITOOL) stop agent-load-test && $(CONTAINER_CLITOOL) rm -f agent-load-test
 
 run-load-test-with-cpu-profiling: ## Run performance load testing with cpu profiling
 	@echo "🚚  Running load tests with cpu profiling"
-	@mkdir -p $(TEST_BUILD_DIR)
+	@mkdir -p $(TEST_BUILD_DIR)/load-cpu-profiling
 	@$(CONTAINER_CLITOOL) rm -f agent-load-test-with-cpu-profiling || true
-	@echo "Current epoch time is $(TIME_NOW)"
 
 # Run the load test container
 	@$(CONTAINER_BUILDENV) $(CONTAINER_CLITOOL) run \
@@ -348,23 +334,11 @@ run-load-test-with-cpu-profiling: ## Run performance load testing with cpu profi
 		$(IMAGE_TAG)_load_test:1.0.0
 
 # Copy the files generated by the load tests
-	DIR=profiles/$(TIME_NOW)
 	@$(CONTAINER_CLITOOL) cp \
 		agent-load-test-with-cpu-profiling:/agent/performance/load \
-		$(DIR)
-	@echo "Benchmarks and profile saved to $(DIR) directory"
-
-# Copy the benchmark results to the root of build directory for easier access
-	@$(CONTAINER_CLITOOL) cp \
-		agent-load-test-with-cpu-profiling:/agent/test/load/benchmarks.json \
-		$(TEST_BUILD_DIR)/load/benchmarks.json
-	@echo "Benchmark results saved to $(TEST_BUILD_DIR)/load/benchmarks.json"
-
-# Copy the results to the $(TEST_BUILD_DIR)/load directory for easier access
-	@$(CONTAINER_CLITOOL) cp \
-		agent-load-test:/agent/test/load/results \
-		$(TEST_BUILD_DIR)/load
-	@echo "Benchmark results saved to $(TEST_BUILD_DIR)/load/results"
+		$(TEST_BUILD_DIR)/load-cpu-profiling
+	@echo "Results saved to $(TEST_BUILD_DIR)/load-cpu-profiling"
 
 # Stop and remove the container
-	@$(CONTAINER_CLITOOL) stop agent-load-test-with-cpu-profiling && $(CONTAINER_CLITOOL) rm -f agent-load-test-with-cpu-profiling
+	@$(CONTAINER_CLITOOL) stop agent-load-test-with-cpu-profiling && \
+		$(CONTAINER_CLITOOL) rm -f agent-load-test-with-cpu-profiling

test/docker/load/entrypoint.sh

@@ -7,38 +7,29 @@ load_test() {
   echo "Running load tests..."
   pushd test/load
   go test -v -timeout 1m ./...
-
   cp benchmarks.json ${BENCHMARKS_DIR}
-  cp -r results ${BENCHMARKS_DIR}/results
+  cp -r results ${BENCHMARKS_DIR}
   popd
 }
 
 load_test_with_profile() {
   echo "Running load tests with CPU Profiling enabled..."
   pushd test/load
   go test -v -timeout 1m ./... \
-    -cpuprofile ${BENCHMARKS_DIR}/metrics_load_cpu.pprof
-
-  cp benchmarks.json ${BENCHMARKS_DIR}/benchmarks.json
-  cp -r results ${BENCHMARKS_DIR}/results
-
+    -cpuprofile metrics_load_cpu.pprof
+  cp benchmarks.json ${BENCHMARKS_DIR}
+  cp -r results ${BENCHMARKS_DIR}
+  cp *.pprof ${BENCHMARKS_DIR}
   popd
 }
 
 ## Main script execution starts here
 mkdir -p ${BENCHMARKS_DIR}
-
 echo "Running in $(pwd)"
-# Run load tests
-#   $PROFILE - if true, run with CPU profiling enabled
 if [[ "$PROFILE" == "true" ]]; then
   echo "CPU Profiling is enabled."
-  load_test_with_profile || { echo "Load tests with profiling failed"; exit 1; }
+  load_test_with_profile || { echo "Load tests with cpu profiling failed"; exit 1; }
 else
   load_test || { echo "Load tests failed"; exit 1; }
 fi
-
-echo "Listing contents of ${BENCHMARKS_DIR}:"
-ls -la ${BENCHMARKS_DIR}
-
 echo "Done."