Merge branch 'inject-build-pgo-profile' into inject-build-pgo-profile…

…-test

.github/workflows/benchmarks.yml

@@ -63,8 +63,8 @@ jobs:
       GOBENCH_HOST: ${{ secrets.GOBENCH_HOST }}
       # temporarily override to get faster feedback
       BENCHMARK_WARMUP_TIME: 1m
-      BENCHMARK_COUNT: 2
-      BENCHMARK_TIME: 1m
+      BENCHMARK_COUNT: 1
+      BENCHMARK_TIME: 10s
     steps:
       - uses: actions/checkout@v4
 
@@ -241,7 +241,7 @@ jobs:
 
       - name: Tear down benchmark environment
         if: always()
-        run: make destroy
+        run: make init destroy
 
       # Notify failure to Slack only on schedule (nightly run)
       - if: failure() && github.event_name == 'schedule'

testing/benchmark/Makefile

@@ -179,20 +179,20 @@ cleanup-elasticsearch:
 	@ curl -u $(ELASTICSEARCH_USER):$(ELASTICSEARCH_PASS) -XDELETE $(ELASTICSEARCH_URL)/_data_stream/$(APM_DATA_STREAMS)
 
 # This target is intended to be run from CI to create a PGO update PR.
+PGO_BRANCH = update-pgo-$(shell date +%s)
 .PHONY: push-pgo-pr
 push-pgo-pr:
 	@cd $(WORKSPACE_PATH)
 	@git config user.email "[email protected]"
 	@git config user.name "APM Server"
 	@git fetch origin main
 	@git checkout main
-	@BRANCH="update-pgo-$(date +%s)"
-	@git checkout -b $(BRANCH)
+	@git checkout -b $(PGO_BRANCH)
 	@mv $(PROFILE_PATH) x-pack/apm-server/default.pgo
 	@git add x-pack/apm-server/default.pgo
 	@git commit -m "PGO: Update default.pgo from benchmarks $(WORKFLOW)."
-	@git push -u origin $(BRANCH)
-	@gh pr create -B main -H $(BRANCH) -t "PGO: Update default.pgo" -b "Update default.pgo CPU profile from the benchmarks [workflow]($(WORKFLOW))." -R elastic/apm-server
+	@git push -u origin $(PGO_BRANCH)
+	@gh pr create -B main -H $(PGO_BRANCH) -t "PGO: Update default.pgo" -b "Update default.pgo CPU profile from the benchmarks [workflow]($(WORKFLOW))." -R elastic/apm-server
 
 ##############################################################################
 # Target for creating a .tfvars file, defining the custom Docker images to