Skip to content

Commit ab54902

Browse files
authored
gProfiler 1.2.12 + small bugfix (#260)
Fix 2 small, sad bugs and release 1.2.12.
1 parent bdffc78 commit ab54902

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

gprofiler/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Copyright (c) Granulate. All rights reserved.
33
# Licensed under the AGPL3 License. See LICENSE.md in the project root for license information.
44
#
5-
__version__ = "1.2.11"
5+
__version__ = "1.2.12"

gprofiler/merge.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,12 @@ def concatenate_profiles(
247247

248248
for pid, stacks in process_profiles.items():
249249
container_name = _get_container_name(pid, docker_client, add_container_names)
250-
application_name = get_application_name(pid) if identify_applications else ""
250+
application_name = get_application_name(pid) if identify_applications else None
251+
if application_name is not None:
252+
application_name = f"appid: {application_name}"
251253
prefix = (container_name + ";") if add_container_names else ""
252254
for stack, count in stacks.items():
253255
if identify_applications and application_name is not None:
254-
application_name = f"appid: {application_name}"
255256
# insert the app name between the first frame and all others
256257
try:
257258
first_frame, others = stack.split(";", maxsplit=1)

gprofiler/metadata/application_identifiers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def get_application_name(self, process: Process) -> Optional[str]:
215215
return None
216216

217217
jar_arg = _get_cli_arg_by_name(process.cmdline(), "-jar")
218-
if _NON_AVAILABLE_ARG is None:
218+
if jar_arg is _NON_AVAILABLE_ARG:
219219
return None
220220

221221
return f"java: {_append_file_to_proc_wd(process, jar_arg)}"

0 commit comments

Comments
 (0)