Merge main into 1.x

.ci/Makefile

@@ -1,11 +1,21 @@
 ifeq ($(DOCKERFILE),)
 	ifeq ($(BUILD_ARCHITECTURE), linuxmusl-x86-64)
 		DOCKERFILE := Dockerfile.alpine
+	else ifeq ($(BUILD_ARCHITECTURE), linuxmusl-arm64)
+		DOCKERFILE := Dockerfile.alpine
 	else
 		DOCKERFILE := Dockerfile
 	endif
 endif
 
+DOCKER_PLATFORM := linux/x86_64
+ifeq ($(BUILD_ARCHITECTURE), linux-arm64)
+	DOCKER_PLATFORM := linux/arm64
+else ifeq ($(BUILD_ARCHITECTURE), linuxmusl-arm64)
+	DOCKER_PLATFORM := linux/arm64
+endif
+
+
 SHELL=/bin/bash -o pipefail
 MAKEFLAGS += --no-print-directory
 IMAGE := test-php
@@ -45,6 +55,7 @@ prepare:  ## Build docker image for building and testing the project
 	docker build \
 		--build-arg PHP_VERSION=${PHP_VERSION} --build-arg SEL_DISTRO=${SEL_DISTRO}\
 		--tag $(IMAGE):${PHP_VERSION}$(SUFFIX) \
+		--platform $(DOCKER_PLATFORM) \
 		-f ${DOCKERFILE} .
 	@echo "::endgroup::"
 
@@ -59,8 +70,8 @@ build:
 		-w /source/agent/native \
 		-e CONAN_USER_HOME=$(CONAN_USER_HOME) \
 		elasticobservability/apm-agent-php-dev:native-build-gcc-12.2.0-$(BUILD_ARCHITECTURE)-0.0.2 \
-		sh -c "cmake --preset $(BUILD_ARCHITECTURE)-release \
-				&& cmake --build --preset $(BUILD_ARCHITECTURE)-release -j$(nproc)\
+		sh -c "cmake --preset $(BUILD_ARCHITECTURE)-release  \
+				&& cmake --build --preset $(BUILD_ARCHITECTURE)-release \
 				&& ctest --preset $(BUILD_ARCHITECTURE)-release --verbose"
 	@echo "::endgroup::"
 

.ci/env_vars_for_external_services_for_component_tests_on_host.sh

@@ -11,4 +11,4 @@ export ELASTIC_APM_PHP_TESTS_MYSQL_PORT=43306
 
 dockerComposeCmdFilesPart="-f ${thisScriptDir}/docker-compose_external_services_for_component_tests.yml"
 dockerComposeCmdFilesPart="${dockerComposeCmdFilesPart} -f ${thisScriptDir}/docker-compose_external_services_for_component_tests_on_host.yml"
-export ELASTIC_APM_PHP_TESTS_EXTERNAL_SERVICES_START_CMD="docker-compose ${dockerComposeCmdFilesPart} up -d"
+export ELASTIC_APM_PHP_TESTS_EXTERNAL_SERVICES_START_CMD="docker compose ${dockerComposeCmdFilesPart} up -d"

.ci/generate_package_lifecycle_test_matrix.sh

@@ -106,8 +106,13 @@ function generateAgentUpgradeRows () {
     local testingType=agent-upgrade
     local appHostKindShortName=all
     local testsGroup=smoke
+    for phpVersion in 7.4 ; do
+        for linuxPackageType in rpm ; do
+            echo "${phpVersion},${linuxPackageType},${testingType},${appHostKindShortName},${testsGroup}"
+        done
+    done
     for phpVersion in 7.4 "$(latestSupportedPhpVersion)" ; do
-        for linuxPackageType in deb rpm ; do
+        for linuxPackageType in deb ; do
             echo "${phpVersion},${linuxPackageType},${testingType},${appHostKindShortName},${testsGroup}"
         done
     done

.ci/packer_cache.sh

@@ -15,6 +15,7 @@ php:8.0-fpm
 php:8.1-fpm
 php:8.2-fpm
 php:8.3-fpm
+php:8.4-fpm
 ruby:2.7.1-alpine3.12
 ubuntu:20.04
 "
@@ -26,7 +27,7 @@ if [ -x "$(command -v docker)" ]; then
 
   # Make sure list of PHP versions supported by the Elastic APM PHP Agent is in sync.
   # See the comment in .ci/shared.sh
-  for version in 7.2 7.3 7.4 8.0 8.1 8.2 8.3
+  for version in 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
   do
     PHP_VERSION=${version} make -f .ci/Makefile prepare || true
     DOCKERFILE=Dockerfile.alpine PHP_VERSION=${version} make -f .ci/Makefile prepare || true

.ci/shared.sh

@@ -16,7 +16,7 @@ set -e
 # *) docker-compose.yml in packaging/test
 
 #
-export ELASTIC_APM_PHP_TESTS_SUPPORTED_PHP_VERSIONS=(7.2 7.3 7.4 8.0 8.1 8.2 8.3)
+export ELASTIC_APM_PHP_TESTS_SUPPORTED_PHP_VERSIONS=(7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4)
 
 export ELASTIC_APM_PHP_TESTS_SUPPORTED_LINUX_NATIVE_PACKAGE_TYPES=(apk deb rpm)
 export ELASTIC_APM_PHP_TESTS_SUPPORTED_LINUX_PACKAGE_TYPES=("${ELASTIC_APM_PHP_TESTS_SUPPORTED_LINUX_NATIVE_PACKAGE_TYPES[@]}" tar)

.ci/start_external_services_for_component_tests.sh

@@ -11,7 +11,7 @@ thisScriptDir="$( dirname "${BASH_SOURCE[0]}" )"
 thisScriptDir="$( realpath "${thisScriptDir}" )"
 
 if [ -z "${ELASTIC_APM_PHP_TESTS_EXTERNAL_SERVICES_START_CMD}" ] ; then
-    export ELASTIC_APM_PHP_TESTS_EXTERNAL_SERVICES_START_CMD="docker-compose -f ${thisScriptDir}/docker-compose_external_services_for_component_tests.yml up -d"
+    export ELASTIC_APM_PHP_TESTS_EXTERNAL_SERVICES_START_CMD="docker compose -f ${thisScriptDir}/docker-compose_external_services_for_component_tests.yml up -d"
 fi
 
 run_command_with_timeout_and_retries_args=(--retry-on-error=yes)

.ci/stop_external_services_for_component_tests.sh

@@ -4,4 +4,4 @@ set -xe
 thisScriptDir="$( dirname "${BASH_SOURCE[0]}" )"
 thisScriptDir="$( realpath "${thisScriptDir}" )"
 
-docker-compose -f "${thisScriptDir}/docker-compose_external_services_for_component_tests.yml" down -v --remove-orphans
+docker compose -f "${thisScriptDir}/docker-compose_external_services_for_component_tests.yml" down -v --remove-orphans