Merge pull request #530 from Scalingo/feat/STORY-2477/scalingo-24_blackfire

fix(blackfire): update to the latest version and URLs

Author: EtienneM

support/ext/blackfire

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [ -n "$DEBUG" ]; then
-    set -x
+  set -x
 fi
 
 # fail hard
@@ -10,50 +10,46 @@ set -o pipefail
 set -eu
 
 php_version=${1:=8.2}
-php_series="$(echo $php_version | cut -d '.' -f1,2)"
-# https://blackfire.io/docs/up-and-running/installation?action=install&mode=full&location=local&os=manual&language=php#install-the-php-probe
-#
-# → Select "Linux Binary", 64 bits, the right PHP version and you'll see the last version of the probe
-blackfire_probe_version=1.86.3
-# https://blackfire.io/docs/up-and-running/installation?action=install&mode=full&location=local&os=manual&language=php#install-the-packages
-#
-# → Select "Linux Binary", 64 bits and you'll see the last version
-blackfire_agent_version=2.13.2
-bin_dir=${PREFIX}/bin
-
-# Blackfire Probe
-curl --location --output blackfire.so \
-  "https://packages.blackfire.io/binaries/blackfire-php/${blackfire_probe_version}/blackfire-php-linux_amd64-php-$(echo $php_series | tr -d '.').so"
+php_series="$(echo "$php_version" | cut -d '.' -f1,2)"
 
-mkdir -p ${EXT_DIR}
-mv blackfire.so ${EXT_DIR}/blackfire.so
+# https://docs.blackfire.io/up-and-running/installation?action=install&mode=full&location=local&os=manual&language=php&version=latest&#install-the-php-probe
+#
+# → Under "Install the PHP Probe", select "Linux Binary", 64 bits and your PHP version. Open the network inspector to identify the request triggered when you click on "Download". It contains the last version.
+blackfire_probe_version=1.92.41
 
-# AGENT
-curl --user-agent "Scalingo" --output agent.tar.gz \
-  --dump-header - --location --silent \
-  https://blackfire.io/api/v1/releases/agent/linux/amd64
+# https://docs.blackfire.io/up-and-running/installation?action=install&mode=full&location=local&os=manual&language=php&version=latest&#install-the-packages
+#
+# → Under "Install the Packages", select "Linux Binary" and 64 bits. Open the network inspector to identify the request triggered when you click on "Download". It contains the last version.
+blackfire_agent_version=2.29.0
 
-echo "-----> Packaging bin/blackfire-agent ${blackfire_agent_version}..."
+mkdir --parents "${EXT_DIR}"
+bin_dir=${PREFIX}/bin
+mkdir --parents "${bin_dir}"
+mkdir --parents "${PREFIX}/var/blackfire/run"
+mkdir --parents "${PREFIX}/etc/blackfire"
 
-mkdir -p ${PREFIX}/var/blackfire/run
-mkdir -p ${PREFIX}/etc/blackfire
-echo -e "[blackfire]\nserver-id=f1abf3a8-3f85-4743-99b2-97f066c099b9\nserver-token=5ecbc6486e9db6b780a0c0a9ef1e244709e632996fe9105cb9075ab2826944d5" > ${PREFIX}/etc/blackfire/agent.ini
-mkdir -p ${bin_dir}
+echo "-----> Packaging Blackfire Probe ${blackfire_probe_version}..."
+curl --location --silent --output blackfire.so \
+  "https://packages.blackfire.io/binaries/blackfire-php/${blackfire_probe_version}/blackfire-php-linux_amd64-php-$(echo "$php_series" | tr -d '.').so"
+mv blackfire.so "${EXT_DIR}/blackfire.so"
 
-tar -zxf agent.tar.gz
-chmod +x agent
-cp agent ${bin_dir}/blackfire-agent
-rm agent.tar.gz agent agent.sha1
+echo "-----> Packaging Blackfire Agent ${blackfire_agent_version}..."
+curl --location --silent --output blackfire-agent.tar.gz \
+  "https://packages.blackfire.io/binaries/blackfire/${blackfire_agent_version}/blackfire-linux_amd64.tar.gz"
+tar -zxf blackfire-agent.tar.gz
+chmod +x blackfire
+# Both the agent and the CLI are actually the same binary. For legacy purpose it is expected that the CLI is named `blackfire` and the agent is named `blackfire-agent`.
+cp blackfire "${bin_dir}/blackfire-agent"
+cp blackfire "${bin_dir}/blackfire"
+chmod +x "${bin_dir}/blackfire-agent" "${bin_dir}/blackfire"
+rm blackfire-agent.tar.gz blackfire blackfire.sha1
 
