skip pdeathsigger for versions

Author: slicklash

executable.Dockerfile

@@ -212,7 +212,6 @@ RUN if grep -q "CentOS Linux 7" /etc/os-release ; then \
 RUN ./node_builder_glibc_env.sh
 COPY scripts/build_node_package.sh .
 RUN ./build_node_package.sh
-
 # needed for hadolint
 WORKDIR /app
 USER 1001
@@ -264,7 +263,6 @@ COPY --from=async-profiler-builder-musl /tmp/async-profiler/build/lib/libasyncPr
 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
 
-
 COPY --from=burn-builder /tmp/burn/burn gprofiler/resources/burn
 
 COPY gprofiler gprofiler

gprofiler/metadata/versions.py

@@ -35,7 +35,9 @@ def get_exe_version(
     exe_path = f"/proc/{get_process_nspid(process.pid)}/exe"
 
     def _run_get_version() -> "CompletedProcess[bytes]":
-        return run_process([exe_path, version_arg], stop_event=stop_event, timeout=get_version_timeout)
+        return run_process(
+            [exe_path, version_arg], stop_event=stop_event, timeout=get_version_timeout, pdeathsigger=False
+        )
 
     try:
         cp = run_in_ns(["pid", "mnt"], _run_get_version, process.pid)

gprofiler/profilers/java.py

@@ -350,6 +350,7 @@ def _run_java_version() -> "CompletedProcess[bytes]":
             ],
             stop_event=stop_event,
             timeout=_JAVA_VERSION_TIMEOUT,
+            pdeathsigger=False,
         )
 
     # doesn't work without changing PID NS as well (I'm getting ENOENT for libjli.so)

gprofiler/profilers/python.py

@@ -137,6 +137,7 @@ def _run_python_process_in_ns() -> "CompletedProcess[bytes]":
                     [python_path, "-S", "-c", "import sys; print(sys.maxunicode)"],
                     stop_event=self._stop_event,
                     timeout=self._PYTHON_TIMEOUT,
+                    pdeathsigger=False,
                 )
 
             return run_in_ns(["pid", "mnt"], _run_python_process_in_ns, process.pid).stdout.decode().strip()

gprofiler/utils/fs.py

@@ -57,7 +57,7 @@ def is_rw_exec_dir(path: Path) -> bool:
 
     # try executing
     try:
-        run_process([str(test_script)], suppress_log=True)
+        run_process([str(test_script)], suppress_log=True, pdeathsigger=False)
     except PermissionError:
         # noexec
         return False

tests/test_java.py

@@ -486,11 +486,12 @@ def _filter_record(r: LogRecord) -> bool:
         # find the log record of
         # Running command (command=['/app/gprofiler/resources/java/apsprof', '<PID>', 'load',
         # '/path/to/libasyncProfiler.so', 'true', 'start,...'])
+        command = log_record_extra(r).get("command", [])
         return (
             r.message == "Running command"
-            and len(log_record_extra(r)["command"]) == 6
-            and log_record_extra(r)["command"][2] == "load"
-            and any(map(lambda k: k in log_record_extra(r)["command"][5], ["start,", "stop,"]))
+            and len(command) == 7
+            and command[3] == "load"
+            and any(map(lambda k: k in command[6], ["start,", "stop,"]))
         )
 
     return list(filter(_filter_record, records))
@@ -567,7 +568,7 @@ def test_java_noexec_or_ro_dirs(
     assert len(jattach_loads) == 2
     # 3rd part of commandline to AP - shall begin with POSSIBLE_AP_DIRS[1]
     assert all(
-        log_record_extra(jl)["command"][3].startswith(f"{gprofiler.profilers.java.POSSIBLE_AP_DIRS[1]}/async-profiler-")
+        log_record_extra(jl)["command"][4].startswith(f"{gprofiler.profilers.java.POSSIBLE_AP_DIRS[1]}/async-profiler-")
         for jl in jattach_loads
     )
 
@@ -616,7 +617,7 @@ def test_java_symlinks_in_paths(
     # 2 entries - start and stop
     assert len(jattach_loads) == 2
     # 3rd part of commandline to AP - shall begin with the final, resolved path.
-    assert all(log_record_extra(jl)["command"][3].startswith("/run/final_tmp/gprofiler_tmp/") for jl in jattach_loads)
+    assert all(log_record_extra(jl)["command"][4].startswith("/run/final_tmp/gprofiler_tmp/") for jl in jattach_loads)
 
 
 @pytest.mark.parametrize("in_container", [True])  # only in container is enough