java: Fix async-profiler compatibility on CentOS 6 (#453)

This PR fixes compatibility with CentOS 6. When we switched to build on CentOS 7, we didn't pass the -static-libstdc++ flag, and at the point when we fixed that regression, we didn't test for CentOS 6 support, which broke because -static-libstdc++ pulls in some symbols which require newer glibc.

This PR avoids -static-libstdc++ on glibc; it's required for musl-based because musl-based JVMs aren't always dependent on libstdc++; and we've never seen that with glibc.

Additionally, this PR adds a test for final dependency resolving compatibility on CentOS 6.

Also included is a cherry pick of async-profiler/async-profiler@b8c8db4, which prevents async-profiler from crashing if it is re-loaded after a previous load has failed.

Author: Jongy

pyi.Dockerfile

@@ -7,6 +7,7 @@ ARG PERF_BUILDER_UBUNTU
 ARG PHPSPY_BUILDER_UBUNTU
 ARG AP_BUILDER_CENTOS
 ARG AP_BUILDER_ALPINE
+ARG AP_CENTOS_MIN
 ARG BURN_BUILDER_GOLANG
 ARG GPROFILER_BUILDER
 ARG PYPERF_BUILDER_UBUNTU
@@ -64,6 +65,12 @@ COPY scripts/async_profiler_build_shared.sh .
 COPY scripts/async_profiler_build_glibc.sh .
 RUN ./async_profiler_build_shared.sh /tmp/async_profiler_build_glibc.sh
 
+# a build step to ensure the minimum CentOS version that we require can "ldd" our libasyncProfiler.so file.
+FROM centos${AP_CENTOS_MIN} AS async-profiler-centos-min-test-glibc
+SHELL ["/bin/bash", "-c", "-euo", "pipefail"]
+COPY --from=async-profiler-builder-glibc /tmp/async-profiler/build/libasyncProfiler.so /libasyncProfiler.so
+RUN if ldd /libasyncProfiler.so 2>&1 | grep -q "not found" ; then echo "libasyncProfiler.so is not compatible with minimum CentOS!"; ldd /libasyncProfiler.so; exit 1; fi
+
 # async-profiler musl
 FROM alpine${AP_BUILDER_ALPINE} AS async-profiler-builder-musl
 WORKDIR /tmp
@@ -234,7 +241,7 @@ COPY --from=async-profiler-builder-glibc /usr/bin/xargs gprofiler/resources/php/
 
 COPY --from=async-profiler-builder-glibc /tmp/async-profiler/build/jattach gprofiler/resources/java/jattach
 COPY --from=async-profiler-builder-glibc /tmp/async-profiler/build/async-profiler-version gprofiler/resources/java/async-profiler-version
-COPY --from=async-profiler-builder-glibc /tmp/async-profiler/build/libasyncProfiler.so gprofiler/resources/java/glibc/libasyncProfiler.so
+COPY --from=async-profiler-centos-min-test-glibc /libasyncProfiler.so gprofiler/resources/java/glibc/libasyncProfiler.so
 COPY --from=async-profiler-builder-musl /tmp/async-profiler/build/libasyncProfiler.so gprofiler/resources/java/musl/libasyncProfiler.so
 COPY --from=async-profiler-builder-glibc /tmp/async-profiler/build/fdtransfer gprofiler/resources/java/fdtransfer
 

scripts/async_profiler_build_shared.sh

@@ -5,8 +5,8 @@
 #
 set -euo pipefail
 
-VERSION=v2.8.3g2
-GIT_REV="ef1d3b3c29e7337d52f54035a12ae9a90eb1c710"
+VERSION=v2.8.3g3
+GIT_REV="008a8cf435bedce8eec3ef36fdc67e742b070566"
 
 git clone --depth 1 -b "$VERSION" https://github.com/Granulate/async-profiler.git && cd async-profiler && git reset --hard "$GIT_REV"
 source "$1"

scripts/build_aarch64_executable.sh

@@ -26,6 +26,7 @@ docker buildx build --platform=linux/arm64 \
     --build-arg PHPSPY_BUILDER_UBUNTU=$UBUNTU_VERSION \
     --build-arg AP_BUILDER_CENTOS=$CENTOS7_VERSION \
     --build-arg AP_BUILDER_ALPINE=$ALPINE_VERSION \
+    --build-arg AP_CENTOS_MIN=$CENTOS7_VERSION \
     --build-arg BURN_BUILDER_GOLANG=$GOLANG_VERSION \
     --build-arg GPROFILER_BUILDER=$CENTOS8_VERSION \
     . -f pyi.Dockerfile --output type=local,dest=build/aarch64/ $@

scripts/build_x86_64_executable.sh

@@ -15,6 +15,9 @@ UBUNTU_VERSION=@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88e
 AP_BUILDER_CENTOS=@sha256:0f4ec88e21daf75124b8a9e5ca03c37a5e937e0e108a255d890492430789b60e
 # async-profiler musl - alpine
 AP_BUILDER_ALPINE=@sha256:69704ef328d05a9f806b6b8502915e6a0a4faa4d72018dc42343f511490daf8a
+# minimum CentOS version we intend to support with async-profiler (different between x86_64, where we require
+# an older version)
+AP_CENTOS_MIN=:6
 # burn - golang:1.16.3
 BURN_BUILDER_GOLANG=@sha256:f7d3519759ba6988a2b73b5874b17c5958ac7d0aa48a8b1d84d66ef25fa345f1
 # bcc & gprofiler - centos:7
@@ -30,6 +33,7 @@ DOCKER_BUILDKIT=1 docker build -f pyi.Dockerfile --output type=local,dest=build/
     --build-arg PHPSPY_BUILDER_UBUNTU=$UBUNTU_VERSION \
     --build-arg AP_BUILDER_CENTOS=$AP_BUILDER_CENTOS \
     --build-arg AP_BUILDER_ALPINE=$AP_BUILDER_ALPINE \
+    --build-arg AP_CENTOS_MIN=$AP_CENTOS_MIN \
     --build-arg BURN_BUILDER_GOLANG=$BURN_BUILDER_GOLANG \
     --build-arg GPROFILER_BUILDER=$GPROFILER_BUILDER \
     . $@