-# CLI
-echo "-----> Packaging bin/blackfire ${blackfire_agent_version}..."
-curl https://packages.blackfire.io/binaries/blackfire-agent/${blackfire_agent_version}/blackfire-cli-linux_amd64 > ${bin_dir}/blackfire
-chmod +x ${bin_dir}/blackfire
+echo -e "[blackfire]\nserver-id=f1abf3a8-3f85-4743-99b2-97f066c099b9\nserver-token=5ecbc6486e9db6b780a0c0a9ef1e244709e632996fe9105cb9075ab2826944d5" > "${PREFIX}/etc/blackfire/agent.ini"
 
 find ${PREFIX} -type f \( -executable -o -name '*.a' \) -exec sh -c "file -i '{}' | grep -Eq 'application/x-(archive|executable|sharedlib); charset=binary'" \; -print | xargs strip --strip-unneeded
 
 # gets sourced on container boot
-cat > ${PREFIX}/bin/profile.blackfire.sh <<'EOF'
+cat > "${PREFIX}/bin/profile.blackfire.sh" <<'EOF'
 if [[ -n "$BLACKFIRE_SERVER_TOKEN" && -n "$BLACKFIRE_SERVER_ID" ]]; then
 	if [[ -f "/app/vendor/php/bin/blackfire-agent" ]]; then
 		touch /app/vendor/php/var/blackfire/run/agent.sock
@@ -64,8 +60,8 @@ if [[ -n "$BLACKFIRE_SERVER_TOKEN" && -n "$BLACKFIRE_SERVER_ID" ]]; then
 fi
 EOF
 
-mkdir -p ${PREFIX}/etc/php/conf.d
-cat > ${PREFIX}/etc/conf.d/blackfire.ini <<'EOF'
+mkdir -p "${PREFIX}/etc/php/conf.d"
+cat > "${PREFIX}/etc/conf.d/blackfire.ini" <<'EOF'
 extension = blackfire.so
 
 blackfire.server_token = ${BLACKFIRE_SERVER_TOKEN}

support/lib/php_ext

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 function build_ext() {
   local tempbuilddir=$1
   local php_version=$2
@@ -27,11 +29,11 @@ function upload_ext() {
 
   echo "-----> Uploading extension $ext_name"
 
-  mkdir -p package/ext/${zend_api_version}
-  pushd $tempbuilddir > /dev/null
-  tar zcvf $tempdir/package/ext/${zend_api_version}/php-${package_name}.tgz .
+  mkdir -p "package/ext/${zend_api_version}"
+  pushd "$tempbuilddir" > /dev/null
+  tar zcvf "$tempdir/package/ext/${zend_api_version}/php-${package_name}.tgz" .
   popd
 
-  swift_upload package/ext/${zend_api_version}/php-${package_name}.tgz
+  swift_upload "package/ext/${zend_api_version}/php-${package_name}.tgz"
   "$basedir/package-checksum" "ext/${zend_api_version}/php-${package_name}"
 }

support/package_all

@@ -23,20 +23,18 @@ for e in ./ext-internal/*; do
   ext_name="$( basename "${e}" )"
 
   ./package_internal_ext "${ext_name}" "${php_version}"
-
   if [[ $? -ne 0 ]]; then
-    echo "Error packaging internal extension ${ext_name}"
-    exit -1
+    echo "Error packaging internal extension ${ext_name}" >&2
+    exit 1
   fi
 done
 
 for e in ./ext/*; do
   ext_name="$( basename "${e}" )"
 
   ./package_ext "${ext_name}" "${ext_name}" "${php_version}"
-
   if [[ $? -ne 0 ]]; then
-    echo "Error packaging extension ${ext_name}"
-    exit -1
+    echo "Error packaging extension ${ext_name}" >&2
+    exit 1
   fi
 done

support/package_ext

@@ -31,17 +31,17 @@ package_ext() {
     local ext_package_name="$2"
     local php_series="$3"
 
-    local zend_api_version=$(zend_api_from_php_series $basedir $php_series)
+    local zend_api_version=$(zend_api_from_php_series "$basedir" "$php_series")
     if [ -z "$zend_api_version" ] ; then
       echo "No compatible zend API found for $php_series"
       return
     fi
 
-    local php_version=$(php_series_last_version $php_series)
+    local php_version=$(php_series_last_version "$php_series")
     echo "-----> Building $ext_name for PHP module API version ${zend_api_version} using PHP ${php_version}"
 
-    tempdir=$(mktmpdir php${ext_name})
-    cd $tempdir
+    tempdir=$(mktmpdir "php${ext_name}")
+    cd "$tempdir"
 
     install_php "${php_version}"
     cp "$basedir/ext/${ext_name}" "$tempdir/build.sh"
@@ -51,7 +51,7 @@ package_ext() {
       package_name="${ext_package_name}"
     fi
 
-    local tempbuilddir=$(mktmpdir php-build${ext_name})
+    local tempbuilddir=$(mktmpdir "php-build${ext_name}")
     build_ext "${tempbuilddir}" "${php_version}" "${zend_api_version}" "${ext_name}"
     upload_ext "${tempbuilddir}" "${tempdir}" "${package_name}" "${zend_api_version}"