java: Upgrade to async-profiler v2.10 and use asprof-exported jattach (#776)

See Granulate/async-profiler#7
Closes: #745

Author: marcin-ol

Dockerfile

@@ -184,11 +184,10 @@ COPY --from=phpspy-builder /tmp/phpspy/phpspy gprofiler/resources/php/phpspy
 COPY --from=phpspy-builder /tmp/binutils/binutils-2.25/bin/bin/objdump gprofiler/resources/php/objdump
 COPY --from=phpspy-builder /tmp/binutils/binutils-2.25/bin/bin/strings gprofiler/resources/php/strings
 
-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/bin/asprof gprofiler/resources/java/asprof
 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-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
+COPY --from=async-profiler-builder-glibc /tmp/async-profiler/build/lib/libasyncProfiler.so gprofiler/resources/java/glibc/libasyncProfiler.so
+COPY --from=async-profiler-builder-musl /tmp/async-profiler/build/lib/libasyncProfiler.so gprofiler/resources/java/musl/libasyncProfiler.so
 COPY --from=node-package-builder-musl /tmp/module_build gprofiler/resources/node/module/musl
 COPY --from=node-package-builder-glibc /tmp/module_build gprofiler/resources/node/module/glibc
 

gprofiler/profilers/java.py

@@ -237,7 +237,9 @@ def __init__(self, stop_event: Event, jattach_timeout: int):
 
     def run(self, process: Process, cmd: str) -> str:
         return run_process(
-            [jattach_path(), str(process.pid), "jcmd", cmd], stop_event=self.stop_event, timeout=self.jattach_timeout
+            [asprof_path(), "jcmd", "--jattach-cmd", cmd, str(process.pid)],
+            stop_event=self.stop_event,
+            timeout=self.jattach_timeout,
         ).stdout.decode()
 
 
@@ -390,8 +392,8 @@ def get_supported_jvm_flags(self, process: Process) -> Iterable[JvmFlag]:
 
 
 @functools.lru_cache(maxsize=1)
-def jattach_path() -> str:
-    return resource_path("java/jattach")
+def asprof_path() -> str:
+    return resource_path("java/asprof")
 
 
 @functools.lru_cache(maxsize=1)
@@ -589,11 +591,11 @@ def _check_disk_requirements(self) -> None:
 
     def _get_base_cmd(self) -> List[str]:
         return [
-            jattach_path(),
-            str(self.process.pid),
-            "load",
+            asprof_path(),
+            "jattach",
+            "-L",
             self._libap_path_process,
-            "true",
+            "--jattach-cmd",
         ]
 
     def _get_extra_ap_args(self) -> str:
@@ -644,7 +646,7 @@ def _run_async_profiler(self, cmd: List[str]) -> str:
         try:
             # kill jattach with SIGTERM if it hangs. it will go down
             run_process(
-                cmd,
+                cmd + [str(self.process.pid)],
                 stop_event=self._profiler_state.stop_event,
                 timeout=self._jattach_timeout,
                 kill_signal=signal.SIGTERM,
@@ -683,7 +685,15 @@ def _run_fdtransfer(self) -> None:
             # run fdtransfer with accept timeout that's slightly greater than the jattach timeout - to make
             # sure that fdtransfer is still around for the full duration of jattach, in case the application
             # takes a while to accept & handle the connection.
-            [fdtransfer_path(), self._fdtransfer_path, str(self.process.pid), str(self._jattach_timeout + 5)],
+            [
+                asprof_path(),
+                "fdtransfer",
+                "--fd-path",
+                self._fdtransfer_path,
+                "--fdtransfer-timeout",
+                str(self._jattach_timeout + 5),
+                str(self.process.pid),
+            ],
             stop_event=self._profiler_state.stop_event,
             timeout=self._FDTRANSFER_TIMEOUT,
         )

pyi.Dockerfile

@@ -84,7 +84,7 @@ RUN ./async_profiler_build_shared.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
+COPY --from=async-profiler-builder-glibc /tmp/async-profiler/build/lib/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!"; readelf -Ws /libasyncProfiler.so; ldd /libasyncProfiler.so; exit 1; fi
 
 # async-profiler musl
@@ -246,11 +246,10 @@ COPY --from=phpspy-builder /tmp/binutils/binutils-2.25/bin/bin/strings gprofiler
 COPY --from=async-profiler-builder-glibc /usr/bin/awk gprofiler/resources/php/awk
 COPY --from=async-profiler-builder-glibc /usr/bin/xargs gprofiler/resources/php/xargs
 
-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/bin/asprof gprofiler/resources/java/asprof
 COPY --from=async-profiler-builder-glibc /tmp/async-profiler/build/async-profiler-version gprofiler/resources/java/async-profiler-version
 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
+COPY --from=async-profiler-builder-musl /tmp/async-profiler/build/lib/libasyncProfiler.so gprofiler/resources/java/musl/libasyncProfiler.so
 COPY --from=node-package-builder-musl /tmp/module_build gprofiler/resources/node/module/musl
 COPY --from=node-package-builder-glibc /tmp/module_build gprofiler/resources/node/module/glibc
 

scripts/async_profiler_build_shared.sh

@@ -5,8 +5,8 @@
 #
 set -euo pipefail
 
-VERSION=v2.9g6
-GIT_REV="4938ce815be597fafc6a7a185a16ff394b9d7f41"
+VERSION=v2.10g1
+GIT_REV="b3baf6010e31378679a28fe1cd30168f51cc1ade"
 
 git clone --depth 1 -b "$VERSION" https://github.com/Granulate/async-profiler.git && cd async-profiler && git reset --hard "$GIT_REV"
 make all

tests/test_java.py

@@ -429,11 +429,13 @@ def test_java_deleted_libjvm(
 def filter_jattach_load_records(records: List[LogRecord]) -> List[LogRecord]:
     def _filter_record(r: LogRecord) -> bool:
         # find the log record of
-        # Running command (command=['/app/gprofiler/resources/java/jattach', 'xxx', 'load', ....])
+        # Running command (command=['/app/gprofiler/resources/java/apsprof', 'jattach',
+        # '-L', '/path/to/libasyncProfiler.so', "--jattach-cmd", "start,..."])
         return (
             r.message == "Running command"
-            and "/jattach" in log_record_extra(r)["command"][0]
-            and "load" in log_record_extra(r)["command"][2]
+            and len(log_record_extra(r)["command"]) >= 6
+            and log_record_extra(r)["command"][1] == "jattach"
+            and any(map(lambda k: k in log_record_extra(r)["command"][5], ["start,", "stop,"]))
         )
 
     return list(filter(_filter_record, records))