removed deprecated libunwind dependency settings

Author: intuibase

.ci/Jenkinsfile

@@ -31,7 +31,6 @@ pipeline {
     choice(name: 'AGENT_LOG_LEVEL', choices: LOG_LEVELS, description: "Agent's log level")
     choice(name: 'TESTS_LOG_LEVEL', choices: LOG_LEVELS, description: "Tests' log level")
     booleanParam(name: 'INCLUDE_TESTING', defaultValue: true, description: 'Should the testing stages be included?')
-    booleanParam(name: 'ADD_LIBUNWIND_DEPENDENCY', defaultValue: false, description: 'Should Alpine (.apk) build have dependency on libunwind (to be able to log C call stack on crash)?')
   }
   stages {
     stage('Initializing'){
@@ -149,7 +148,7 @@ pipeline {
                     // When running in the CI with multiple parallel stages
                     // the access could be considered as a DDOS attack.
                     retryWithSleep(retries: 3, seconds: 45, backoff: true) {
-                        sh script: "BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE} PHP_VERSION=${PHP_VERSION} ADD_LIBUNWIND_DEPENDENCY=${params.ADD_LIBUNWIND_DEPENDENCY} make -f .ci/Makefile prepare", label: 'prepare docker image'
+                        sh script: "BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE} PHP_VERSION=${PHP_VERSION} make -f .ci/Makefile prepare", label: 'prepare docker image'
                     }
                     unstash "built-extensions-${BUILD_ARCHITECTURE}"
                     sh script: "BUILD_ARCHITECTURE=${BUILD_ARCHITECTURE} PHP_VERSION=${PHP_VERSION} make -f .ci/Makefile run-phpt-tests", label: 'run-phpt-tests'
@@ -604,7 +603,6 @@ def addEnvVarsFromParams(def withEnvList) {
     if (params.TESTS_LOG_LEVEL != null && !params.TESTS_LOG_LEVEL.equals(LOG_LEVEL_NOT_SET)) {
       withEnvList.add('ELASTIC_APM_PHP_TESTS_LOG_LEVEL=' + params.TESTS_LOG_LEVEL)
     }
-    withEnvList.add('ADD_LIBUNWIND_DEPENDENCY=' + params.ADD_LIBUNWIND_DEPENDENCY)
     return withEnvList
 }
 

.ci/Makefile

@@ -13,11 +13,9 @@ PHP_VERSION ?= 7.2
 DOCKERFILE ?= Dockerfile
 LOOPS ?= 50
 SUFFIX :=
-ADD_LIBUNWIND_DEPENDENCY_BUILD_ARG_OPT:=
 ifeq ($(DOCKERFILE), Dockerfile.alpine)
     ## This is only required to tag the docker images used for building/testing this project
     SUFFIX := -alpine
-    ADD_LIBUNWIND_DEPENDENCY_BUILD_ARG_OPT:=--build-arg ADD_LIBUNWIND_DEPENDENCY=${ADD_LIBUNWIND_DEPENDENCY}
 endif
 
 MAP_CONAN_HOME_TO_DOCKER_HOST_CMD_LINE_ARG:=
@@ -39,7 +37,6 @@ prepare:  ## Build docker image for building and testing the project
 	@echo "::group::$@"  # Helping to group logs in GitHub actions
 	docker build \
 		--build-arg PHP_VERSION=${PHP_VERSION} \
-		${ADD_LIBUNWIND_DEPENDENCY_BUILD_ARG_OPT} \
 		--tag $(IMAGE):${PHP_VERSION}$(SUFFIX) \
 		-f ${DOCKERFILE} .
 	@echo "::endgroup::"

Dockerfile.alpine

@@ -12,12 +12,6 @@ RUN apk update \
     git \
     unzip
 
-ARG ADD_LIBUNWIND_DEPENDENCY=false
-RUN echo "ADD_LIBUNWIND_DEPENDENCY: ${ADD_LIBUNWIND_DEPENDENCY}"
-ENV ADD_LIBUNWIND_DEPENDENCY=${ADD_LIBUNWIND_DEPENDENCY}
-RUN if [[ "${ADD_LIBUNWIND_DEPENDENCY}" = "true" ]] ; then apk add libunwind-dev ; fi
-ENV ELASTIC_APM_ASSUME_CAN_CAPTURE_C_STACK_TRACE=${ADD_LIBUNWIND_DEPENDENCY}
-
 RUN docker-php-ext-install \
     mysqli \
     pcntl \

agent/native/ext/unit_tests/CMakeLists.txt

@@ -81,9 +81,7 @@ IF ( $ENV{CLION_IDE} )
     ADD_COMPILE_DEFINITIONS( ELASTIC_APM_UNDER_IDE )
 ENDIF()
 
-IF ( "$ENV{ELASTIC_APM_ASSUME_CAN_CAPTURE_C_STACK_TRACE}" STREQUAL "true" )
-    ADD_COMPILE_DEFINITIONS( ELASTIC_APM_ASSUME_CAN_CAPTURE_C_STACK_TRACE )
-ENDIF()
+ADD_COMPILE_DEFINITIONS( ELASTIC_APM_ASSUME_CAN_CAPTURE_C_STACK_TRACE )
 
 IF ( WIN32 )
     ADD_COMPILE_DEFINITIONS( PHP_WIN32 )

packaging/Makefile

@@ -102,7 +102,7 @@ tar-info:  ## Show the tar package metadata
 prepare-apk:  ## Build the docker image for the apk smoke tests
 	@echo "::group::$@"  # Helping to group logs in GitHub actions
 	cd $(PWD)/packaging/test/alpine ;\
-	docker build --build-arg PHP_VERSION=$(PHP_VERSION) --build-arg ADD_LIBUNWIND_DEPENDENCY=${ADD_LIBUNWIND_DEPENDENCY} -t $@ . || exit 1 ;\
+	docker build --build-arg PHP_VERSION=$(PHP_VERSION) -t $@ . || exit 1 ;\
 	cd -
 	@echo "::endgroup::"
 

packaging/test/alpine/Dockerfile

@@ -14,9 +14,6 @@ RUN apk update \
         unzip \
         wget
 
-ARG ADD_LIBUNWIND_DEPENDENCY=false
-RUN if [[ "${ADD_LIBUNWIND_DEPENDENCY}" = "true" ]] ; then apk add libunwind; fi
-
 RUN docker-php-ext-install \
         mysqli \
         pcntl \

packaging/test/docker-compose.yml

@@ -183,44 +183,38 @@ services:
             dockerfile: Dockerfile
             args:
                 - PHP_VERSION=8.2
-                - ADD_LIBUNWIND_DEPENDENCY=
     apk-php81:
         image: elasticobservability/apm-agent-php-dev:packages-test-apk-php-8.1-0.0.1
         build:
             context: alpine
             dockerfile: Dockerfile
             args:
                 - PHP_VERSION=8.1
-                - ADD_LIBUNWIND_DEPENDENCY=
     apk-php80:
         image: elasticobservability/apm-agent-php-dev:packages-test-apk-php-8.0-0.0.1
         build:
             context: alpine
             dockerfile: Dockerfile
             args:
                 - PHP_VERSION=8.0
-                - ADD_LIBUNWIND_DEPENDENCY=
     apk-php74:
         image: elasticobservability/apm-agent-php-dev:packages-test-apk-php-7.4-0.0.1
         build:
             context: alpine
             dockerfile: Dockerfile
             args:
                 - PHP_VERSION=7.4
-                - ADD_LIBUNWIND_DEPENDENCY=
     apk-php73:
         image: elasticobservability/apm-agent-php-dev:packages-test-apk-php-7.3-0.0.1
         build:
             context: alpine
             dockerfile: Dockerfile
             args:
                 - PHP_VERSION=7.3
-                - ADD_LIBUNWIND_DEPENDENCY=
     apk-php72:
         image: elasticobservability/apm-agent-php-dev:packages-test-apk-php-7.2-0.0.1
         build:
             context: alpine
             dockerfile: Dockerfile
             args:
                 - PHP_VERSION=7.2
-                - ADD_LIBUNWIND_DEPENDENCY=