app ids: Keep original frame (#258)

* app ids: Handle case where -jar is not present in "java" cmdline

* merge: Insert the "app id" frame between the "comm" frame and the other frames

Author: Jongy

gprofiler/merge.py

@@ -251,7 +251,13 @@ def concatenate_profiles(
         prefix = (container_name + ";") if add_container_names else ""
         for stack, count in stacks.items():
             if identify_applications and application_name is not None:
-                stack = f'{application_name};{stack.split(";", maxsplit=1)[1]}'
+                application_name = f"appid: {application_name}"
+                # insert the app name between the first frame and all others
+                try:
+                    first_frame, others = stack.split(";", maxsplit=1)
+                    stack = f"{first_frame};{application_name};{others}"
+                except ValueError:
+                    stack = f"{stack};{application_name}"
 
             total_samples += count
             lines.append(f"{prefix}{stack} {count}")

gprofiler/metadata/application_identifiers.py

@@ -214,7 +214,11 @@ def get_application_name(self, process: Process) -> Optional[str]:
         if not any("libjvm.so" in m.path for m in process.memory_maps()):
             return None
 
-        return f"java: {_append_file_to_proc_wd(process, _get_cli_arg_by_name(process.cmdline(), '-jar'))}"
+        jar_arg = _get_cli_arg_by_name(process.cmdline(), "-jar")
+        if _NON_AVAILABLE_ARG is None:
+            return None
+
+        return f"java: {_append_file_to_proc_wd(process, jar_arg)}"
 
 
 # Please note that the order matter, because the FIRST matching identifier will be used.