From 960f83dfffc605dce7b99b637e5499d85c97dd66 Mon Sep 17 00:00:00 2001
From: roberto montero <roberto.montero@datadoghq.com>
Date: Wed, 3 Jan 2024 15:42:18 +0100
Subject: [PATCH 1/9] Create docker base image for dd-library-php

---
 .gitlab-ci.yml                            | 16 ++++++++++++++
 tooling/ci/Dockerfile-ddlib               | 14 ++++++++++++
 tooling/ci/ddlib-info.sh                  | 26 +++++++++++++++++++++++
 tooling/ci/download-binary-php-library.sh | 19 +++++++++++++++++
 4 files changed, 75 insertions(+)
 create mode 100644 tooling/ci/Dockerfile-ddlib
 create mode 100755 tooling/ci/ddlib-info.sh
 create mode 100755 tooling/ci/download-binary-php-library.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79419d17d4..c51a7ad316 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,3 +77,19 @@ tracer-base-image:
     - ./tooling/ci/download-binary-php.sh prod
     - docker build -t ghcr.io/datadog/dd-trace-php/dd-trace-php:latest -f ./tooling/ci/Dockerfile .
     - docker push ghcr.io/datadog/dd-trace-php/dd-trace-php:latest
+
+php-library-base-image:
+  extends: .ci_authenticated_job
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+      when: always
+  stage: deploy
+  script:
+    - echo $GH_TOKEN|docker login ghcr.io/datadog -u uploader --password-stdin
+    - ./tooling/ci/download-binary-php-library.sh dev
+    - docker build -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot -f ./tooling/ci/Dockerfile-ddlib .
+    - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot
+    - rm -rf ./tooling/ci/binaries
+    - ./tooling/ci/download-binary-php-library.sh prod
+    - docker build -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest -f ./tooling/ci/Dockerfile-ddlib .
+    - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest
\ No newline at end of file
diff --git a/tooling/ci/Dockerfile-ddlib b/tooling/ci/Dockerfile-ddlib
new file mode 100644
index 0000000000..ae0aec21d7
--- /dev/null
+++ b/tooling/ci/Dockerfile-ddlib
@@ -0,0 +1,14 @@
+FROM datadog/dd-appsec-php-ci:php-7.0-release AS php_agent_debug
+RUN apt-get update && apt-get install -y jq
+COPY ./tooling/ci/ddlib-info.sh ./tooling/ci/binaries* /binaries/
+RUN /binaries/ddlib-info.sh
+RUN php -d error_reporting='' -r 'echo phpversion("ddtrace");' > /binaries/LIBRARY_VERSION
+RUN touch -c -a -m -d @0 /binaries/*
+
+FROM scratch as collect
+COPY --from=php_agent_debug /binaries/dd-library-php-*-gnu.tar.gz /
+COPY --from=php_agent_debug /binaries/datadog-setup.php /datadog-setup.php
+COPY --from=php_agent_debug /binaries/LIBRARY_VERSION /LIBRARY_VERSION
+
+FROM scratch
+COPY --from=collect /* /
diff --git a/tooling/ci/ddlib-info.sh b/tooling/ci/ddlib-info.sh
new file mode 100755
index 0000000000..9b1c836043
--- /dev/null
+++ b/tooling/ci/ddlib-info.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -eu
+
+PKG=$(find /binaries -maxdepth 1 -name 'dd-library-php-*-gnu.tar.gz')
+SETUP=/binaries/datadog-setup.php
+
+if [ "$PKG" != "" ] && [ ! -f "$SETUP" ]; then
+  echo "local install failed: package located in /binaries but datadog-setup.php not present, please include it"
+  exit 1
+fi
+
+if [ "$PKG" == "" ]; then
+  ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
+  if [ "$ARCH" = "arm64" ]; then
+    ARCH=aarch64
+  else
+    ARCH=x86_64
+  fi
+  unset PKG
+fi
+
+export PHP_INI_SCAN_DIR="/etc/php"
+
+echo "Installing php package ${PKG-"{default}"} with setup script $SETUP"
+php $SETUP --php-bin=all ${PKG+"--file=$PKG"}
+
diff --git a/tooling/ci/download-binary-php-library.sh b/tooling/ci/download-binary-php-library.sh
new file mode 100755
index 0000000000..434ab6fc26
--- /dev/null
+++ b/tooling/ci/download-binary-php-library.sh
@@ -0,0 +1,19 @@
+VERSION=${1:-'dev'}
+
+echo "Load $VERSION binary "
+
+mkdir -p tooling/ci/binaries
+cd tooling/ci/binaries
+
+#This script resides inside of docker image (ci_docker_base)
+source /download-binary-tracer.sh
+
+if [ $VERSION = 'dev' ]; then
+    get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "dd-library-php-.*-x86_64-linux-gnu.tar.gz" "dd-library-php-x86_64-linux-gnu.tar.gz"
+    get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "datadog-setup.php" "datadog-setup.php"
+elif [ $VERSION = 'prod' ]; then
+    get_github_release_asset "DataDog/dd-trace-php" "dd-library-php-.*-x86_64-linux-gnu.tar.gz" "dd-library-php-x86_64-linux-gnu.tar.gz"
+    get_github_release_asset "DataDog/dd-trace-php" "datadog-setup.php" "datadog-setup.php"
+else
+    echo "Don't know how to load version $VERSION for $TARGET"
+fi

From f53d9bcef502a982e0a880c2411005faf4b1792a Mon Sep 17 00:00:00 2001
From: roberto montero <roberto.montero@datadoghq.com>
Date: Thu, 4 Jan 2024 08:45:45 +0100
Subject: [PATCH 2/9] format

---
 tooling/ci/ddlib-info.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/ci/ddlib-info.sh b/tooling/ci/ddlib-info.sh
index 9b1c836043..3cae1f3034 100755
--- a/tooling/ci/ddlib-info.sh
+++ b/tooling/ci/ddlib-info.sh
@@ -5,7 +5,7 @@ PKG=$(find /binaries -maxdepth 1 -name 'dd-library-php-*-gnu.tar.gz')
 SETUP=/binaries/datadog-setup.php
 
 if [ "$PKG" != "" ] && [ ! -f "$SETUP" ]; then
-  echo "local install failed: package located in /binaries but datadog-setup.php not present, please include it"
+  echo "local install failed: package located in /binaries but datadog-setup.php not present, please include it."
   exit 1
 fi
 

From 78bc763f5a9a4cbf8562704bec4d22366850d65f Mon Sep 17 00:00:00 2001
From: roberto montero <roberto.montero@datadoghq.com>
Date: Wed, 10 Jan 2024 11:07:42 +0100
Subject: [PATCH 3/9] generate arm images

---
 .gitlab-ci.yml                            | 36 ++++++++---------
 tooling/ci/Dockerfile                     | 12 +++---
 tooling/ci/Dockerfile-ddlib               | 14 -------
 tooling/ci/ddlib-info.sh                  | 26 -------------
 tooling/ci/ddtrace-info.sh                | 47 +++++++++++------------
 tooling/ci/download-binary-php-library.sh | 19 ---------
 tooling/ci/download-binary-php.sh         |  9 +++--
 7 files changed, 49 insertions(+), 114 deletions(-)
 delete mode 100644 tooling/ci/Dockerfile-ddlib
 delete mode 100755 tooling/ci/ddlib-info.sh
 delete mode 100755 tooling/ci/download-binary-php-library.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c51a7ad316..48499cb364 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,26 +70,24 @@ tracer-base-image:
   stage: deploy
   script:
     - echo $GH_TOKEN|docker login ghcr.io/datadog -u uploader --password-stdin
-    - ./tooling/ci/download-binary-php.sh dev
-    - docker build -t ghcr.io/datadog/dd-trace-php/dd-trace-php:latest_snapshot -f ./tooling/ci/Dockerfile .
-    - docker push ghcr.io/datadog/dd-trace-php/dd-trace-php:latest_snapshot
-    - rm -rf ./tooling/ci/binaries
-    - ./tooling/ci/download-binary-php.sh prod
-    - docker build -t ghcr.io/datadog/dd-trace-php/dd-trace-php:latest -f ./tooling/ci/Dockerfile .
-    - docker push ghcr.io/datadog/dd-trace-php/dd-trace-php:latest
 
-php-library-base-image:
-  extends: .ci_authenticated_job
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-      when: always
-  stage: deploy
-  script:
-    - echo $GH_TOKEN|docker login ghcr.io/datadog -u uploader --password-stdin
-    - ./tooling/ci/download-binary-php-library.sh dev
-    - docker build -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot -f ./tooling/ci/Dockerfile-ddlib .
+    #Dev X86
+    - rm -rf ./tooling/ci/binaries
+    - ./tooling/ci/download-binary-php.sh dev   
+    - docker buildx build --load --progress=plain --platform linux/amd64 -f ./tooling/ci/Dockerfile -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot .
     - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot
+    #Dev ARM
+    - rm -rf ./tooling/ci/binaries
+    - ./tooling/ci/download-binary-php.sh dev aarch64
+    - docker buildx build --load --progress=plain --platform linux/arm64 -f ./tooling/ci/Dockerfile -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot .
+    - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot     
+    #Prod X86
+    - rm -rf ./tooling/ci/binaries
+    - ./tooling/ci/download-binary-php.sh prod   
+    - docker buildx build --load --progress=plain --platform linux/amd64 -f ./tooling/ci/Dockerfile -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest .
+    - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest
+    #Prod ARM
     - rm -rf ./tooling/ci/binaries
-    - ./tooling/ci/download-binary-php-library.sh prod
-    - docker build -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest -f ./tooling/ci/Dockerfile-ddlib .
+    - ./tooling/ci/download-binary-php.sh prod aarch64
+    - docker buildx build --load --progress=plain --platform linux/arm64 -f ./tooling/ci/Dockerfile -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest .
     - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest
\ No newline at end of file
diff --git a/tooling/ci/Dockerfile b/tooling/ci/Dockerfile
index 6b8885bc1d..e883c4dc00 100644
--- a/tooling/ci/Dockerfile
+++ b/tooling/ci/Dockerfile
@@ -1,16 +1,14 @@
 FROM datadog/dd-appsec-php-ci:php-7.0-release AS php_agent_debug
 RUN apt-get update && apt-get install -y jq
-COPY ./tooling/ci/ddtrace-info.sh ./tooling/ci/binaries* /binaries/
+COPY ./tooling/ci/ddlib-info.sh ./tooling/ci/binaries* /binaries/
 RUN /binaries/ddtrace-info.sh
+RUN php -d error_reporting='' -r 'echo phpversion("ddtrace");' > /binaries/LIBRARY_VERSION
 RUN touch -c -a -m -d @0 /binaries/*
 
 FROM scratch as collect
-COPY --from=php_agent_debug /binaries/datadog-php-tracer.x86_64.tar.gz /datadog-php-tracer.x86_64.tar.gz
-COPY --from=php_agent_debug /binaries/dd-appsec-php-amd64.tar.gz /dd-appsec-php-amd64.tar.gz
+COPY --from=php_agent_debug /binaries/dd-library-php-*-gnu.tar.gz /
+COPY --from=php_agent_debug /binaries/datadog-setup.php /datadog-setup.php
 COPY --from=php_agent_debug /binaries/LIBRARY_VERSION /LIBRARY_VERSION
-COPY --from=php_agent_debug /binaries/LIBDDWAF_VERSION /LIBDDWAF_VERSION
-COPY --from=php_agent_debug /binaries/APPSEC_EVENT_RULES_VERSION /APPSEC_EVENT_RULES_VERSION
-COPY --from=php_agent_debug /binaries/PHP_APPSEC_VERSION /PHP_APPSEC_VERSION
 
 FROM scratch
-COPY --from=collect /* /
+COPY --from=collect /* /
\ No newline at end of file
diff --git a/tooling/ci/Dockerfile-ddlib b/tooling/ci/Dockerfile-ddlib
deleted file mode 100644
index ae0aec21d7..0000000000
--- a/tooling/ci/Dockerfile-ddlib
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM datadog/dd-appsec-php-ci:php-7.0-release AS php_agent_debug
-RUN apt-get update && apt-get install -y jq
-COPY ./tooling/ci/ddlib-info.sh ./tooling/ci/binaries* /binaries/
-RUN /binaries/ddlib-info.sh
-RUN php -d error_reporting='' -r 'echo phpversion("ddtrace");' > /binaries/LIBRARY_VERSION
-RUN touch -c -a -m -d @0 /binaries/*
-
-FROM scratch as collect
-COPY --from=php_agent_debug /binaries/dd-library-php-*-gnu.tar.gz /
-COPY --from=php_agent_debug /binaries/datadog-setup.php /datadog-setup.php
-COPY --from=php_agent_debug /binaries/LIBRARY_VERSION /LIBRARY_VERSION
-
-FROM scratch
-COPY --from=collect /* /
diff --git a/tooling/ci/ddlib-info.sh b/tooling/ci/ddlib-info.sh
deleted file mode 100755
index 3cae1f3034..0000000000
--- a/tooling/ci/ddlib-info.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-set -eu
-
-PKG=$(find /binaries -maxdepth 1 -name 'dd-library-php-*-gnu.tar.gz')
-SETUP=/binaries/datadog-setup.php
-
-if [ "$PKG" != "" ] && [ ! -f "$SETUP" ]; then
-  echo "local install failed: package located in /binaries but datadog-setup.php not present, please include it."
-  exit 1
-fi
-
-if [ "$PKG" == "" ]; then
-  ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
-  if [ "$ARCH" = "arm64" ]; then
-    ARCH=aarch64
-  else
-    ARCH=x86_64
-  fi
-  unset PKG
-fi
-
-export PHP_INI_SCAN_DIR="/etc/php"
-
-echo "Installing php package ${PKG-"{default}"} with setup script $SETUP"
-php $SETUP --php-bin=all ${PKG+"--file=$PKG"}
-
diff --git a/tooling/ci/ddtrace-info.sh b/tooling/ci/ddtrace-info.sh
index b63231b033..4224e0254d 100755
--- a/tooling/ci/ddtrace-info.sh
+++ b/tooling/ci/ddtrace-info.sh
@@ -1,28 +1,25 @@
 #!/bin/bash
 set -eu
 
-echo "Loading install script"
-curl -Lf -o /tmp/dd-library-php-setup.php \
-  https://raw.githubusercontent.com/DataDog/dd-appsec-php/installer/dd-library-php-setup.php
-
-cd /binaries
-
-INSTALLER_ARGS=(--tracer-file /binaries/datadog-php-tracer*.tar.gz --appsec-file /binaries/dd-appsec-php-*.tar.gz)
-
-PHP_INI_SCAN_DIR="/etc/php" php /tmp/dd-library-php-setup.php \
-    "${INSTALLER_ARGS[@]}"\
-    --php-bin all
-
-export DD_APPSEC_ENABLED=1
-
-php -d error_reporting='' -d extension=ddtrace.so -d extension=ddappsec.so -r 'echo phpversion("ddtrace");' > \
-  ./LIBRARY_VERSION
-
-php -d error_reporting='' -d extension=ddtrace.so -d extension=ddappsec.so -r 'echo phpversion("ddappsec");' > \
-  ./PHP_APPSEC_VERSION
-
-touch LIBDDWAF_VERSION
-
-appsec_version=$(<./PHP_APPSEC_VERSION)
-rule_file="/opt/datadog/dd-library/appsec-${appsec_version}/etc/dd-appsec/recommended.json"
-jq -r '.metadata.rules_version // "1.2.5"' "${rule_file}" > APPSEC_EVENT_RULES_VERSION
+PKG=$(find /binaries -maxdepth 1 -name 'dd-library-php-*-gnu.tar.gz')
+SETUP=/binaries/datadog-setup.php
+
+if [ "$PKG" != "" ] && [ ! -f "$SETUP" ]; then
+  echo "local install failed: package located in /binaries but datadog-setup.php not present, please include it."
+  exit 1
+fi
+
+if [ "$PKG" == "" ]; then
+  ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
+  if [ "$ARCH" = "arm64" ]; then
+    ARCH=aarch64
+  else
+    ARCH=x86_64
+  fi
+  unset PKG
+fi
+
+export PHP_INI_SCAN_DIR="/etc/php"
+
+echo "Installing php package ${PKG-"{default}"} with setup script $SETUP"
+php $SETUP --php-bin=all ${PKG+"--file=$PKG"}
\ No newline at end of file
diff --git a/tooling/ci/download-binary-php-library.sh b/tooling/ci/download-binary-php-library.sh
deleted file mode 100755
index 434ab6fc26..0000000000
--- a/tooling/ci/download-binary-php-library.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-VERSION=${1:-'dev'}
-
-echo "Load $VERSION binary "
-
-mkdir -p tooling/ci/binaries
-cd tooling/ci/binaries
-
-#This script resides inside of docker image (ci_docker_base)
-source /download-binary-tracer.sh
-
-if [ $VERSION = 'dev' ]; then
-    get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "dd-library-php-.*-x86_64-linux-gnu.tar.gz" "dd-library-php-x86_64-linux-gnu.tar.gz"
-    get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "datadog-setup.php" "datadog-setup.php"
-elif [ $VERSION = 'prod' ]; then
-    get_github_release_asset "DataDog/dd-trace-php" "dd-library-php-.*-x86_64-linux-gnu.tar.gz" "dd-library-php-x86_64-linux-gnu.tar.gz"
-    get_github_release_asset "DataDog/dd-trace-php" "datadog-setup.php" "datadog-setup.php"
-else
-    echo "Don't know how to load version $VERSION for $TARGET"
-fi
diff --git a/tooling/ci/download-binary-php.sh b/tooling/ci/download-binary-php.sh
index e0b6e8606e..bebdc27152 100755
--- a/tooling/ci/download-binary-php.sh
+++ b/tooling/ci/download-binary-php.sh
@@ -1,4 +1,5 @@
 VERSION=${1:-'dev'}
+PLATFORM=${2:-'x86_64'}
 
 echo "Load $VERSION binary "
 
@@ -9,11 +10,11 @@ cd tooling/ci/binaries
 source /download-binary-tracer.sh
 
 if [ $VERSION = 'dev' ]; then
-    get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "datadog-php-tracer-.*.x86_64.tar.gz" "datadog-php-tracer.x86_64.tar.gz"
-    get_github_action_artifact "DataDog/dd-appsec-php" "package.yml" "master" "dd-appsec-php-*-amd64.tar.gz" "dd-appsec-php-amd64.tar.gz"
+    get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "dd-library-php-.*-$PLATFORM-linux-gnu.tar.gz" "dd-library-php-$PLATFORM-linux-gnu.tar.gz"
+    get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "datadog-setup.php" "datadog-setup.php"
 elif [ $VERSION = 'prod' ]; then
-    get_github_release_asset "DataDog/dd-trace-php" "datadog-php-tracer-.*.x86_64.tar.gz" "datadog-php-tracer.x86_64.tar.gz"
-    get_github_release_asset "DataDog/dd-appsec-php" "dd-appsec-php-.*-amd64.tar.gz" "dd-appsec-php-amd64.tar.gz"
+    get_github_release_asset "DataDog/dd-trace-php" "dd-library-php-.*-$$PLATFORM-linux-gnu.tar.gz" "dd-library-php-$$PLATFORM-linux-gnu.tar.gz"
+    get_github_release_asset "DataDog/dd-trace-php" "datadog-setup.php" "datadog-setup.php"
 else
     echo "Don't know how to load version $VERSION for $TARGET"
 fi

From d3deb5c28704273468db77fc6544fae70dc96802 Mon Sep 17 00:00:00 2001
From: roberto montero <roberto.montero@datadoghq.com>
Date: Wed, 10 Jan 2024 12:10:45 +0100
Subject: [PATCH 4/9] fix

---
 tooling/ci/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/ci/Dockerfile b/tooling/ci/Dockerfile
index e883c4dc00..1d03823108 100644
--- a/tooling/ci/Dockerfile
+++ b/tooling/ci/Dockerfile
@@ -1,6 +1,6 @@
 FROM datadog/dd-appsec-php-ci:php-7.0-release AS php_agent_debug
 RUN apt-get update && apt-get install -y jq
-COPY ./tooling/ci/ddlib-info.sh ./tooling/ci/binaries* /binaries/
+COPY ./tooling/ci/ddtrace-info.sh ./tooling/ci/binaries* /binaries/
 RUN /binaries/ddtrace-info.sh
 RUN php -d error_reporting='' -r 'echo phpversion("ddtrace");' > /binaries/LIBRARY_VERSION
 RUN touch -c -a -m -d @0 /binaries/*

From 52a99ac131c8d3af1c10bbce644cfc396bdb2068 Mon Sep 17 00:00:00 2001
From: roberto montero <roberto.montero@datadoghq.com>
Date: Wed, 10 Jan 2024 13:00:10 +0100
Subject: [PATCH 5/9] Only x86

---
 .gitlab-ci.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48499cb364..de1563a91d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,18 +76,9 @@ tracer-base-image:
     - ./tooling/ci/download-binary-php.sh dev   
     - docker buildx build --load --progress=plain --platform linux/amd64 -f ./tooling/ci/Dockerfile -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot .
     - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot
-    #Dev ARM
-    - rm -rf ./tooling/ci/binaries
-    - ./tooling/ci/download-binary-php.sh dev aarch64
-    - docker buildx build --load --progress=plain --platform linux/arm64 -f ./tooling/ci/Dockerfile -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot .
-    - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest_snapshot     
+ 
     #Prod X86
     - rm -rf ./tooling/ci/binaries
     - ./tooling/ci/download-binary-php.sh prod   
     - docker buildx build --load --progress=plain --platform linux/amd64 -f ./tooling/ci/Dockerfile -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest .
     - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest
-    #Prod ARM
-    - rm -rf ./tooling/ci/binaries
-    - ./tooling/ci/download-binary-php.sh prod aarch64
-    - docker buildx build --load --progress=plain --platform linux/arm64 -f ./tooling/ci/Dockerfile -t ghcr.io/datadog/dd-trace-php/dd-library-php:latest .
-    - docker push ghcr.io/datadog/dd-trace-php/dd-library-php:latest
\ No newline at end of file

From 08d315e7462451caa6ee5f348965d450eb2b51dd Mon Sep 17 00:00:00 2001
From: roberto montero <roberto.montero@datadoghq.com>
Date: Wed, 10 Jan 2024 13:12:29 +0100
Subject: [PATCH 6/9] fix script

---
 tooling/ci/download-binary-php.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tooling/ci/download-binary-php.sh b/tooling/ci/download-binary-php.sh
index bebdc27152..bb4731cbfe 100755
--- a/tooling/ci/download-binary-php.sh
+++ b/tooling/ci/download-binary-php.sh
@@ -7,13 +7,13 @@ mkdir -p tooling/ci/binaries
 cd tooling/ci/binaries
 
 #This script resides inside of docker image (ci_docker_base)
-source /download-binary-tracer.sh
+source download-binary-tracer.sh
 
 if [ $VERSION = 'dev' ]; then
     get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "dd-library-php-.*-$PLATFORM-linux-gnu.tar.gz" "dd-library-php-$PLATFORM-linux-gnu.tar.gz"
     get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "datadog-setup.php" "datadog-setup.php"
 elif [ $VERSION = 'prod' ]; then
-    get_github_release_asset "DataDog/dd-trace-php" "dd-library-php-.*-$$PLATFORM-linux-gnu.tar.gz" "dd-library-php-$$PLATFORM-linux-gnu.tar.gz"
+    get_github_release_asset "DataDog/dd-trace-php" "dd-library-php-.*-$PLATFORM-linux-gnu.tar.gz" "dd-library-php-$$PLATFORM-linux-gnu.tar.gz"
     get_github_release_asset "DataDog/dd-trace-php" "datadog-setup.php" "datadog-setup.php"
 else
     echo "Don't know how to load version $VERSION for $TARGET"

From 2042558a43a052e644cc1ee70e9f220bcc03e454 Mon Sep 17 00:00:00 2001
From: roberto montero <roberto.montero@datadoghq.com>
Date: Wed, 10 Jan 2024 13:17:26 +0100
Subject: [PATCH 7/9] fix script...again..

---
 tooling/ci/download-binary-php.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tooling/ci/download-binary-php.sh b/tooling/ci/download-binary-php.sh
index bb4731cbfe..9696b06bd4 100755
--- a/tooling/ci/download-binary-php.sh
+++ b/tooling/ci/download-binary-php.sh
@@ -7,7 +7,7 @@ mkdir -p tooling/ci/binaries
 cd tooling/ci/binaries
 
 #This script resides inside of docker image (ci_docker_base)
-source download-binary-tracer.sh
+source /download-binary-tracer.sh
 
 if [ $VERSION = 'dev' ]; then
     get_circleci_artifact "gh/DataDog/dd-trace-php" "build_packages" "package extension" "dd-library-php-.*-$PLATFORM-linux-gnu.tar.gz" "dd-library-php-$PLATFORM-linux-gnu.tar.gz"

From 73a55ce94c04e078074dcd22ccbc3952dfc66003 Mon Sep 17 00:00:00 2001
From: roberto montero <roberto.montero@datadoghq.com>
Date: Wed, 10 Jan 2024 14:57:23 +0100
Subject: [PATCH 8/9] remove unused code

---
 tooling/ci/ddtrace-info.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tooling/ci/ddtrace-info.sh b/tooling/ci/ddtrace-info.sh
index 4224e0254d..037d017c67 100755
--- a/tooling/ci/ddtrace-info.sh
+++ b/tooling/ci/ddtrace-info.sh
@@ -10,12 +10,6 @@ if [ "$PKG" != "" ] && [ ! -f "$SETUP" ]; then
 fi
 
 if [ "$PKG" == "" ]; then
-  ARCH=$(uname -m | sed 's/x86_//;s/i[3-6]86/32/')
-  if [ "$ARCH" = "arm64" ]; then
-    ARCH=aarch64
-  else
-    ARCH=x86_64
-  fi
   unset PKG
 fi
 

From a580f84a0028a8e7d6de27e7f1d7bdb9d631deea Mon Sep 17 00:00:00 2001
From: roberto montero <roberto.montero@datadoghq.com>
Date: Wed, 10 Jan 2024 16:33:07 +0100
Subject: [PATCH 9/9] fix circle system-tests

---
 .circleci/continue_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
index 7d7982b492..d1214ed827 100644
--- a/.circleci/continue_config.yml
+++ b/.circleci/continue_config.yml
@@ -3053,7 +3053,7 @@ jobs:
           name: Copy .tar.gz file to system test binaries folder
           command: |
             ls -la build/packages
-            installable_bundle=$(find build/packages -maxdepth 1 -name 'datadog-php-tracer-*.x86_64.tar.gz' -o -name 'dd-library-php-*-x86_64-linux-gnu.tar.gz' | xargs)
+            installable_bundle=$(find build/packages -maxdepth 1 -name 'dd-library-php-*-x86_64-linux-gnu.tar.gz' | xargs)
             echo using $installable_bundle
             cp $installable_bundle build/packages/datadog-setup.php system-tests/binaries/
       - run: