Merge branch 'main' into 918_modernbuild_draft_centos_merge

Author: intuibase

.ci/run-phpt-tests.sh

@@ -46,7 +46,7 @@ AGENT_EXTENSION=$AGENT_EXTENSION_DIR/elastic_apm-$PHP_API.so
 
 ls -al $AGENT_EXTENSION_DIR
 
-RUN_TESTS=$(find /usr/local/lib/php -type f -name run-tests.php)
+RUN_TESTS=./tests/run-tests.php
 
 #Disable agent for auxiliary PHP processes to reduce noise in logs
 export ELASTIC_APM_ENABLED=false

.ci/run_docker_with_component_tests.sh

@@ -29,6 +29,8 @@ function shouldPassEnvVarToDocker () {
 }
 
 function buildDockerEnvVarsCommandLinePart () {
+    # $1 should be the name of the environment variable to hold the result
+    # local -n makes `result' reference to the variable named by $1
     local -n result=$1
     result=()
     # Iterate over environment variables
@@ -79,6 +81,8 @@ function onScriptExit () {
 }
 
 function main () {
+    local dockerToRunImageName=${1:?}
+
     if [ -z "${ELASTIC_APM_PHP_TESTS_MATRIX_ROW}" ] ; then
         echo "ELASTIC_APM_PHP_TESTS_MATRIX_ROW environment variable should be set before calling ${BASH_SOURCE[0]}"
         exit 1
@@ -96,12 +100,24 @@ function main () {
 
     repoRootDir="$( realpath "${thisScriptDir}/.." )"
 
-    buildDockerEnvVarsCommandLinePart dockerRunCmdVariablePart
+    buildDockerEnvVarsCommandLinePart dockerRunCmdLineArgs
+
+    # Let the tests know that are being run inside a container
+    dockerRunCmdLineArgs=("${dockerRunCmdLineArgs[@]}" -e "ELASTIC_APM_PHP_TESTS_IS_IN_CONTAINER=true")
+
+    # ELASTIC_APM_PHP_TESTS_THIS_CONTAINER_IMAGE_NAME is used by tests to find container ID
+    dockerRunCmdLineArgs=("${dockerRunCmdLineArgs[@]}" -e "ELASTIC_APM_PHP_TESTS_THIS_CONTAINER_IMAGE_NAME=${dockerToRunImageName}")
+
     if [ "${shouldStartExternalServices}" == "true" ] ; then
-        dockerRunCmdVariablePart=("${dockerRunCmdVariablePart[@]}" "--network=elastic-apm-php-external-services-for-component-tests-net")
+        dockerRunCmdLineArgs=("${dockerRunCmdLineArgs[@]}" "--network=elastic-apm-php-external-services-for-component-tests-net")
     fi
-    # shellcheck disable=SC2154 # dockerRunCmdVariablePart is assigned by buildDockerEnvVarsCommandLinePart
-    docker run --rm -v "${repoRootDir}:/app" -w /app "${dockerRunCmdVariablePart[@]}" "$@"
+
+    dockerRunCmdLineArgs=("${dockerRunCmdLineArgs[@]}" -v /var/run/docker.sock:/var/run/docker.sock)
+    dockerRunCmdLineArgs=("${dockerRunCmdLineArgs[@]}" -v "${repoRootDir}:/app")
+    dockerRunCmdLineArgs=("${dockerRunCmdLineArgs[@]}" -w /app)
+
+    # shellcheck disable=SC2154 # dockerRunCmdLineArgs is assigned by buildDockerEnvVarsCommandLinePart
+    docker run --rm -w /app "${dockerRunCmdLineArgs[@]}" "$@"
 }
 
 main "$@"

.ci/shared.sh

@@ -77,3 +77,22 @@ function copySyslogFilesAndPrintTheMostRecentOne () {
         done
     fi
 }
+
+function runPhpCoposerInstall () {
+    local run_command_with_timeout_and_retries_args=(--max-tries=3)
+    run_command_with_timeout_and_retries_args=(--retry-on-error=yes "${run_command_with_timeout_and_retries_args[@]}")
+    local initialTimeoutInMinutes=5
+    local initialTimeoutInSeconds=$((initialTimeoutInMinutes*60))
+    run_command_with_timeout_and_retries_args=(--timeout="${initialTimeoutInSeconds}" "${run_command_with_timeout_and_retries_args[@]}")
+    run_command_with_timeout_and_retries_args=(--increase-timeout-exponentially=yes "${run_command_with_timeout_and_retries_args[@]}")
+    run_command_with_timeout_and_retries_args=(--wait-time-before-retry="${initialTimeoutInSeconds}" "${run_command_with_timeout_and_retries_args[@]}")
+
+    set +e
+    .ci/run_command_with_timeout_and_retries.sh "${run_command_with_timeout_and_retries_args[@]}" -- composer install
+    local composerCommandExitCode=$?
+    set -e
+
+    if [ ${composerCommandExitCode} -ne 0 ] ; then
+        exit ${composerCommandExitCode}
+    fi
+}

.ci/static-check-unit-test.sh

@@ -36,7 +36,6 @@ ensureSyslogIsRunning
 #     echo "${msg}"
 #     this_script_name="$( basename "${BASH_SOURCE[0]}" )"
 #     logger -t "${this_script_name}" "${msg}"
-
 #     # Disable exit-on-error
 #     set +e
 #     make test TESTS="--show-all ${phptFile}"
@@ -97,7 +96,7 @@ echo 'Set Elastic related environment variables:'
 env | grep ELASTIC || true
 
 # Install 3rd party dependencies
-composer install
+runPhpCoposerInstall
 
 # Run static checks
 composer run-script static_check

.ci/validate_agent_installation.sh

@@ -7,7 +7,7 @@ function printInfoAboutEnvironment () {
     echo 'Installed PHP extensions:'
     php -m
     echo 'Set Elastic related environment variables:'
-    env | grep ELASTIC || true
+    env | grep -i elastic | sort || true
 }
 
 function runComponentTests () {
@@ -61,25 +61,6 @@ function runComponentTests () {
     exit ${composerCommandExitCode}
 }
 
-function runPhpCoposerInstall () {
-    local run_command_with_timeout_and_retries_args=(--max-tries=3)
-    run_command_with_timeout_and_retries_args=(--retry-on-error=yes "${run_command_with_timeout_and_retries_args[@]}")
-    local initialTimeoutInMinutes=5
-    local initialTimeoutInSeconds=$((initialTimeoutInMinutes*60))
-    run_command_with_timeout_and_retries_args=(--timeout="${initialTimeoutInSeconds}" "${run_command_with_timeout_and_retries_args[@]}")
-    run_command_with_timeout_and_retries_args=(--increase-timeout-exponentially=yes "${run_command_with_timeout_and_retries_args[@]}")
-    run_command_with_timeout_and_retries_args=(--wait-time-before-retry="${initialTimeoutInSeconds}" "${run_command_with_timeout_and_retries_args[@]}")
-
-    set +e
-    .ci/run_command_with_timeout_and_retries.sh "${run_command_with_timeout_and_retries_args[@]}" -- composer install
-    local composerCommandExitCode=$?
-    set -e
-
-    if [ ${composerCommandExitCode} -ne 0 ] ; then
-        exit ${composerCommandExitCode}
-    fi
-}
-
 function main () {
     thisScriptDir="$( dirname "${BASH_SOURCE[0]}" )"
     thisScriptDir="$( realpath "${thisScriptDir}" )"

CHANGELOG.asciidoc

@@ -20,6 +20,14 @@ endif::[]
 
 // Using the template above, release notes go here.
 // CHANGELOG_AUTOMATION_KEYWORD
+[[release-notes-v1.8.4]]
+=== v1.8.4 - 2023/05/17
+[float]
+==== Bug fixes
+* Fixed deadlock caused by use of pthread_atfork {pull}964[#964]
+* Fixed verify_server_cert=false not disabling all the checks related to HTTPS certificate {pull}965[#965]
+* Fixed not joining background sender thread if there was fork after module init {pull}959[#959]
+
 [[release-notes-v1.8.3]]
 === v1.8.3 - 2023/04/21
 [float]

Dockerfile

@@ -1,5 +1,5 @@
 ARG PHP_VERSION=7.2
-FROM php:${PHP_VERSION}-fpm
+FROM php:${PHP_VERSION}-fpm-buster
 
 RUN apt-get -qq update \
     && apt-get -qq -y --no-install-recommends install \
@@ -30,8 +30,3 @@ ENV ELASTIC_APM_ENABLED=false
 
 # Create a link to extensions directory to make it easier accessible (paths are different between php releases)
 RUN ln -s `find /usr/local/lib/php/extensions/ -name opcache.so | head -n1 | xargs dirname` /tmp/extensions
-
-# Patch run-tests.php to handle SKIPIF correctly in tests with agent debug logs enabled
-RUN find /usr/local/lib/php/ -name run-tests.php | xargs sed -i 's#if (!strncasecmp(\x27skip\x27, ltrim(\$output), 4))#if (!strncasecmp(\x27skip\x27, ltrim(\$output), 4) || strstr(\$output, \x27ElasticApmSkipTest\x27))#g'
-
-RUN find /usr/local/lib/php/ -name run-tests.php | xargs sed -i 's#system_with_timeout("\$extra \$php \$pass_options -q \$ini_settings \$no_file_cache -d display_errors=0 \\"\$test_skipif\\"", \$env)#system_with_timeout("\$extra \$php \$pass_options -q \$ini_settings \$no_file_cache -d display_errors=0 \\"\$test_skipif\\" 2>\&1", \$env)#g'

Dockerfile.alpine

@@ -38,8 +38,3 @@ ENV ELASTIC_APM_ENABLED=false
 
 # Create a link to extensions directory to make it easier accessible (paths are different between php releases)
 RUN ln -s `find /usr/local/lib/php/extensions/ -name opcache.so | head -n1 | xargs dirname` /tmp/extensions
-
-# Patch run-tests.php to handle SKIPIF correctly in tests with agent debug logs enabled
-RUN find /usr/local/lib/php/ -name run-tests.php | xargs sed -i 's#if (!strncasecmp(\x27skip\x27, ltrim(\$output), 4))#if (!strncasecmp("skip", ltrim(\$output), 4) || strstr(\$output, "ElasticApmSkipTest"))#g'
-
-RUN find /usr/local/lib/php/ -name run-tests.php | xargs sed -i 's#system_with_timeout("\$extra \$php \$pass_options -q \$ini_settings \$no_file_cache -d display_errors=0 \\"\$test_skipif\\"", \$env)#system_with_timeout("\$extra \$php \$pass_options -q \$ini_settings \$no_file_cache -d display_errors=0 \\"\$test_skipif\\" 2>\&1", \$env)#g'