From 820f90c9cc5afcf0911a5c4a2031329005df1754 Mon Sep 17 00:00:00 2001 From: pfilipko1 Date: Fri, 28 Apr 2023 16:19:56 +0200 Subject: [PATCH 1/9] logger message severity changed --- gprofiler/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gprofiler/main.py b/gprofiler/main.py index 13fcff325..ca7a2a95d 100644 --- a/gprofiler/main.py +++ b/gprofiler/main.py @@ -1032,7 +1032,7 @@ def main() -> None: else None ) except APIError as e: - logger.error(f"Server error: {e}") + logger.critical(f"Server error: {e}") sys.exit(1) except RequestException as e: proxy = get_https_proxy() From 0390ea8205ba259ce911d2630c561e0625a807e1 Mon Sep 17 00:00:00 2001 From: pfilipko1 Date: Thu, 25 May 2023 12:50:38 +0200 Subject: [PATCH 2/9] only one type of error critical --- gprofiler/main.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gprofiler/main.py b/gprofiler/main.py index ca7a2a95d..7ea821a84 100644 --- a/gprofiler/main.py +++ b/gprofiler/main.py @@ -1032,7 +1032,12 @@ def main() -> None: else None ) except APIError as e: - logger.critical(f"Server error: {e}") + if "API key" in str(e): + logger.info("CRITICAL") + logger.critical(f"Server error: {e}") + else: + logger.info("NONCRITICAL") + logger.error(f"Server error: {e}") sys.exit(1) except RequestException as e: proxy = get_https_proxy() From a7155616cfefde852a9915c145a9356fa714a451 Mon Sep 17 00:00:00 2001 From: pfilipko1 Date: Thu, 25 May 2023 12:56:03 +0200 Subject: [PATCH 3/9] only one type of error critical --- gprofiler/main.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/gprofiler/main.py b/gprofiler/main.py index 7ea821a84..0c89ece65 100644 --- a/gprofiler/main.py +++ b/gprofiler/main.py @@ -1033,10 +1033,8 @@ def main() -> None: ) except APIError as e: if "API key" in str(e): - logger.info("CRITICAL") logger.critical(f"Server error: {e}") else: - logger.info("NONCRITICAL") logger.error(f"Server error: {e}") sys.exit(1) except RequestException as e: From 6717b5c4c2e614427bb78ea53faea4252ca22934 Mon Sep 17 00:00:00 2001 From: pfilipko1 Date: Sun, 28 May 2023 16:00:16 +0200 Subject: [PATCH 4/9] golang processes idetified better --- gprofiler/profilers/perf.py | 4 +++- granulate-utils | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gprofiler/profilers/perf.py b/gprofiler/profilers/perf.py index 89e6329c5..012c9c31f 100644 --- a/gprofiler/profilers/perf.py +++ b/gprofiler/profilers/perf.py @@ -536,9 +536,11 @@ def relevant_for_process(self, process: Process) -> bool: return is_golang_process(process) def make_application_metadata(self, process: Process) -> Dict[str, Any]: - metadata = {"golang_version": get_process_golang_version(process)} + metadata = {"golang_version": get_process_golang_version( process.create_time())} + print(metadata) self.add_exe_metadata(process, metadata) metadata.update(super().make_application_metadata(process)) + print(metadata) return metadata diff --git a/granulate-utils b/granulate-utils index f35752f1c..1f473e396 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit f35752f1c5e59486080ee998ab1f571002b293b5 +Subproject commit 1f473e3960395a6af44d7fe578632336484046e1 From 8cd6f9c35dff45be5cd3cb229565f42ec439960d Mon Sep 17 00:00:00 2001 From: pfilipko1 Date: Sun, 28 May 2023 16:03:35 +0200 Subject: [PATCH 5/9] typo --- gprofiler/profilers/perf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gprofiler/profilers/perf.py b/gprofiler/profilers/perf.py index 012c9c31f..33d69a512 100644 --- a/gprofiler/profilers/perf.py +++ b/gprofiler/profilers/perf.py @@ -536,8 +536,7 @@ def relevant_for_process(self, process: Process) -> bool: return is_golang_process(process) def make_application_metadata(self, process: Process) -> Dict[str, Any]: - metadata = {"golang_version": get_process_golang_version( process.create_time())} - print(metadata) + metadata = {"golang_version": get_process_golang_version(process.create_time())} self.add_exe_metadata(process, metadata) metadata.update(super().make_application_metadata(process)) print(metadata) From 3a854946e09d56103dac4a13f16c9fe52fa12485 Mon Sep 17 00:00:00 2001 From: pfilipko1 Date: Sun, 28 May 2023 16:07:20 +0200 Subject: [PATCH 6/9] wrong branch --- gprofiler/profilers/perf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gprofiler/profilers/perf.py b/gprofiler/profilers/perf.py index 33d69a512..89e6329c5 100644 --- a/gprofiler/profilers/perf.py +++ b/gprofiler/profilers/perf.py @@ -536,10 +536,9 @@ def relevant_for_process(self, process: Process) -> bool: return is_golang_process(process) def make_application_metadata(self, process: Process) -> Dict[str, Any]: - metadata = {"golang_version": get_process_golang_version(process.create_time())} + metadata = {"golang_version": get_process_golang_version(process)} self.add_exe_metadata(process, metadata) metadata.update(super().make_application_metadata(process)) - print(metadata) return metadata From 8074d81de563e00904a3abbe8a1d79a27bd831c6 Mon Sep 17 00:00:00 2001 From: pfilipko1 Date: Sun, 28 May 2023 16:22:28 +0200 Subject: [PATCH 7/9] utils branch updated --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/granulate-utils b/granulate-utils index 1f473e396..1b4714ec1 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 1f473e3960395a6af44d7fe578632336484046e1 +Subproject commit 1b4714ec1b7951a3a3d6eb4618b8d88e2d642a82 From c40b1a316de34cb3dbf507e517c69f0dc432e6e6 Mon Sep 17 00:00:00 2001 From: pfilipko1 Date: Sun, 28 May 2023 16:50:33 +0200 Subject: [PATCH 8/9] submodule --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/granulate-utils b/granulate-utils index 1b4714ec1..414c2585a 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 1b4714ec1b7951a3a3d6eb4618b8d88e2d642a82 +Subproject commit 414c2585a8b646788e6d3cf715b638ab1a2f846c From a183da432ff010f6a87d0f0cb4c0d202e9a7b464 Mon Sep 17 00:00:00 2001 From: pfilipko1 Date: Sun, 28 May 2023 16:53:11 +0200 Subject: [PATCH 9/9] submodule --- granulate-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/granulate-utils b/granulate-utils index 414c2585a..855b7715c 160000 --- a/granulate-utils +++ b/granulate-utils @@ -1 +1 @@ -Subproject commit 414c2585a8b646788e6d3cf715b638ab1a2f846c +Subproject commit 855b7715ce276ac323f6da5221953be8e18b865a